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/ts | |
| parent | 624359374b9af4f99ce1bfaf89e28b7306987777 (diff) | |
| download | openssl-new-1751768cd191c3541dc89a2bb24da1e506385c37.tar.gz | |
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/ts')
| -rw-r--r-- | crypto/ts/ts_rsp_sign.c | 4 | ||||
| -rw-r--r-- | crypto/ts/ts_rsp_verify.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c index 6d00a471a2..8f0653c5d3 100644 --- a/crypto/ts/ts_rsp_sign.c +++ b/crypto/ts/ts_rsp_sign.c @@ -687,7 +687,7 @@ static int ts_RESP_sign(TS_RESP_CTX *ctx) certs = ctx->flags & TS_ESS_CERT_ID_CHAIN ? ctx->certs : NULL; if (ctx->ess_cert_id_digest == NULL || EVP_MD_is_a(ctx->ess_cert_id_digest, SN_sha1)) { - if ((sc = ossl_ess_signing_cert_new_init(ctx->signer_cert, + if ((sc = OSSL_ESS_signing_cert_new_init(ctx->signer_cert, certs, 0)) == NULL) goto err; @@ -696,7 +696,7 @@ static int ts_RESP_sign(TS_RESP_CTX *ctx) goto err; } } else { - sc2 = ossl_ess_signing_cert_v2_new_init(ctx->ess_cert_id_digest, + sc2 = OSSL_ESS_signing_cert_v2_new_init(ctx->ess_cert_id_digest, ctx->signer_cert, certs, 0); if (sc2 == NULL) goto err; diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c index 09daa2a449..56f40b1152 100644 --- a/crypto/ts/ts_rsp_verify.c +++ b/crypto/ts/ts_rsp_verify.c @@ -208,7 +208,7 @@ static int ts_check_signing_certs(const PKCS7_SIGNER_INFO *si, { ESS_SIGNING_CERT *ss = ossl_ess_get_signing_cert(si); ESS_SIGNING_CERT_V2 *ssv2 = ossl_ess_get_signing_cert_v2(si); - int ret = ossl_ess_check_signing_certs(ss, ssv2, chain, 1); + int ret = OSSL_ESS_check_signing_certs(ss, ssv2, chain, 1) > 0; ESS_SIGNING_CERT_free(ss); ESS_SIGNING_CERT_V2_free(ssv2); |