diff --git a/crypto/hmac/hm_pmeth.c b/crypto/hmac/hm_pmeth.c
index 53a3f00f2..27a5c8ea5 100644
--- a/crypto/hmac/hm_pmeth.c
+++ b/crypto/hmac/hm_pmeth.c
@@ -80,11 +80,14 @@ static int pkey_hmac_init(EVP_PKEY_CTX *ctx)
 		return 0;
 	hctx->md = NULL;
 	hctx->ktmp.data = NULL;
+	hctx->ktmp.length = 0;
+	hctx->ktmp.flags = 0;
+	hctx->ktmp.type = V_ASN1_OCTET_STRING;
 	HMAC_CTX_init(&hctx->ctx);
 
 	ctx->data = hctx;
 	ctx->keygen_info_count = 0;
-	
+
 	return 1;
 	}
 
diff --git a/engines/ccgost/gost_pmeth.c b/engines/ccgost/gost_pmeth.c
index 03e024402..746e681db 100644
--- a/engines/ccgost/gost_pmeth.c
+++ b/engines/ccgost/gost_pmeth.c
@@ -545,7 +545,7 @@ static int pkey_gost_mac_ctrl (EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
 		{
 		case EVP_PKEY_CTRL_MD:
 		{
-		if (p2 != NULL)
+		if (EVP_MD_type((const EVP_MD *)p2) != NID_id_Gost28147_89_MAC)
 			{
 			GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL, GOST_R_INVALID_DIGEST_TYPE);
 			return 0;