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 /crypto/pkcs7 | |
| 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 'crypto/pkcs7')
| -rw-r--r-- | crypto/pkcs7/pk7_asn1.c | 2 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_lib.c | 2 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_local.h | 2 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_smime.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/crypto/pkcs7/pk7_asn1.c b/crypto/pkcs7/pk7_asn1.c index b0027cec2d..21d8e8785d 100644 --- a/crypto/pkcs7/pk7_asn1.c +++ b/crypto/pkcs7/pk7_asn1.c @@ -83,7 +83,7 @@ PKCS7 *PKCS7_new(void) return (PKCS7 *)ASN1_item_new(ASN1_ITEM_rptr(PKCS7)); } -PKCS7 *PKCS7_new_ex(OPENSSL_CTX *libctx, const char *propq) +PKCS7 *PKCS7_new_ex(OSSL_LIB_CTX *libctx, const char *propq) { PKCS7 *pkcs7 = PKCS7_new(); diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c index 8f92424ad7..da3336982e 100644 --- a/crypto/pkcs7/pk7_lib.c +++ b/crypto/pkcs7/pk7_lib.c @@ -432,7 +432,7 @@ const PKCS7_CTX *pkcs7_get0_ctx(const PKCS7 *p7) return p7 != NULL ? &p7->ctx : NULL; } -OPENSSL_CTX *pkcs7_ctx_get0_libctx(const PKCS7_CTX *ctx) +OSSL_LIB_CTX *pkcs7_ctx_get0_libctx(const PKCS7_CTX *ctx) { return ctx != NULL ? ctx->libctx : NULL; } diff --git a/crypto/pkcs7/pk7_local.h b/crypto/pkcs7/pk7_local.h index b9f9c35340..5db0127e1d 100644 --- a/crypto/pkcs7/pk7_local.h +++ b/crypto/pkcs7/pk7_local.h @@ -10,5 +10,5 @@ #include "crypto/pkcs7.h" const PKCS7_CTX *pkcs7_get0_ctx(const PKCS7 *p7); -OPENSSL_CTX *pkcs7_ctx_get0_libctx(const PKCS7_CTX *ctx); +OSSL_LIB_CTX *pkcs7_ctx_get0_libctx(const PKCS7_CTX *ctx); const char *pkcs7_ctx_get0_propq(const PKCS7_CTX *ctx); diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c index e9ae4f3394..8e16e63971 100644 --- a/crypto/pkcs7/pk7_smime.c +++ b/crypto/pkcs7/pk7_smime.c @@ -21,7 +21,7 @@ static int pkcs7_copy_existing_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si); PKCS7 *PKCS7_sign_ex(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, - BIO *data, int flags, OPENSSL_CTX *libctx, + BIO *data, int flags, OSSL_LIB_CTX *libctx, const char *propq) { PKCS7 *p7; @@ -445,7 +445,7 @@ STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, PKCS7 *PKCS7_encrypt_ex(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher, int flags, - OPENSSL_CTX *libctx, const char *propq) + OSSL_LIB_CTX *libctx, const char *propq) { PKCS7 *p7; BIO *p7bio = NULL; |