diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2023-04-28 13:45:21 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2023-12-21 23:06:42 +0100 |
| commit | bedffe1731e8c587d3d854e05535175863447dc3 (patch) | |
| tree | dacd36294473787f970bd0587d0472e268bc1093 /test/cmp_client_test.c | |
| parent | 192bfec487b27ee9398138ce5f0c5b00f536dc95 (diff) | |
| download | openssl-bedffe1731e8c587d3d854e05535175863447dc3.zip openssl-bedffe1731e8c587d3d854e05535175863447dc3.tar.gz openssl-bedffe1731e8c587d3d854e05535175863447dc3.tar.bz2 | |
crypto/cmp/,apps/lib/cmp_mock_srv.c: various improvements on delayed delivery
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/20727)
Diffstat (limited to 'test/cmp_client_test.c')
| -rw-r--r-- | test/cmp_client_test.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/test/cmp_client_test.c b/test/cmp_client_test.c index ad78c86..208e0a1 100644 --- a/test/cmp_client_test.c +++ b/test/cmp_client_test.c @@ -194,7 +194,7 @@ static int test_exec_IR_ses(void) return result; } -static int test_exec_any_ses_poll(int req_type, int check_after, +static int test_exec_REQ_ses_poll(int req_type, int check_after, int poll_count, int total_timeout, int expect) { @@ -206,14 +206,10 @@ static int test_exec_any_ses_poll(int req_type, int check_after, OSSL_CMP_CTX_set_option(fixture->cmp_ctx, OSSL_CMP_OPT_TOTAL_TIMEOUT, total_timeout); - if (req_type == OSSL_CMP_PKIBODY_IR || req_type == OSSL_CMP_PKIBODY_CR - || req_type == OSSL_CMP_PKIBODY_KUR - || req_type == OSSL_CMP_PKIBODY_P10CR) { + 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); - } else { - result = 0; } return result; } @@ -221,20 +217,20 @@ static int test_exec_any_ses_poll(int req_type, int check_after, static int checkAfter = 1; static int test_exec_IR_ses_poll_ok(void) { - return test_exec_any_ses_poll(OSSL_CMP_PKIBODY_IR, checkAfter, 2, 0, + 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_any_ses_poll(OSSL_CMP_PKIBODY_IR, checkAfter, + 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_any_ses_poll(OSSL_CMP_PKIBODY_IR, checkAfter + 1, + return !test_exec_REQ_ses_poll(OSSL_CMP_PKIBODY_IR, checkAfter + 1, 3 /* pollCount */, checkAfter + 6, OSSL_CMP_PKISTATUS_waiting); } @@ -419,20 +415,20 @@ static int test_try_certreq_poll_abort(void) static int test_exec_GENM_ses_poll_ok(void) { - return test_exec_any_ses_poll(OSSL_CMP_PKIBODY_GENM, checkAfter, 2, 0, + 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_any_ses_poll(OSSL_CMP_PKIBODY_GENM, checkAfter, + 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_any_ses_poll(OSSL_CMP_PKIBODY_GENM, checkAfter + 1, + return test_exec_REQ_ses_poll(OSSL_CMP_PKIBODY_GENM, checkAfter + 1, 3 /* pollCount */, checkAfter + 2, OSSL_CMP_PKISTATUS_waiting); } |