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/cms_local.h | |
| 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/cms_local.h')
| -rw-r--r-- | crypto/cms/cms_local.h | 14 |
1 files changed, 8 insertions, 6 deletions
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); |