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 /ssl | |
parent | 29000e43ea257bf54f6ccb2064b3744853b821b2 (diff) | |
download | openssl-b425001010044adbdbcd98f8682694b30b73bbf4.tar.gz |
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 'ssl')
-rw-r--r-- | ssl/record/record_local.h | 4 | ||||
-rw-r--r-- | ssl/record/tls_pad.c | 12 | ||||
-rw-r--r-- | ssl/ssl_cert.c | 8 | ||||
-rw-r--r-- | ssl/ssl_conf.c | 2 | ||||
-rw-r--r-- | ssl/ssl_lib.c | 6 | ||||
-rw-r--r-- | ssl/ssl_local.h | 6 | ||||
-rw-r--r-- | ssl/ssl_mcnf.c | 8 |
7 files changed, 23 insertions, 23 deletions
diff --git a/ssl/record/record_local.h b/ssl/record/record_local.h index 9047c23fd5..0a929c696a 100644 --- a/ssl/record/record_local.h +++ b/ssl/record/record_local.h @@ -113,7 +113,7 @@ __owur int ssl3_cbc_remove_padding_and_mac(size_t *reclen, unsigned char **mac, int *alloced, size_t block_size, size_t mac_size, - OPENSSL_CTX *libctx); + OSSL_LIB_CTX *libctx); __owur int tls1_cbc_remove_padding_and_mac(size_t *reclen, size_t origreclen, unsigned char *recdata, @@ -121,7 +121,7 @@ __owur int tls1_cbc_remove_padding_and_mac(size_t *reclen, int *alloced, size_t block_size, size_t mac_size, int aead, - OPENSSL_CTX *libctx); + OSSL_LIB_CTX *libctx); int dtls1_process_record(SSL *s, DTLS1_BITMAP *bitmap); __owur int dtls1_get_record(SSL *s); int early_data_count_ok(SSL *s, size_t length, size_t overhead, int send); diff --git a/ssl/record/tls_pad.c b/ssl/record/tls_pad.c index 9f698483f1..8383ce8d1c 100644 --- a/ssl/record/tls_pad.c +++ b/ssl/record/tls_pad.c @@ -29,7 +29,7 @@ static int ssl3_cbc_copy_mac(size_t *reclen, size_t block_size, size_t mac_size, size_t good, - OPENSSL_CTX *libctx); + OSSL_LIB_CTX *libctx); int ssl3_cbc_remove_padding_and_mac(size_t *reclen, size_t origreclen, @@ -37,7 +37,7 @@ int ssl3_cbc_remove_padding_and_mac(size_t *reclen, unsigned char **mac, int *alloced, size_t block_size, size_t mac_size, - OPENSSL_CTX *libctx); + OSSL_LIB_CTX *libctx); int tls1_cbc_remove_padding_and_mac(size_t *reclen, size_t origreclen, @@ -46,7 +46,7 @@ int tls1_cbc_remove_padding_and_mac(size_t *reclen, int *alloced, size_t block_size, size_t mac_size, int aead, - OPENSSL_CTX *libctx); + OSSL_LIB_CTX *libctx); /*- * ssl3_cbc_remove_padding removes padding from the decrypted, SSLv3, CBC @@ -71,7 +71,7 @@ int ssl3_cbc_remove_padding_and_mac(size_t *reclen, unsigned char **mac, int *alloced, size_t block_size, size_t mac_size, - OPENSSL_CTX *libctx) + OSSL_LIB_CTX *libctx) { size_t padding_length; size_t good; @@ -117,7 +117,7 @@ int tls1_cbc_remove_padding_and_mac(size_t *reclen, int *alloced, size_t block_size, size_t mac_size, int aead, - OPENSSL_CTX *libctx) + OSSL_LIB_CTX *libctx) { size_t good = -1; size_t padding_length, to_check, i; @@ -204,7 +204,7 @@ static int ssl3_cbc_copy_mac(size_t *reclen, size_t block_size, size_t mac_size, size_t good, - OPENSSL_CTX *libctx) + OSSL_LIB_CTX *libctx) { #if defined(CBC_MAC_ROTATE_IN_PLACE) unsigned char rotated_mac_buf[64 + EVP_MAX_MD_SIZE]; diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index e6a9f57f11..c1e26bd3b4 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -606,7 +606,7 @@ static unsigned long xname_hash(const X509_NAME *a) } STACK_OF(X509_NAME) *SSL_load_client_CA_file_ex(const char *file, - OPENSSL_CTX *libctx, + OSSL_LIB_CTX *libctx, const char *propq) { BIO *in = BIO_new(BIO_s_file()); @@ -614,7 +614,7 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file_ex(const char *file, X509_NAME *xn = NULL; STACK_OF(X509_NAME) *ret = NULL; LHASH_OF(X509_NAME) *name_hash = lh_X509_NAME_new(xname_hash, xname_cmp); - OPENSSL_CTX *prev_libctx = NULL; + OSSL_LIB_CTX *prev_libctx = NULL; if ((name_hash == NULL) || (in == NULL)) { SSLerr(0, ERR_R_MALLOC_FAILURE); @@ -630,7 +630,7 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file_ex(const char *file, goto err; /* Internally lh_X509_NAME_retrieve() needs the libctx to retrieve SHA1 */ - prev_libctx = OPENSSL_CTX_set0_default(libctx); + prev_libctx = OSSL_LIB_CTX_set0_default(libctx); for (;;) { if (PEM_read_bio_X509(in, &x, NULL, NULL) == NULL) break; @@ -665,7 +665,7 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file_ex(const char *file, ret = NULL; done: /* restore the old libctx */ - OPENSSL_CTX_set0_default(prev_libctx); + OSSL_LIB_CTX_set0_default(prev_libctx); BIO_free(in); X509_free(x); lh_X509_NAME_free(name_hash); diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c index 26071cc2a1..8151213938 100644 --- a/ssl/ssl_conf.c +++ b/ssl/ssl_conf.c @@ -469,7 +469,7 @@ static int do_store(SSL_CONF_CTX *cctx, CERT *cert; X509_STORE **st; SSL_CTX *ctx; - OPENSSL_CTX *libctx = NULL; + OSSL_LIB_CTX *libctx = NULL; const char *propq = NULL; if (cctx->ctx != NULL) { 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) { diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h index 66a84cf54e..b83cf1e1ca 100644 --- a/ssl/ssl_local.h +++ b/ssl/ssl_local.h @@ -832,7 +832,7 @@ typedef struct tls_group_info_st { # define TLS_GROUP_FFDHE_FOR_TLS1_3 (TLS_GROUP_FFDHE|TLS_GROUP_ONLY_FOR_TLS1_3) struct ssl_ctx_st { - OPENSSL_CTX *libctx; + OSSL_LIB_CTX *libctx; const SSL_METHOD *method; STACK_OF(SSL_CIPHER) *cipher_list; @@ -2812,12 +2812,12 @@ void ssl_comp_free_compression_methods_int(void); /* ssl_mcnf.c */ void ssl_ctx_system_config(SSL_CTX *ctx); -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); int ssl_evp_cipher_up_ref(const EVP_CIPHER *cipher); 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); int ssl_evp_md_up_ref(const EVP_MD *md); diff --git a/ssl/ssl_mcnf.c b/ssl/ssl_mcnf.c index 10c2f412e0..82003ba69e 100644 --- a/ssl/ssl_mcnf.c +++ b/ssl/ssl_mcnf.c @@ -28,8 +28,8 @@ static int ssl_do_config(SSL *s, SSL_CTX *ctx, const char *name, int system) unsigned int flags; const SSL_METHOD *meth; const SSL_CONF_CMD *cmds; - OPENSSL_CTX *prev_libctx = NULL; - OPENSSL_CTX *libctx = NULL; + OSSL_LIB_CTX *prev_libctx = NULL; + OSSL_LIB_CTX *libctx = NULL; if (s == NULL && ctx == NULL) { SSLerr(SSL_F_SSL_DO_CONFIG, ERR_R_PASSED_NULL_PARAMETER); @@ -66,7 +66,7 @@ static int ssl_do_config(SSL *s, SSL_CTX *ctx, const char *name, int system) if (meth->ssl_connect != ssl_undefined_function) flags |= SSL_CONF_FLAG_CLIENT; SSL_CONF_CTX_set_flags(cctx, flags); - prev_libctx = OPENSSL_CTX_set0_default(libctx); + prev_libctx = OSSL_LIB_CTX_set0_default(libctx); for (i = 0; i < cmd_count; i++) { char *cmdstr, *arg; @@ -84,7 +84,7 @@ static int ssl_do_config(SSL *s, SSL_CTX *ctx, const char *name, int system) } rv = SSL_CONF_CTX_finish(cctx); err: - OPENSSL_CTX_set0_default(prev_libctx); + OSSL_LIB_CTX_set0_default(prev_libctx); SSL_CONF_CTX_free(cctx); return rv <= 0 ? 0 : 1; } |