diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-05-08 14:30:44 +0300 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-05-13 20:42:00 +0300 |
| commit | 63f1883dca7a42949e8b9db5b035c17fc160f998 (patch) | |
| tree | 749712829ed5f1086740c7e7b72c8d881ccb0ba1 /test | |
| parent | 143be4748e49ff0181964affcbf422a895c48e85 (diff) | |
Rename OSSL_CMP_CTX_set1_clCert() to OSSL_CMP_CTX_set1_cert()
Also update documentation and example code in openssl-cmp.pod.in
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/11470)
Diffstat (limited to 'test')
| -rw-r--r-- | test/cmp_client_test.c | 2 | ||||
| -rw-r--r-- | test/cmp_ctx_test.c | 4 | ||||
| -rw-r--r-- | test/cmp_msg_test.c | 2 | ||||
| -rw-r--r-- | test/cmp_protect_test.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/test/cmp_client_test.c b/test/cmp_client_test.c index b10662349c..ab2b930277 100644 --- a/test/cmp_client_test.c +++ b/test/cmp_client_test.c @@ -67,7 +67,7 @@ static CMP_SES_TEST_FIXTURE *set_up(const char *const test_case_name) || !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 - || !OSSL_CMP_CTX_set1_clCert(srv_cmp_ctx, server_cert) + || !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()) diff --git a/test/cmp_ctx_test.c b/test/cmp_ctx_test.c index 6f6a13673c..898053424e 100644 --- a/test/cmp_ctx_test.c +++ b/test/cmp_ctx_test.c @@ -746,7 +746,7 @@ DEFINE_SET_GET_BASE_TEST(OSSL_CMP_CTX, set0, get0, 0, trustedStore, DEFAULT_STORE, X509_STORE_new_1(), X509_STORE_free) DEFINE_SET_GET_SK_X509_TEST(OSSL_CMP, CTX, 1, 0, untrusted_certs) -DEFINE_SET_TEST(OSSL_CMP, CTX, 1, 0, clCert, X509) +DEFINE_SET_TEST(OSSL_CMP, CTX, 1, 0, cert, X509) DEFINE_SET_TEST(OSSL_CMP, CTX, 1, 0, pkey, EVP_PKEY) DEFINE_SET_TEST(OSSL_CMP, CTX, 1, 1, recipient, X509_NAME) @@ -829,7 +829,7 @@ int setup_tests(void) ADD_TEST(test_CTX_set0_get0_trustedStore); ADD_TEST(test_CTX_set1_get0_untrusted_certs); /* client authentication: */ - ADD_TEST(test_CTX_set1_get0_clCert); + ADD_TEST(test_CTX_set1_get0_cert); ADD_TEST(test_CTX_set1_get0_pkey); /* the following two also test ossl_cmp_asn1_octet_string_set1_bytes(): */ ADD_TEST(test_CTX_set1_get1_referenceValue_str); diff --git a/test/cmp_msg_test.c b/test/cmp_msg_test.c index 413e284fcc..ca03dc23e3 100644 --- a/test/cmp_msg_test.c +++ b/test/cmp_msg_test.c @@ -165,7 +165,7 @@ static int test_cmp_create_ir_protection_fails(void) if (!TEST_true(OSSL_CMP_CTX_set1_pkey(fixture->cmp_ctx, newkey)) || !TEST_true(SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 0)) /* newkey used by default for signing does not match cert: */ - || !TEST_true(OSSL_CMP_CTX_set1_clCert(fixture->cmp_ctx, cert))) { + || !TEST_true(OSSL_CMP_CTX_set1_cert(fixture->cmp_ctx, cert))) { tear_down(fixture); fixture = NULL; } diff --git a/test/cmp_protect_test.c b/test/cmp_protect_test.c index ce5a6cb420..1d1e009aca 100644 --- a/test/cmp_protect_test.c +++ b/test/cmp_protect_test.c @@ -242,7 +242,7 @@ static int test_MSG_protect_with_certificate_and_key(void) OSSL_CMP_MSG_dup(ir_unprotected)) || !TEST_true(SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 0)) || !TEST_true(OSSL_CMP_CTX_set1_pkey(fixture->cmp_ctx, loadedkey)) - || !TEST_true(OSSL_CMP_CTX_set1_clCert(fixture->cmp_ctx, cert))) { + || !TEST_true(OSSL_CMP_CTX_set1_cert(fixture->cmp_ctx, cert))) { tear_down(fixture); fixture = NULL; } |