diff options
Diffstat (limited to 'test/cmp_client_test.c')
| -rw-r--r-- | test/cmp_client_test.c | 95 |
1 files changed, 61 insertions, 34 deletions
diff --git a/test/cmp_client_test.c b/test/cmp_client_test.c index c1148b82aa00..4b3b5f4929c9 100644 --- a/test/cmp_client_test.c +++ b/test/cmp_client_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2007-2025 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 * @@ -13,8 +13,6 @@ #include "cmp_mock_srv.h" -#ifndef NDEBUG /* tests need mock server, which is available only if !NDEBUG */ - static const char *server_key_f; static const char *server_cert_f; static const char *client_key_f; @@ -64,6 +62,7 @@ static CMP_SES_TEST_FIXTURE *set_up(const char *const test_case_name) fixture->test_case_name = test_case_name; if (!TEST_ptr(fixture->srv_ctx = ossl_cmp_mock_srv_new(libctx, NULL)) || !OSSL_CMP_SRV_CTX_set_accept_unprotected(fixture->srv_ctx, 1) + || !ossl_cmp_mock_srv_set1_refCert(fixture->srv_ctx, client_cert) || !ossl_cmp_mock_srv_set1_certOut(fixture->srv_ctx, client_cert) || (srv_cmp_ctx = OSSL_CMP_SRV_CTX_get0_cmp_ctx(fixture->srv_ctx)) == NULL @@ -142,7 +141,7 @@ static int execute_exec_certrequest_ses_test(CMP_SES_TEST_FIXTURE *fixture) STACK_OF(X509) *caPubs = OSSL_CMP_CTX_get1_caPubs(fixture->cmp_ctx); int ret = TEST_int_eq(STACK_OF_X509_cmp(fixture->caPubs, caPubs), 0); - sk_X509_pop_free(caPubs, X509_free); + OSSL_STACK_OF_X509_free(caPubs); return ret; } return 1; @@ -185,52 +184,64 @@ static int test_exec_RR_ses_receive_error(void) static int test_exec_IR_ses(void) { SETUP_TEST_FIXTURE(CMP_SES_TEST_FIXTURE, set_up); - fixture->req_type = OSSL_CMP_IR; + fixture->req_type = OSSL_CMP_PKIBODY_IR; fixture->expected = OSSL_CMP_PKISTATUS_accepted; fixture->caPubs = sk_X509_new_null(); - sk_X509_push(fixture->caPubs, server_cert); - sk_X509_push(fixture->caPubs, server_cert); + if (!sk_X509_push(fixture->caPubs, server_cert) + || !sk_X509_push(fixture->caPubs, server_cert)) { + tear_down(fixture); + return 0; + } ossl_cmp_mock_srv_set1_caPubsOut(fixture->srv_ctx, fixture->caPubs); EXECUTE_TEST(execute_exec_certrequest_ses_test, tear_down); return result; } -static int test_exec_IR_ses_poll(int check_after, int poll_count, - int total_timeout, int expect) +static int test_exec_REQ_ses_poll(int req_type, int check_after, + int poll_count, int total_timeout, + int expect) { SETUP_TEST_FIXTURE(CMP_SES_TEST_FIXTURE, set_up); - fixture->req_type = OSSL_CMP_IR; + fixture->req_type = req_type; fixture->expected = expect; ossl_cmp_mock_srv_set_checkAfterTime(fixture->srv_ctx, check_after); ossl_cmp_mock_srv_set_pollCount(fixture->srv_ctx, poll_count); OSSL_CMP_CTX_set_option(fixture->cmp_ctx, OSSL_CMP_OPT_TOTAL_TIMEOUT, total_timeout); - EXECUTE_TEST(execute_exec_certrequest_ses_test, tear_down); + + if (req_type == OSSL_CMP_PKIBODY_IR) { + EXECUTE_TEST(execute_exec_certrequest_ses_test, tear_down); + } else if (req_type == OSSL_CMP_PKIBODY_GENM) { + EXECUTE_TEST(execute_exec_GENM_ses_test, tear_down); + } return result; } static int checkAfter = 1; static int test_exec_IR_ses_poll_ok(void) { - return test_exec_IR_ses_poll(checkAfter, 2, 0, OSSL_CMP_PKISTATUS_accepted); + return test_exec_REQ_ses_poll(OSSL_CMP_PKIBODY_IR, checkAfter, 2, 0, + OSSL_CMP_PKISTATUS_accepted); } static int test_exec_IR_ses_poll_no_timeout(void) { - return test_exec_IR_ses_poll(checkAfter, 1 /* pollCount */, checkAfter + 1, - OSSL_CMP_PKISTATUS_accepted); + return test_exec_REQ_ses_poll(OSSL_CMP_PKIBODY_IR, checkAfter, + 2 /* pollCount */, checkAfter + 4, + OSSL_CMP_PKISTATUS_accepted); } static int test_exec_IR_ses_poll_total_timeout(void) { - return test_exec_IR_ses_poll(checkAfter + 1, 2 /* pollCount */, checkAfter, - OSSL_CMP_PKISTATUS_waiting); + return !test_exec_REQ_ses_poll(OSSL_CMP_PKIBODY_IR, checkAfter + 1, + 3 /* pollCount */, checkAfter + 6, + OSSL_CMP_PKISTATUS_waiting); } static int test_exec_CR_ses(int implicit_confirm, int granted, int reject) { SETUP_TEST_FIXTURE(CMP_SES_TEST_FIXTURE, set_up); - fixture->req_type = OSSL_CMP_CR; + fixture->req_type = OSSL_CMP_PKIBODY_CR; OSSL_CMP_CTX_set_option(fixture->cmp_ctx, OSSL_CMP_OPT_IMPLICIT_CONFIRM, implicit_confirm); OSSL_CMP_SRV_CTX_set_grant_implicit_confirm(fixture->srv_ctx, granted); @@ -257,7 +268,7 @@ static int test_exec_CR_ses_implicit_confirm(void) static int test_exec_KUR_ses(int transfer_error, int pubkey, int raverified) { SETUP_TEST_FIXTURE(CMP_SES_TEST_FIXTURE, set_up); - fixture->req_type = OSSL_CMP_KUR; + fixture->req_type = OSSL_CMP_PKIBODY_KUR; /* ctx->oldCert has already been set */ if (transfer_error) @@ -265,7 +276,9 @@ static int test_exec_KUR_ses(int transfer_error, int pubkey, int raverified) if (pubkey) { EVP_PKEY *key = raverified /* wrong key */ ? server_key : client_key; - EVP_PKEY_up_ref(key); + if (!EVP_PKEY_up_ref(key)) + return 0; + OSSL_CMP_CTX_set0_newPkey(fixture->cmp_ctx, 0 /* not priv */, key); OSSL_CMP_SRV_CTX_set_accept_raverified(fixture->srv_ctx, 1); } @@ -325,7 +338,7 @@ static int test_exec_P10CR_ses(int reject) X509_REQ *csr = NULL; SETUP_TEST_FIXTURE(CMP_SES_TEST_FIXTURE, set_up); - fixture->req_type = OSSL_CMP_P10CR; + fixture->req_type = OSSL_CMP_PKIBODY_P10CR; fixture->expected = reject ? OSSL_CMP_PKISTATUS_rejection : OSSL_CMP_PKISTATUS_accepted; ctx = fixture->cmp_ctx; @@ -355,8 +368,8 @@ static int execute_try_certreq_poll_test(CMP_SES_TEST_FIXTURE *fixture) { OSSL_CMP_CTX *ctx = fixture->cmp_ctx; int check_after; - const int CHECK_AFTER = 5; - const int TYPE = OSSL_CMP_KUR; + const int CHECK_AFTER = 0; + const int TYPE = OSSL_CMP_PKIBODY_KUR; ossl_cmp_mock_srv_set_pollCount(fixture->srv_ctx, 3); ossl_cmp_mock_srv_set_checkAfterTime(fixture->srv_ctx, CHECK_AFTER); @@ -385,7 +398,7 @@ static int execute_try_certreq_poll_abort_test(CMP_SES_TEST_FIXTURE *fixture) OSSL_CMP_CTX *ctx = fixture->cmp_ctx; int check_after; const int CHECK_AFTER = 99; - const int TYPE = OSSL_CMP_CR; + const int TYPE = OSSL_CMP_PKIBODY_CR; ossl_cmp_mock_srv_set_pollCount(fixture->srv_ctx, 3); ossl_cmp_mock_srv_set_checkAfterTime(fixture->srv_ctx, CHECK_AFTER); @@ -405,6 +418,26 @@ static int test_try_certreq_poll_abort(void) return result; } +static int test_exec_GENM_ses_poll_ok(void) +{ + return test_exec_REQ_ses_poll(OSSL_CMP_PKIBODY_GENM, checkAfter, 2, 0, + OSSL_CMP_PKISTATUS_accepted); +} + +static int test_exec_GENM_ses_poll_no_timeout(void) +{ + return test_exec_REQ_ses_poll(OSSL_CMP_PKIBODY_GENM, checkAfter, + 1 /* pollCount */, checkAfter + 1, + OSSL_CMP_PKISTATUS_accepted); +} + +static int test_exec_GENM_ses_poll_total_timeout(void) +{ + return test_exec_REQ_ses_poll(OSSL_CMP_PKIBODY_GENM, checkAfter + 1, + 3 /* pollCount */, checkAfter + 2, + OSSL_CMP_PKISTATUS_waiting); +} + static int test_exec_GENM_ses(int transfer_error, int total_timeout, int expect) { SETUP_TEST_FIXTURE(CMP_SES_TEST_FIXTURE, set_up); @@ -441,6 +474,7 @@ static int execute_exchange_certConf_test(CMP_SES_TEST_FIXTURE *fixture) ossl_cmp_exchange_certConf(fixture->cmp_ctx, OSSL_CMP_CERTREQID, OSSL_CMP_PKIFAILUREINFO_addInfoNotAvailable, "abcdefg"); + return TEST_int_eq(fixture->expected, res); } @@ -487,7 +521,7 @@ void cleanup_tests(void) return; } -# define USAGE "server.key server.crt client.key client.crt client.csr module_name [module_conf_file]\n" +#define USAGE "server.key server.crt client.key client.crt client.csr module_name [module_conf_file]\n" OPT_TEST_DECLARE_USAGE(USAGE) int setup_tests(void) @@ -539,17 +573,10 @@ int setup_tests(void) ADD_TEST(test_exec_GENM_ses_ok); ADD_TEST(test_exec_GENM_ses_transfer_error); ADD_TEST(test_exec_GENM_ses_total_timeout); + ADD_TEST(test_exec_GENM_ses_poll_ok); + ADD_TEST(test_exec_GENM_ses_poll_no_timeout); + ADD_TEST(test_exec_GENM_ses_poll_total_timeout); ADD_TEST(test_exchange_certConf); ADD_TEST(test_exchange_error); return 1; } - -#else /* !defined (NDEBUG) */ - -int setup_tests(void) -{ - TEST_note("CMP session tests are disabled in this build (NDEBUG)."); - return 1; -} - -#endif |