diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-05-13 09:28:24 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-21 09:04:11 +0200 |
| commit | 1a7cd250ad55a3c9d684a7259c20ea8075c2b08b (patch) | |
| tree | a0b9578bdfbe5d577a9077a33a631d480be42c74 /test/cmp_client_test.c | |
| parent | 7b1a3a506273bc043cefd7c2202300a9bf81daa0 (diff) | |
| download | openssl-1a7cd250ad55a3c9d684a7259c20ea8075c2b08b.tar.gz | |
Add libctx and propq parameters to OSSL_CMP_{SRV_},CTX_new() and ossl_cmp_mock_srv_new()
Also remove not really to-the-point error message if call fails in apps/cmp.c
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11808)
Diffstat (limited to 'test/cmp_client_test.c')
| -rw-r--r-- | test/cmp_client_test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cmp_client_test.c b/test/cmp_client_test.c index d305eb5610..f5c3fd77c9 100644 --- a/test/cmp_client_test.c +++ b/test/cmp_client_test.c @@ -62,7 +62,7 @@ static CMP_SES_TEST_FIXTURE *set_up(const char *const test_case_name) if (!TEST_ptr(fixture = OPENSSL_zalloc(sizeof(*fixture)))) return NULL; fixture->test_case_name = test_case_name; - if (!TEST_ptr(fixture->srv_ctx = ossl_cmp_mock_srv_new()) + if (!TEST_ptr(fixture->srv_ctx = ossl_cmp_mock_srv_new(NULL, NULL)) || !OSSL_CMP_SRV_CTX_set_accept_unprotected(fixture->srv_ctx, 1) || !ossl_cmp_mock_srv_set1_certOut(fixture->srv_ctx, client_cert) || (srv_cmp_ctx = @@ -70,7 +70,7 @@ static CMP_SES_TEST_FIXTURE *set_up(const char *const test_case_name) || !OSSL_CMP_CTX_set1_cert(srv_cmp_ctx, server_cert) || !OSSL_CMP_CTX_set1_pkey(srv_cmp_ctx, server_key)) goto err; - if (!TEST_ptr(fixture->cmp_ctx = ctx = OSSL_CMP_CTX_new()) + if (!TEST_ptr(fixture->cmp_ctx = ctx = OSSL_CMP_CTX_new(NULL, NULL)) || !OSSL_CMP_CTX_set_log_cb(fixture->cmp_ctx, print_to_bio_out) || !OSSL_CMP_CTX_set_transfer_cb(ctx, OSSL_CMP_CTX_server_perform) || !OSSL_CMP_CTX_set_transfer_cb_arg(ctx, fixture->srv_ctx) |