diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-02-18 14:03:25 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-02-22 09:16:36 +1000 |
| commit | 53155f1c814be6d8bfdd77333a16ec9cee7fc3bb (patch) | |
| tree | 54aba774e91c8f5d6d1a8ce79514200d7ac91a4c /include | |
| parent | 937a62323b67bfff59c795e90df3acf66bb4579a (diff) | |
Fix external symbols for cms.
Partial fix for #12964
This adds ossl_ names for symbols related to cms_* and ess_*
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14241)
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/cms.h | 12 | ||||
| -rw-r--r-- | include/crypto/ess.h | 27 | ||||
| -rw-r--r-- | include/openssl/symhacks.h | 4 |
3 files changed, 20 insertions, 23 deletions
diff --git a/include/crypto/cms.h b/include/crypto/cms.h index f98f3cfbea..f1cf6bd6bf 100644 --- a/include/crypto/cms.h +++ b/include/crypto/cms.h @@ -15,13 +15,13 @@ /* internal CMS-ESS related stuff */ -int cms_add1_signing_cert(CMS_SignerInfo *si, ESS_SIGNING_CERT *sc); -int cms_add1_signing_cert_v2(CMS_SignerInfo *si, ESS_SIGNING_CERT_V2 *sc); +int ossl_cms_add1_signing_cert(CMS_SignerInfo *si, ESS_SIGNING_CERT *sc); +int ossl_cms_add1_signing_cert_v2(CMS_SignerInfo *si, ESS_SIGNING_CERT_V2 *sc); -int cms_signerinfo_get_signing_cert_v2(CMS_SignerInfo *si, - ESS_SIGNING_CERT_V2 **psc); -int cms_signerinfo_get_signing_cert(CMS_SignerInfo *si, - ESS_SIGNING_CERT **psc); +int ossl_cms_signerinfo_get_signing_cert_v2(CMS_SignerInfo *si, + ESS_SIGNING_CERT_V2 **psc); +int ossl_cms_signerinfo_get_signing_cert(CMS_SignerInfo *si, + ESS_SIGNING_CERT **psc); # endif /* OPENSSL_NO_CMS */ #endif diff --git a/include/crypto/ess.h b/include/crypto/ess.h index c13cd64222..5abd229869 100644 --- a/include/crypto/ess.h +++ b/include/crypto/ess.h @@ -13,24 +13,25 @@ /* internal ESS related stuff */ -ESS_SIGNING_CERT *ESS_SIGNING_CERT_get(PKCS7_SIGNER_INFO *si); -int ESS_SIGNING_CERT_add(PKCS7_SIGNER_INFO *si, ESS_SIGNING_CERT *sc); +ESS_SIGNING_CERT *ossl_ess_signing_cert_get(PKCS7_SIGNER_INFO *si); +int ossl_ess_signing_cert_add(PKCS7_SIGNER_INFO *si, ESS_SIGNING_CERT *sc); -ESS_SIGNING_CERT *ESS_SIGNING_CERT_new_init(X509 *signcert, - STACK_OF(X509) *certs, - int issuer_needed); +ESS_SIGNING_CERT *ossl_ess_signing_cert_new_init(X509 *signcert, + STACK_OF(X509) *certs, + int issuer_needed); -ESS_SIGNING_CERT_V2 *ESS_SIGNING_CERT_V2_get(PKCS7_SIGNER_INFO *si); -int ESS_SIGNING_CERT_V2_add(PKCS7_SIGNER_INFO *si, ESS_SIGNING_CERT_V2 *sc); +ESS_SIGNING_CERT_V2 *ossl_ess_signing_cert_v2_get(PKCS7_SIGNER_INFO *si); +int ossl_ess_signing_cert_v2_add(PKCS7_SIGNER_INFO *si, ESS_SIGNING_CERT_V2 *sc); -ESS_SIGNING_CERT_V2 *ESS_SIGNING_CERT_V2_new_init(const EVP_MD *hash_alg, - X509 *signcert, - STACK_OF(X509) *certs, - int issuer_needed); +ESS_SIGNING_CERT_V2 *ossl_ess_signing_cert_v2_new_init(const EVP_MD *hash_alg, + X509 *signcert, + STACK_OF(X509) *certs, + int issuer_needed); /* Returns < 0 if certificate is not found, certificate index otherwise. */ -int ess_find_cert_v2(const STACK_OF(ESS_CERT_ID_V2) *cert_ids, const X509 *cert); -int ess_find_cert(const STACK_OF(ESS_CERT_ID) *cert_ids, X509 *cert); +int ossl_ess_find_cert_v2(const STACK_OF(ESS_CERT_ID_V2) *cert_ids, + const X509 *cert); +int ossl_ess_find_cert(const STACK_OF(ESS_CERT_ID) *cert_ids, X509 *cert); /*- * IssuerSerial ::= SEQUENCE { diff --git a/include/openssl/symhacks.h b/include/openssl/symhacks.h index d3eacc293f..b2ae379525 100644 --- a/include/openssl/symhacks.h +++ b/include/openssl/symhacks.h @@ -34,10 +34,6 @@ # undef i2d_ECPKPARAMETERS # define i2d_ECPKPARAMETERS i2d_UC_ECPKPARAMETERS -/* This one clashes with CMS_data_create */ -# undef cms_Data_create -# define cms_Data_create priv_cms_Data_create - # endif #endif /* ! defined HEADER_VMS_IDHACKS_H */ |