From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 10 Nov 2010 14:13:20 +0000 (+0100)
Subject: Removed extra calls to HMAC_CTX_init()
X-Git-Tag: release_3_0_0_beta0~1174
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius.git;a=commitdiff_plain;h=313d3a0b08a8217194cef143bd9aa7e47fee7c7e

Removed extra calls to HMAC_CTX_init()

Noticed by James Ballantine
---

diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c
index d88d06d..8265802 100644
--- a/src/modules/rlm_wimax/rlm_wimax.c
+++ b/src/modules/rlm_wimax/rlm_wimax.c
@@ -220,7 +220,6 @@ static int wimax_postauth(void *instance, REQUEST *request)
 	/*
 	 *	MIP-RK-2 = HMAC-SSHA256(EMSK, MIP-RK-1 | usage-data | 0x01)
 	 */
-	HMAC_CTX_init(&hmac);
 	HMAC_Init_ex(&hmac, emsk->vp_octets, emsk->length, EVP_sha256(), NULL);
 	
 	HMAC_Update(&hmac, (const uint8_t *) &mip_rk_1, rk1_len);
@@ -237,7 +236,6 @@ static int wimax_postauth(void *instance, REQUEST *request)
 	/*
 	 *	MIP-SPI = HMAC-SSHA256(MIP-RK, "SPI CMIP PMIP");
 	 */
-	HMAC_CTX_init(&hmac);
 	HMAC_Init_ex(&hmac, mip_rk, rk_len, EVP_sha256(), NULL);
 	
 	HMAC_Update(&hmac, (const uint8_t *) "SPI CMIP PMIP", 12);
@@ -302,7 +300,6 @@ static int wimax_postauth(void *instance, REQUEST *request)
 		 *	MN-HA-PMIP4 =
 		 *	   H(MIP-RK, "PMIP4 MN HA" | HA-IPv4 | MN-NAI);
 		 */
-		HMAC_CTX_init(&hmac);
 		HMAC_Init_ex(&hmac, mip_rk, rk_len, EVP_sha1(), NULL);
 
 		HMAC_Update(&hmac, (const uint8_t *) "PMIP4 MN HA", 11);
@@ -354,7 +351,6 @@ static int wimax_postauth(void *instance, REQUEST *request)
 		 *	MN-HA-CMIP4 =
 		 *	   H(MIP-RK, "CMIP4 MN HA" | HA-IPv4 | MN-NAI);
 		 */
-		HMAC_CTX_init(&hmac);
 		HMAC_Init_ex(&hmac, mip_rk, rk_len, EVP_sha1(), NULL);
 
 		HMAC_Update(&hmac, (const uint8_t *) "CMIP4 MN HA", 11);
@@ -406,7 +402,6 @@ static int wimax_postauth(void *instance, REQUEST *request)
 		 *	MN-HA-CMIP6 =
 		 *	   H(MIP-RK, "CMIP6 MN HA" | HA-IPv6 | MN-NAI);
 		 */
-		HMAC_CTX_init(&hmac);
 		HMAC_Init_ex(&hmac, mip_rk, rk_len, EVP_sha1(), NULL);
 
 		HMAC_Update(&hmac, (const uint8_t *) "CMIP6 MN HA", 11);
@@ -455,7 +450,6 @@ static int wimax_postauth(void *instance, REQUEST *request)
 	 */
 	fa_rk = pairfind(request->reply->vps, 14, VENDORPEC_WIMAX);
 	if (fa_rk && (fa_rk->length <= 1)) {
-		HMAC_CTX_init(&hmac);
 		HMAC_Init_ex(&hmac, mip_rk, rk_len, EVP_sha1(), NULL);
 		
 		HMAC_Update(&hmac, (const uint8_t *) "FA-RK", 5);
@@ -488,7 +482,6 @@ static int wimax_postauth(void *instance, REQUEST *request)
 	 */
 	ip = pairfind(request->reply->vps, 1901, 0);
 	if (fa_rk && ip && mn_nai) {
-		HMAC_CTX_init(&hmac);
 		HMAC_Init_ex(&hmac, fa_rk->vp_octets, fa_rk->length,
 			     EVP_sha1(), NULL);