diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2022-11-25 10:43:12 +0100 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2023-01-23 10:54:29 +0100 |
| commit | b908ec0f217da0a23f9d81442f81d44c94c98f23 (patch) | |
| tree | f41831e2c1fef85c95e2b629d6b575ba5e044385 /test/cmp_client_test.c | |
| parent | 5acd4007a0646ef1f9d0015ce438b891d1b24a62 (diff) | |
cmp_client_test.c: add tests for end_time being initialized for RR/GENM
To this end, tweak the internal handling of ctx->total_timeout.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/19391)
Diffstat (limited to 'test/cmp_client_test.c')
| -rw-r--r-- | test/cmp_client_test.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/test/cmp_client_test.c b/test/cmp_client_test.c index 6a60eab63b..81a7537f03 100644 --- a/test/cmp_client_test.c +++ b/test/cmp_client_test.c @@ -340,25 +340,34 @@ static int test_try_certreq_poll_abort(void) return result; } -static int test_exec_GENM_ses(int transfer_error) +static int test_exec_GENM_ses(int transfer_error, int total_timeout, int expect) { SETUP_TEST_FIXTURE(CMP_SES_TEST_FIXTURE, set_up); if (transfer_error) OSSL_CMP_CTX_set_transfer_cb_arg(fixture->cmp_ctx, NULL); - fixture->expected = transfer_error ? OSSL_CMP_PKISTATUS_trans - : OSSL_CMP_PKISTATUS_accepted; + /* + * cannot use OSSL_CMP_CTX_set_option(... OSSL_CMP_OPT_TOTAL_TIMEOUT) + * here because this will correct total_timeout to be >= 0 + */ + fixture->cmp_ctx->total_timeout = total_timeout; + fixture->expected = expect; EXECUTE_TEST(execute_exec_GENM_ses_test, tear_down); return result; } static int test_exec_GENM_ses_ok(void) { - return test_exec_GENM_ses(0); + return test_exec_GENM_ses(0, 0, OSSL_CMP_PKISTATUS_accepted); +} + +static int test_exec_GENM_ses_transfer_error(void) +{ + return test_exec_GENM_ses(1, 0, OSSL_CMP_PKISTATUS_trans); } -static int test_exec_GENM_ses_error(void) +static int test_exec_GENM_ses_total_timeout(void) { - return test_exec_GENM_ses(1); + return test_exec_GENM_ses(0, -1, OSSL_CMP_PKISTATUS_trans); } static int execute_exchange_certConf_test(CMP_SES_TEST_FIXTURE *fixture) @@ -458,7 +467,8 @@ int setup_tests(void) ADD_TEST(test_try_certreq_poll); ADD_TEST(test_try_certreq_poll_abort); ADD_TEST(test_exec_GENM_ses_ok); - ADD_TEST(test_exec_GENM_ses_error); + ADD_TEST(test_exec_GENM_ses_transfer_error); + ADD_TEST(test_exec_GENM_ses_total_timeout); ADD_TEST(test_exchange_certConf); ADD_TEST(test_exchange_error); return 1; |