From: joshua <joshua@openbsd.org>
Date: Tue, 26 Mar 2024 06:08:51 +0000 (+0000)
Subject: Clean up use of EVP_MD_CTX_{legacy_clear,cleanup} in EVP_SignFinal
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=eb60c3d08682dc4501e740d4694caf6d2a741555;p=openbsd

Clean up use of EVP_MD_CTX_{legacy_clear,cleanup} in EVP_SignFinal

ok jsing@
---

diff --git a/lib/libcrypto/evp/p_sign.c b/lib/libcrypto/evp/p_sign.c
index f6d6e12a30d..70290ed2169 100644
--- a/lib/libcrypto/evp/p_sign.c
+++ b/lib/libcrypto/evp/p_sign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p_sign.c,v 1.20 2024/02/18 15:45:42 tb Exp $ */
+/* $OpenBSD: p_sign.c,v 1.21 2024/03/26 06:08:51 joshua Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -71,18 +71,19 @@ EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
 {
 	unsigned char m[EVP_MAX_MD_SIZE];
 	unsigned int m_len;
-	EVP_MD_CTX tmp_ctx;
+	EVP_MD_CTX *md_ctx;
 	EVP_PKEY_CTX *pkctx = NULL;
 	size_t sltmp;
 	int ret = 0;
 
 	*siglen = 0;
-	EVP_MD_CTX_legacy_clear(&tmp_ctx);
-	if (!EVP_MD_CTX_copy_ex(&tmp_ctx, ctx))
+
+	if ((md_ctx = EVP_MD_CTX_new()) == NULL)
+		goto err;
+	if (!EVP_MD_CTX_copy_ex(md_ctx, ctx))
 		goto err;
-	if (!EVP_DigestFinal_ex(&tmp_ctx, &(m[0]), &m_len))
+	if (!EVP_DigestFinal_ex(md_ctx, &(m[0]), &m_len))
 		goto err;
-	EVP_MD_CTX_cleanup(&tmp_ctx);
 
 	sltmp = (size_t)EVP_PKEY_size(pkey);
 
@@ -99,6 +100,7 @@ EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
 	ret = 1;
 
  err:
+	EVP_MD_CTX_free(md_ctx);
 	EVP_PKEY_CTX_free(pkctx);
 	return ret;
 }