From b425001010044adbdbcd98f8682694b30b73bbf4 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Thu, 15 Oct 2020 12:55:50 +0300 Subject: 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 Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/12621) --- ssl/ssl_lib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ssl/ssl_lib.c') diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index e8b004f4a6..219d30ff24 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -3123,7 +3123,7 @@ static int ssl_session_cmp(const SSL_SESSION *a, const SSL_SESSION *b) * via ssl.h. */ -SSL_CTX *SSL_CTX_new_ex(OPENSSL_CTX *libctx, const char *propq, +SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq, const SSL_METHOD *meth) { SSL_CTX *ret = NULL; @@ -5893,7 +5893,7 @@ void SSL_set_allow_early_data_cb(SSL *s, s->allow_early_data_cb_data = arg; } -const EVP_CIPHER *ssl_evp_cipher_fetch(OPENSSL_CTX *libctx, +const EVP_CIPHER *ssl_evp_cipher_fetch(OSSL_LIB_CTX *libctx, int nid, const char *properties) { @@ -5948,7 +5948,7 @@ void ssl_evp_cipher_free(const EVP_CIPHER *cipher) } } -const EVP_MD *ssl_evp_md_fetch(OPENSSL_CTX *libctx, +const EVP_MD *ssl_evp_md_fetch(OSSL_LIB_CTX *libctx, int nid, const char *properties) { -- cgit v1.2.3