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/cms | |
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/cms')
-rw-r--r-- | crypto/cms/cms_cd.c | 2 | ||||
-rw-r--r-- | crypto/cms/cms_dd.c | 3 | ||||
-rw-r--r-- | crypto/cms/cms_ec.c | 2 | ||||
-rw-r--r-- | crypto/cms/cms_env.c | 4 | ||||
-rw-r--r-- | crypto/cms/cms_ess.c | 2 | ||||
-rw-r--r-- | crypto/cms/cms_lib.c | 6 | ||||
-rw-r--r-- | crypto/cms/cms_local.h | 14 | ||||
-rw-r--r-- | crypto/cms/cms_smime.c | 10 |
8 files changed, 23 insertions, 20 deletions
diff --git a/crypto/cms/cms_cd.c b/crypto/cms/cms_cd.c index 2abc867a59..717b0a6a41 100644 --- a/crypto/cms/cms_cd.c +++ b/crypto/cms/cms_cd.c @@ -21,7 +21,7 @@ /* CMS CompressedData Utilities */ -CMS_ContentInfo *cms_CompressedData_create(int comp_nid, OPENSSL_CTX *libctx, +CMS_ContentInfo *cms_CompressedData_create(int comp_nid, OSSL_LIB_CTX *libctx, const char *propq) { CMS_ContentInfo *cms; diff --git a/crypto/cms/cms_dd.c b/crypto/cms/cms_dd.c index 6b3796e7c0..fd9ea7e342 100644 --- a/crypto/cms/cms_dd.c +++ b/crypto/cms/cms_dd.c @@ -18,7 +18,8 @@ /* CMS DigestedData Utilities */ CMS_ContentInfo *cms_DigestedData_create(const EVP_MD *md, - OPENSSL_CTX *libctx, const char *propq) + OSSL_LIB_CTX *libctx, + const char *propq) { CMS_ContentInfo *cms; CMS_DigestedData *dd; diff --git a/crypto/cms/cms_ec.c b/crypto/cms/cms_ec.c index ca2294ebc3..79d603adcb 100644 --- a/crypto/cms/cms_ec.c +++ b/crypto/cms/cms_ec.c @@ -16,7 +16,7 @@ #ifndef OPENSSL_NO_EC static EVP_PKEY *pkey_type2param(int ptype, const void *pval, - OPENSSL_CTX *libctx, const char *propq) + OSSL_LIB_CTX *libctx, const char *propq) { EVP_PKEY *pkey = NULL; EVP_PKEY_CTX *pctx = NULL; diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c index 8f3e2db339..83826beb51 100644 --- a/crypto/cms/cms_env.c +++ b/crypto/cms/cms_env.c @@ -219,7 +219,7 @@ EVP_PKEY_CTX *CMS_RecipientInfo_get0_pkey_ctx(CMS_RecipientInfo *ri) } CMS_ContentInfo *CMS_EnvelopedData_create_ex(const EVP_CIPHER *cipher, - OPENSSL_CTX *libctx, + OSSL_LIB_CTX *libctx, const char *propq) { CMS_ContentInfo *cms; @@ -248,7 +248,7 @@ CMS_ContentInfo *CMS_EnvelopedData_create(const EVP_CIPHER *cipher) } CMS_ContentInfo * -CMS_AuthEnvelopedData_create_ex(const EVP_CIPHER *cipher, OPENSSL_CTX *libctx, +CMS_AuthEnvelopedData_create_ex(const EVP_CIPHER *cipher, OSSL_LIB_CTX *libctx, const char *propq) { CMS_ContentInfo *cms; diff --git a/crypto/cms/cms_ess.c b/crypto/cms/cms_ess.c index 7a617c3419..287bcf86c0 100644 --- a/crypto/cms/cms_ess.c +++ b/crypto/cms/cms_ess.c @@ -117,7 +117,7 @@ int ess_check_signing_certs(CMS_SignerInfo *si, STACK_OF(X509) *chain) CMS_ReceiptRequest *CMS_ReceiptRequest_create0_ex( unsigned char *id, int idlen, int allorfirst, STACK_OF(GENERAL_NAMES) *receiptList, STACK_OF(GENERAL_NAMES) *receiptsTo, - OPENSSL_CTX *libctx, const char *propq) + OSSL_LIB_CTX *libctx, const char *propq) { CMS_ReceiptRequest *rr; diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c index f35e503308..6713c8674a 100644 --- a/crypto/cms/cms_lib.c +++ b/crypto/cms/cms_lib.c @@ -40,7 +40,7 @@ int i2d_CMS_ContentInfo(const CMS_ContentInfo *a, unsigned char **out) return ASN1_item_i2d((const ASN1_VALUE *)a, out, (CMS_ContentInfo_it())); } -CMS_ContentInfo *CMS_ContentInfo_new_ex(OPENSSL_CTX *libctx, const char *propq) +CMS_ContentInfo *CMS_ContentInfo_new_ex(OSSL_LIB_CTX *libctx, const char *propq) { CMS_ContentInfo *ci; @@ -78,7 +78,7 @@ const CMS_CTX *cms_get0_cmsctx(const CMS_ContentInfo *cms) return cms != NULL ? &cms->ctx : NULL; } -OPENSSL_CTX *cms_ctx_get0_libctx(const CMS_CTX *ctx) +OSSL_LIB_CTX *cms_ctx_get0_libctx(const CMS_CTX *ctx) { return ctx->libctx; } @@ -117,7 +117,7 @@ const ASN1_OBJECT *CMS_get0_type(const CMS_ContentInfo *cms) return cms->contentType; } -CMS_ContentInfo *cms_Data_create(OPENSSL_CTX *libctx, const char *propq) +CMS_ContentInfo *cms_Data_create(OSSL_LIB_CTX *libctx, const char *propq) { CMS_ContentInfo *cms = CMS_ContentInfo_new_ex(libctx, propq); diff --git a/crypto/cms/cms_local.h b/crypto/cms/cms_local.h index 0b663a9e88..3dfeb72689 100644 --- a/crypto/cms/cms_local.h +++ b/crypto/cms/cms_local.h @@ -47,7 +47,7 @@ typedef struct CMS_ReceiptsFrom_st CMS_ReceiptsFrom; typedef struct CMS_CTX_st CMS_CTX; struct CMS_CTX_st { - OPENSSL_CTX *libctx; + OSSL_LIB_CTX *libctx; char *propq; }; @@ -390,16 +390,18 @@ DECLARE_ASN1_ALLOC_FUNCTIONS(CMS_IssuerAndSerialNumber) BIO *cms_content_bio(CMS_ContentInfo *cms); const CMS_CTX *cms_get0_cmsctx(const CMS_ContentInfo *cms); -OPENSSL_CTX *cms_ctx_get0_libctx(const CMS_CTX *ctx); +OSSL_LIB_CTX *cms_ctx_get0_libctx(const CMS_CTX *ctx); const char *cms_ctx_get0_propq(const CMS_CTX *ctx); void cms_resolve_libctx(CMS_ContentInfo *ci); -CMS_ContentInfo *cms_Data_create(OPENSSL_CTX *ctx, const char *propq); +CMS_ContentInfo *cms_Data_create(OSSL_LIB_CTX *ctx, const char *propq); CMS_ContentInfo *cms_DigestedData_create(const EVP_MD *md, - OPENSSL_CTX *libctx, const char *propq); + OSSL_LIB_CTX *libctx, + const char *propq); BIO *cms_DigestedData_init_bio(const CMS_ContentInfo *cms); -int cms_DigestedData_do_final(const CMS_ContentInfo *cms, BIO *chain, int verify); +int cms_DigestedData_do_final(const CMS_ContentInfo *cms, + BIO *chain, int verify); BIO *cms_SignedData_init_bio(CMS_ContentInfo *cms); int cms_SignedData_final(CMS_ContentInfo *cms, BIO *chain); @@ -411,7 +413,7 @@ int cms_SignerIdentifier_get0_signer_id(CMS_SignerIdentifier *sid, ASN1_INTEGER **sno); int cms_SignerIdentifier_cert_cmp(CMS_SignerIdentifier *sid, X509 *cert); -CMS_ContentInfo *cms_CompressedData_create(int comp_nid, OPENSSL_CTX *libctx, +CMS_ContentInfo *cms_CompressedData_create(int comp_nid, OSSL_LIB_CTX *libctx, const char *propq); BIO *cms_CompressedData_init_bio(const CMS_ContentInfo *cms); diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c index c8bec75cdd..f8ae342551 100644 --- a/crypto/cms/cms_smime.c +++ b/crypto/cms/cms_smime.c @@ -119,7 +119,7 @@ int CMS_data(CMS_ContentInfo *cms, BIO *out, unsigned int flags) } CMS_ContentInfo *CMS_data_create_ex(BIO *in, unsigned int flags, - OPENSSL_CTX *libctx, const char *propq) + OSSL_LIB_CTX *libctx, const char *propq) { CMS_ContentInfo *cms = cms_Data_create(libctx, propq); @@ -164,7 +164,7 @@ int CMS_digest_verify(CMS_ContentInfo *cms, BIO *dcont, BIO *out, } CMS_ContentInfo *CMS_digest_create_ex(BIO *in, const EVP_MD *md, - unsigned int flags, OPENSSL_CTX *ctx, + unsigned int flags, OSSL_LIB_CTX *ctx, const char *propq) { CMS_ContentInfo *cms; @@ -220,7 +220,7 @@ int CMS_EncryptedData_decrypt(CMS_ContentInfo *cms, CMS_ContentInfo *CMS_EncryptedData_encrypt_ex(BIO *in, const EVP_CIPHER *cipher, const unsigned char *key, size_t keylen, unsigned int flags, - OPENSSL_CTX *libctx, + OSSL_LIB_CTX *libctx, const char *propq) { CMS_ContentInfo *cms; @@ -500,7 +500,7 @@ int CMS_verify_receipt(CMS_ContentInfo *rcms, CMS_ContentInfo *ocms, CMS_ContentInfo *CMS_sign_ex(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, BIO *data, - unsigned int flags, OPENSSL_CTX *libctx, + unsigned int flags, OSSL_LIB_CTX *libctx, const char *propq) { CMS_ContentInfo *cms; @@ -619,7 +619,7 @@ CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si, CMS_ContentInfo *CMS_encrypt_ex(STACK_OF(X509) *certs, BIO *data, const EVP_CIPHER *cipher, unsigned int flags, - OPENSSL_CTX *libctx, const char *propq) + OSSL_LIB_CTX *libctx, const char *propq) { CMS_ContentInfo *cms; int i; |