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/record | |
| 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 'ssl/record')
| -rw-r--r-- | ssl/record/record_local.h | 4 | ||||
| -rw-r--r-- | ssl/record/tls_pad.c | 12 |
2 files changed, 8 insertions, 8 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]; |