From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Thu, 12 Jan 2017 12:52:33 +0000 (+0000)
Subject: rlm_eap_pwd: initialise HMAC context
X-Git-Tag: release_3_0_13~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a28b2a49dff0722eb8b8d6fb95c601c1a929f114;p=thirdparty%2Ffreeradius-server.git

rlm_eap_pwd: initialise HMAC context

Closes #1876
---

diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c
index 4b19cbbb4d1..c7b303fb22c 100644
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c
@@ -45,6 +45,8 @@ static void H_Init(HMAC_CTX *ctx)
 	uint8_t allzero[SHA256_DIGEST_LENGTH];
 
 	memset(allzero, 0, SHA256_DIGEST_LENGTH);
+
+	HMAC_CTX_init(ctx);
 	HMAC_Init_ex(ctx, allzero, SHA256_DIGEST_LENGTH, EVP_sha256(), NULL);
 }
 
@@ -76,6 +78,7 @@ static void eap_pwd_kdf(uint8_t *key, int keylen, char const *label, int labelle
 	L = htons(resultbitlen);
 	while (len < resultbytelen) {
 		ctr++; i = htons(ctr);
+		HMAC_CTX_init(&hctx);
 		HMAC_Init_ex(&hctx, key, keylen, EVP_sha256(), NULL);
 		if (ctr > 1) {
 			HMAC_Update(&hctx, digest, mdlen);