diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 14:18:03 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:38 +1000 |
| commit | 4669015d7b0784d00812f6b015ca8080e37ff70b (patch) | |
| tree | f49b993d32f962a4f86833cea889140aa625f2fb /crypto/cms | |
| parent | 6dd4b77a855570a6433af0a8584bdb9bfe353bc3 (diff) | |
| download | openssl-new-4669015d7b0784d00812f6b015ca8080e37ff70b.tar.gz | |
Add ossl_ x509 symbols
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'crypto/cms')
| -rw-r--r-- | crypto/cms/cms_env.c | 6 | ||||
| -rw-r--r-- | crypto/cms/cms_lib.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c index b0b9e4aaac..494c2cc8fc 100644 --- a/crypto/cms/cms_env.c +++ b/crypto/cms/cms_env.c @@ -181,9 +181,9 @@ void ossl_cms_RecipientInfos_set_cmsctx(CMS_ContentInfo *cms) break; case CMS_RECIPINFO_TRANS: ri->d.ktri->cms_ctx = ctx; - x509_set0_libctx(ri->d.ktri->recip, - ossl_cms_ctx_get0_libctx(ctx), - ossl_cms_ctx_get0_propq(ctx)); + ossl_x509_set0_libctx(ri->d.ktri->recip, + ossl_cms_ctx_get0_libctx(ctx), + ossl_cms_ctx_get0_propq(ctx)); break; case CMS_RECIPINFO_KEK: ri->d.kekri->cms_ctx = ctx; diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c index 03e6c631ef..0c9a372832 100644 --- a/crypto/cms/cms_lib.c +++ b/crypto/cms/cms_lib.c @@ -105,7 +105,7 @@ void ossl_cms_resolve_libctx(CMS_ContentInfo *ci) for (i = 0; i < sk_CMS_CertificateChoices_num(*pcerts); i++) { cch = sk_CMS_CertificateChoices_value(*pcerts, i); if (cch->type == CMS_CERTCHOICE_CERT) - x509_set0_libctx(cch->d.certificate, libctx, propq); + ossl_x509_set0_libctx(cch->d.certificate, libctx, propq); } } } |