Proper fix for calculating encoded session-key length

FreeRADIUS · Oct 29, 2013 · 4203125 · 4203125
1 parent 6c729c4
commit 4203125
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/include/libradius.h b/src/include/libradius.h
@@ -424,6 +424,8 @@ int		rad_pwencode(char *encpw, size_t *len, char const *secret,
 			     uint8_t const *vector);
 int		rad_pwdecode(char *encpw, size_t len, char const *secret,
 			     uint8_t const *vector);
+
+#define	FR_TUNNEL_PW_ENC_LENGTH(_x) (2 + 1 + _x + PAD(_x + 1, AUTH_PASS_LEN))
 int		rad_tunnel_pwencode(char *encpw, size_t *len, char const *secret,
 				    uint8_t const *vector);
 int		rad_tunnel_pwdecode(uint8_t *encpw, size_t *len,

diff --git a/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c b/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c
@@ -324,7 +324,7 @@ leap_packet_t *eapleap_stage6(REQUEST *request, leap_packet_t *packet, VALUE_PAI
 	 */
 	fr_md5_calc(hash, buffer, 16 + 8 + 24 + 8 + 24);
 
-	q = talloc_array(vp, char, 64 + sizeof("leap:session-key="));
+	q = talloc_array(vp, char, FR_TUNNEL_PW_ENC_LENGTH(16) + sizeof("leap:session-key="));
 	strcpy(q, "leap:session-key=");
 
 	memcpy(q + 17, hash, 16);