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_libctx_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_libctx_test.c')
| -rw-r--r-- | test/evp_libctx_test.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/evp_libctx_test.c b/test/evp_libctx_test.c index 50d463680a..e8d41ab2a7 100644 --- a/test/evp_libctx_test.c +++ b/test/evp_libctx_test.c @@ -32,7 +32,7 @@ #include "crypto/bn_dh.h" /* _bignum_ffdhe2048_p */ #include "../e_os.h" /* strcasecmp */ -static OPENSSL_CTX *libctx = NULL; +static OSSL_LIB_CTX *libctx = NULL; static OSSL_PROVIDER *nullprov = NULL; static OSSL_PROVIDER *libprov = NULL; static STACK_OF(OPENSSL_CSTRING) *cipher_names = NULL; @@ -643,11 +643,11 @@ int setup_tests(void) if (!TEST_ptr(nullprov)) return 0; - libctx = OPENSSL_CTX_new(); + libctx = OSSL_LIB_CTX_new(); if (!TEST_ptr(libctx)) return 0; if (config_file != NULL - && !TEST_true(OPENSSL_CTX_load_config(libctx, config_file))) + && !TEST_true(OSSL_LIB_CTX_load_config(libctx, config_file))) return 0; libprov = OSSL_PROVIDER_load(libctx, prov_name); @@ -681,6 +681,6 @@ void cleanup_tests(void) { sk_OPENSSL_CSTRING_free(cipher_names); OSSL_PROVIDER_unload(libprov); - OPENSSL_CTX_free(libctx); + OSSL_LIB_CTX_free(libctx); OSSL_PROVIDER_unload(nullprov); } |