From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 24 Nov 2010 19:14:59 +0000 (+0000)
Subject: fix typo in HMAC redirection, add HMAC INIT tracing
X-Git-Tag: OpenSSL-fips-2_0-rc1~915
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fa71cc7bcea57e16a22da6c92bdd833107ce406a;p=oweals%2Fopenssl.git

fix typo in HMAC redirection, add HMAC INIT tracing
---

diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index 0f672b217d..3bdb779488 100644
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -89,6 +89,7 @@
 #define TEST_ENG_OPENSSL_RC4
 #define TEST_ENG_OPENSSL_PKEY
 /* #define TEST_ENG_OPENSSL_HMAC */
+/* #define TEST_ENG_OPENSSL_HMAC_INIT */
 /* #define TEST_ENG_OPENSSL_RC4_OTHERS */
 #define TEST_ENG_OPENSSL_RC4_P_INIT
 /* #define TEST_ENG_OPENSSL_RC4_P_CIPHER */
@@ -426,7 +427,9 @@ static int ossl_hmac_init(EVP_PKEY_CTX *ctx)
 	HMAC_CTX_init(&hctx->ctx);
 	EVP_PKEY_CTX_set_data(ctx, hctx);
 	EVP_PKEY_CTX_set0_keygen_info(ctx, NULL, 0);
-
+#ifdef TEST_ENG_OPENSSL_HMAC_INIT
+	fprintf(stderr, "(TEST_ENG_OPENSSL_HMAC) ossl_hmac_init() called\n");
+#endif
 	return 1;
 	}
 
@@ -606,7 +609,7 @@ static int ossl_pkey_meths(ENGINE *e, EVP_PKEY_METHOD **pmeth,
 		EVP_PKEY_HMAC,
 		0
 		};
-	if (!*pmeth)
+	if (!pmeth)
 		{
 		*nids = ossl_pkey_nids;
 		return 1;