From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 8 Feb 2010 16:31:28 +0000 (+0000)
Subject: Use supplied ENGINE when initialising CMAC. Restore pctx setting.
X-Git-Tag: OpenSSL-fips-2_0-rc1~1277
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3e31ff4824f7d8cdc94127f5988a8e84914822a;p=thirdparty%2Fopenssl.git

Use supplied ENGINE when initialising CMAC. Restore pctx setting.
---

diff --git a/crypto/cmac/cm_pmeth.c b/crypto/cmac/cm_pmeth.c
index 585fc8e4bb7..c581e789f7a 100644
--- a/crypto/cmac/cm_pmeth.c
+++ b/crypto/cmac/cm_pmeth.c
@@ -138,7 +138,7 @@ static int pkey_cmac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
 		break;
 
 		case EVP_PKEY_CTRL_CIPHER:
-		if (!CMAC_Init(cmctx, NULL, 0, p2, NULL))
+		if (!CMAC_Init(cmctx, NULL, 0, p2, ctx->engine))
 			return 0;
 		break;
 
diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index 2fd35a90e4d..c7b7390b5eb 100644
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c
@@ -113,6 +113,8 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
 		}
 	if (EVP_PKEY_CTX_set_signature_md(ctx->pctx, type) <= 0)
 		return 0;
+	if (pctx)
+		*pctx = ctx->pctx;
 	if (ctx->pctx->pmeth->flags & EVP_PKEY_FLAG_SIGCTX_CUSTOM)
 		return 1;
 	if (!EVP_DigestInit_ex(ctx, type, e))