summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2024-02-02 14:13:11 +0000
committertb <>2024-02-02 14:13:11 +0000
commita931b9fe4c471545a30c6975c303fa27abc695af (patch)
tree6ca68bf594494490796de22cd99e06949a39e800
parent15585ef44b4608dd6a101a6f4b844ad8fa6c8afa (diff)
downloadopenbsd-a931b9fe4c471545a30c6975c303fa27abc695af.tar.gz
openbsd-a931b9fe4c471545a30c6975c303fa27abc695af.tar.bz2
openbsd-a931b9fe4c471545a30c6975c303fa27abc695af.zip
Ignore EVP_MD_CTX_reset() return value
Also drop now unnecessary NULL checks before it.
-rw-r--r--src/lib/libcrypto/cms/cms_sd.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/libcrypto/cms/cms_sd.c b/src/lib/libcrypto/cms/cms_sd.c
index 5f472311d0..b644717bbb 100644
--- a/src/lib/libcrypto/cms/cms_sd.c
+++ b/src/lib/libcrypto/cms/cms_sd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_sd.c,v 1.29 2023/10/18 07:30:49 tb Exp $ */ 1/* $OpenBSD: cms_sd.c,v 1.30 2024/02/02 14:13:11 tb Exp $ */
2/* 2/*
3 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 3 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
4 * project. 4 * project.
@@ -744,7 +744,7 @@ CMS_SignerInfo_sign(CMS_SignerInfo *si)
744 } 744 }
745 745
746 if (si->pctx == NULL) { 746 if (si->pctx == NULL) {
747 EVP_MD_CTX_reset(si->mctx); 747 (void)EVP_MD_CTX_reset(si->mctx);
748 if (!EVP_DigestSignInit(si->mctx, &si->pctx, md, NULL, si->pkey)) 748 if (!EVP_DigestSignInit(si->mctx, &si->pctx, md, NULL, si->pkey))
749 goto err; 749 goto err;
750 } 750 }
@@ -779,8 +779,7 @@ CMS_SignerInfo_sign(CMS_SignerInfo *si)
779 ret = 1; 779 ret = 1;
780 780
781 err: 781 err:
782 if (si->mctx != NULL) 782 (void)EVP_MD_CTX_reset(si->mctx);
783 EVP_MD_CTX_reset(si->mctx);
784 freezero(buf, buf_len); 783 freezero(buf, buf_len);
785 freezero(sig, sig_len); 784 freezero(sig, sig_len);
786 785
@@ -831,8 +830,7 @@ CMS_SignerInfo_verify(CMS_SignerInfo *si)
831 } 830 }
832 831
833 err: 832 err:
834 if (si->mctx != NULL) 833 (void)EVP_MD_CTX_reset(si->mctx);
835 EVP_MD_CTX_reset(si->mctx);
836 freezero(buf, buf_len); 834 freezero(buf, buf_len);
837 835
838 return ret; 836 return ret;