diff options
author | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2020-10-15 12:55:50 +0300 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2020-10-15 11:59:53 +0100 |
commit | b425001010044adbdbcd98f8682694b30b73bbf4 (patch) | |
tree | e87a5b512d7869cb6a500ecc74b706281be762cf /test/evp_fetch_prov_test.c | |
parent | 29000e43ea257bf54f6ccb2064b3744853b821b2 (diff) |
Rename OPENSSL_CTX prefix to OSSL_LIB_CTX
Many of the new types introduced by OpenSSL 3.0 have an OSSL_ prefix,
e.g., OSSL_CALLBACK, OSSL_PARAM, OSSL_ALGORITHM, OSSL_SERIALIZER.
The OPENSSL_CTX type stands out a little by using a different prefix.
For consistency reasons, this type is renamed to OSSL_LIB_CTX.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12621)
Diffstat (limited to 'test/evp_fetch_prov_test.c')
-rw-r--r-- | test/evp_fetch_prov_test.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/evp_fetch_prov_test.c b/test/evp_fetch_prov_test.c index d7f43f229d..18e57c76c6 100644 --- a/test/evp_fetch_prov_test.c +++ b/test/evp_fetch_prov_test.c @@ -76,17 +76,17 @@ static int calculate_digest(const EVP_MD *md, const char *msg, size_t len, return ret; } -static int load_providers(OPENSSL_CTX **libctx, OSSL_PROVIDER *prov[]) +static int load_providers(OSSL_LIB_CTX **libctx, OSSL_PROVIDER *prov[]) { - OPENSSL_CTX *ctx = NULL; + OSSL_LIB_CTX *ctx = NULL; int ret = 0; size_t i; - ctx = OPENSSL_CTX_new(); + ctx = OSSL_LIB_CTX_new(); if (!TEST_ptr(ctx)) goto err; - if (!TEST_true(OPENSSL_CTX_load_config(ctx, config_file))) + if (!TEST_true(OSSL_LIB_CTX_load_config(ctx, config_file))) goto err; if (test_get_argument_count() > 2) goto err; @@ -102,7 +102,7 @@ static int load_providers(OPENSSL_CTX **libctx, OSSL_PROVIDER *prov[]) *libctx = ctx; err: if (ret == 0) - OPENSSL_CTX_free(ctx); + OSSL_LIB_CTX_free(ctx); return ret; } @@ -111,7 +111,7 @@ err: */ static int test_EVP_MD_fetch(void) { - OPENSSL_CTX *ctx = NULL; + OSSL_LIB_CTX *ctx = NULL; EVP_MD *md = NULL; OSSL_PROVIDER *prov[2] = {NULL, NULL}; int ret = 0; @@ -162,7 +162,7 @@ err: */ if (ctx != NULL) { OPENSSL_thread_stop_ex(ctx); - OPENSSL_CTX_free(ctx); + OSSL_LIB_CTX_free(ctx); } return ret; } @@ -197,7 +197,7 @@ err: */ static int test_EVP_CIPHER_fetch(void) { - OPENSSL_CTX *ctx = NULL; + OSSL_LIB_CTX *ctx = NULL; EVP_CIPHER *cipher = NULL; OSSL_PROVIDER *prov[2] = {NULL, NULL}; int ret = 0; @@ -229,7 +229,7 @@ err: EVP_CIPHER_free(cipher); OSSL_PROVIDER_unload(prov[0]); OSSL_PROVIDER_unload(prov[1]); - OPENSSL_CTX_free(ctx); + OSSL_LIB_CTX_free(ctx); return ret; } |