diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-03-15 20:24:40 +0100 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-04-28 14:10:45 +0200 |
| commit | 1751768cd191c3541dc89a2bb24da1e506385c37 (patch) | |
| tree | 8921c0c143160551591d5d2e3f9b3a62ee419a6a /crypto/cms | |
| parent | 624359374b9af4f99ce1bfaf89e28b7306987777 (diff) | |
ESS: Export three core functions, clean up TS and CMS CAdES-BES usage
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14601)
Diffstat (limited to 'crypto/cms')
| -rw-r--r-- | crypto/cms/cms_ess.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_sd.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/cms/cms_ess.c b/crypto/cms/cms_ess.c index ba78b6ebad..fd9903eee8 100644 --- a/crypto/cms/cms_ess.c +++ b/crypto/cms/cms_ess.c @@ -53,7 +53,7 @@ int ossl_cms_check_signing_certs(const CMS_SignerInfo *si, ESS_SIGNING_CERT_V2 *ssv2 = NULL; int ret = ossl_cms_signerinfo_get_signing_cert(si, &ss) >= 0 && ossl_cms_signerinfo_get_signing_cert_v2(si, &ssv2) >= 0 - && ossl_ess_check_signing_certs(ss, ssv2, chain, 1); + && OSSL_ESS_check_signing_certs(ss, ssv2, chain, 1) > 0; ESS_SIGNING_CERT_free(ss); ESS_SIGNING_CERT_V2_free(ssv2); diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c index 898916d548..43dbec6004 100644 --- a/crypto/cms/cms_sd.c +++ b/crypto/cms/cms_sd.c @@ -377,13 +377,13 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms, int add_sc; if (md == NULL || EVP_MD_is_a(md, SN_sha1)) { - if ((sc = ossl_ess_signing_cert_new_init(signer, + if ((sc = OSSL_ESS_signing_cert_new_init(signer, NULL, 1)) == NULL) goto err; add_sc = ossl_cms_add1_signing_cert(si, sc); ESS_SIGNING_CERT_free(sc); } else { - if ((sc2 = ossl_ess_signing_cert_v2_new_init(md, signer, + if ((sc2 = OSSL_ESS_signing_cert_v2_new_init(md, signer, NULL, 1)) == NULL) goto err; add_sc = ossl_cms_add1_signing_cert_v2(si, sc2); |