summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorDr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com>2020-10-15 12:55:50 +0300
committerMatt Caswell <matt@openssl.org>2020-10-15 11:59:53 +0100
commitb425001010044adbdbcd98f8682694b30b73bbf4 (patch)
treee87a5b512d7869cb6a500ecc74b706281be762cf /util
parent29000e43ea257bf54f6ccb2064b3744853b821b2 (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 'util')
-rw-r--r--util/libcrypto.num8
-rw-r--r--util/other.syms2
2 files changed, 5 insertions, 5 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 12ba103689..6c0fae783b 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4444,8 +4444,8 @@ EVP_KDF_derive ? 3_0_0 EXIST::FUNCTION:
EVP_KDF_name ? 3_0_0 EXIST::FUNCTION:
EC_GROUP_get0_field ? 3_0_0 EXIST::FUNCTION:EC
CRYPTO_alloc_ex_data ? 3_0_0 EXIST::FUNCTION:
-OPENSSL_CTX_new ? 3_0_0 EXIST::FUNCTION:
-OPENSSL_CTX_free ? 3_0_0 EXIST::FUNCTION:
+OSSL_LIB_CTX_new ? 3_0_0 EXIST::FUNCTION:
+OSSL_LIB_CTX_free ? 3_0_0 EXIST::FUNCTION:
OPENSSL_LH_flush ? 3_0_0 EXIST::FUNCTION:
BN_native2bn ? 3_0_0 EXIST::FUNCTION:
BN_bn2nativepad ? 3_0_0 EXIST::FUNCTION:
@@ -4970,7 +4970,7 @@ EVP_PKEY_CTX_set1_rsa_keygen_pubexp ? 3_0_0 EXIST::FUNCTION:RSA
EVP_PKEY_CTX_set_rsa_keygen_primes ? 3_0_0 EXIST::FUNCTION:RSA
NCONF_new_ex ? 3_0_0 EXIST::FUNCTION:
CONF_modules_load_file_ex ? 3_0_0 EXIST::FUNCTION:
-OPENSSL_CTX_load_config ? 3_0_0 EXIST::FUNCTION:
+OSSL_LIB_CTX_load_config ? 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_BLD_to_param ? 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_BLD_free_params ? 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_BLD_push_int ? 3_0_0 EXIST::FUNCTION:
@@ -5100,7 +5100,7 @@ OSSL_PROVIDER_get_capabilities ? 3_0_0 EXIST::FUNCTION:
EC_GROUP_new_by_curve_name_ex ? 3_0_0 EXIST::FUNCTION:EC
EC_KEY_new_ex ? 3_0_0 EXIST::FUNCTION:EC
EC_KEY_new_by_curve_name_ex ? 3_0_0 EXIST::FUNCTION:EC
-OPENSSL_CTX_set0_default ? 3_0_0 EXIST::FUNCTION:
+OSSL_LIB_CTX_set0_default ? 3_0_0 EXIST::FUNCTION:
PEM_X509_INFO_read_bio_ex ? 3_0_0 EXIST::FUNCTION:
PEM_X509_INFO_read_ex ? 3_0_0 EXIST::FUNCTION:STDIO
X509_REQ_verify_ex ? 3_0_0 EXIST::FUNCTION:
diff --git a/util/other.syms b/util/other.syms
index d4c552e298..e5d98a9877 100644
--- a/util/other.syms
+++ b/util/other.syms
@@ -39,7 +39,7 @@ EVP_RAND datatype
EVP_RAND_CTX datatype
GEN_SESSION_CB datatype
OPENSSL_Applink external
-OPENSSL_CTX datatype
+OSSL_LIB_CTX datatype
NAMING_AUTHORITY datatype
OSSL_DECODER datatype
OSSL_DECODER_CTX datatype