diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-12-15 20:28:34 +0100 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2021-12-30 09:37:05 +0100 |
| commit | 6be83cc655af819be0e3f2701c726a2550357953 (patch) | |
| tree | 9ab4bfd78c64484aa3c2ba8b7ab2c08a631eb4b1 /test/cmp_vfy_test.c | |
| parent | ea24196ef224d3aa3aaecb8000004bb7a0a100a2 (diff) | |
| download | openssl-6be83cc655af819be0e3f2701c726a2550357953.zip openssl-6be83cc655af819be0e3f2701c726a2550357953.tar.gz openssl-6be83cc655af819be0e3f2701c726a2550357953.tar.bz2 | |
OSSL_CMP_CTX: rename get/set function for trustedStore
This makes the naming more consistent, in a backward-compatible way
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17277)
Diffstat (limited to 'test/cmp_vfy_test.c')
| -rw-r--r-- | test/cmp_vfy_test.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/cmp_vfy_test.c b/test/cmp_vfy_test.c index 5aa6a00..bfb5191 100644 --- a/test/cmp_vfy_test.c +++ b/test/cmp_vfy_test.c @@ -61,7 +61,7 @@ static CMP_VFY_TEST_FIXTURE *set_up(const char *const test_case_name) fixture->test_case_name = test_case_name; if (ts == NULL || !TEST_ptr(fixture->cmp_ctx = OSSL_CMP_CTX_new(libctx, NULL)) - || !OSSL_CMP_CTX_set0_trustedStore(fixture->cmp_ctx, ts) + || !OSSL_CMP_CTX_set0_trusted(fixture->cmp_ctx, ts) || !OSSL_CMP_CTX_set_log_cb(fixture->cmp_ctx, print_to_bio_out)) { tear_down(fixture); X509_STORE_free(ts); @@ -133,7 +133,7 @@ static int execute_validate_msg_test(CMP_VFY_TEST_FIXTURE *fixture) static int execute_validate_cert_path_test(CMP_VFY_TEST_FIXTURE *fixture) { - X509_STORE *ts = OSSL_CMP_CTX_get0_trustedStore(fixture->cmp_ctx); + X509_STORE *ts = OSSL_CMP_CTX_get0_trusted(fixture->cmp_ctx); int res = TEST_int_eq(fixture->expected, OSSL_CMP_validate_cert_path(fixture->cmp_ctx, ts, fixture->cert)); @@ -187,7 +187,7 @@ static int test_validate_msg_mac_alg_protection_bad(void) static int add_trusted(OSSL_CMP_CTX *ctx, X509 *cert) { - return X509_STORE_add_cert(OSSL_CMP_CTX_get0_trustedStore(ctx), cert); + return X509_STORE_add_cert(OSSL_CMP_CTX_get0_trusted(ctx), cert); } static int add_untrusted(OSSL_CMP_CTX *ctx, X509 *cert) @@ -202,7 +202,7 @@ static int test_validate_msg_signature_partial_chain(int expired) SETUP_TEST_FIXTURE(CMP_VFY_TEST_FIXTURE, set_up); - ts = OSSL_CMP_CTX_get0_trustedStore(fixture->cmp_ctx); + ts = OSSL_CMP_CTX_get0_trusted(fixture->cmp_ctx); fixture->expected = !expired; if (ts == NULL || !TEST_ptr(fixture->msg = load_pkimsg(ir_protected_f, libctx)) @@ -369,7 +369,7 @@ static void setup_path(CMP_VFY_TEST_FIXTURE **fixture, X509 *wrong, int expired) (*fixture)->cert = endentity2; (*fixture)->expected = wrong == NULL && !expired; if (expired) { - X509_STORE *ts = OSSL_CMP_CTX_get0_trustedStore((*fixture)->cmp_ctx); + X509_STORE *ts = OSSL_CMP_CTX_get0_trusted((*fixture)->cmp_ctx); X509_VERIFY_PARAM *vpm = X509_STORE_get0_param(ts); X509_VERIFY_PARAM_set_time(vpm, test_time_after_expiration); } |