From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 8 Apr 2007 16:53:50 +0000 (+0000)
Subject: Fix digest signing so digest type is set after init.
X-Git-Tag: OpenSSL_0_9_8k^2~897
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=baecb96e8a7d109cfbf816038abea45d1d6c78e3;p=oweals%2Fopenssl.git

Fix digest signing so digest type is set after init.
---

diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index 4f9282d029..6ab71907ab 100644
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c
@@ -67,24 +67,18 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
 			  const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey,
 			  int ver)
 	{
+	int r = 0;
 	if (ctx->pctx == NULL)
 		ctx->pctx = EVP_PKEY_CTX_new(pkey, e);
 	if (ctx->pctx == NULL)
 		return 0;
-	if (EVP_PKEY_CTX_set_signature_md(ctx->pctx, type) <= 0)
-		return 0;
-	if (pctx)
-		*pctx = ctx->pctx;
 	if (ver)
 		{
 		if (ctx->pctx->pmeth->verifyctx_init)
 			{
-			int r;
 			r = ctx->pctx->pmeth->verifyctx_init(ctx->pctx, ctx);
 			if (r <= 0)
 				return 0;
-			if (r == 2)
-				return 1;
 			}
 		else if (EVP_PKEY_verify_init(ctx->pctx) <= 0)
 			return 0;
@@ -93,17 +87,18 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
 		{
 		if (ctx->pctx->pmeth->signctx_init)
 			{
-			int r;
 			r = ctx->pctx->pmeth->signctx_init(ctx->pctx, ctx);
 			if (r <= 0)
 				return 0;
-			if (r == 2)
-				return 1;
 			}
 		if (EVP_PKEY_sign_init(ctx->pctx) <= 0)
 			return 0;
 		}
-	if (!EVP_DigestInit_ex(ctx, type, e))
+	if (EVP_PKEY_CTX_set_signature_md(ctx->pctx, type) <= 0)
+		return 0;
+	if (pctx)
+		*pctx = ctx->pctx;
+	if ((r != 2) && !EVP_DigestInit_ex(ctx, type, e))
 		return 0;
 	return 1;
 	}