From 7a6c3de23a14e39ef833399635a2c77f004e733b Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 3 Feb 2017 14:41:39 +0200 Subject: [PATCH] ERP: Use macro for EMSKname length instead of hardcoded integer value While RFC 5295 uses "8" as the value to use in the length field in KDF context when deriving EMSKname, it is clearer to use the macro defining EMSKname as the value since the KDF design in RFC 5295 encodes the length of the derived data in octets in that part of the context data. This change is just making the implementation easier to understand while not actually changing the behavior. Signed-off-by: Jouni Malinen --- src/eap_peer/eap.c | 2 +- src/eap_server/eap_server.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/eap_peer/eap.c b/src/eap_peer/eap.c index cd43934d0..15584a478 100644 --- a/src/eap_peer/eap.c +++ b/src/eap_peer/eap.c @@ -526,7 +526,7 @@ static void eap_peer_erp_init(struct eap_sm *sm) wpa_hexdump_key(MSG_DEBUG, "EAP: EMSK", emsk, emsk_len); - WPA_PUT_BE16(len, 8); + WPA_PUT_BE16(len, EAP_EMSK_NAME_LEN); if (hmac_sha256_kdf(sm->eapSessionId, sm->eapSessionIdLen, "EMSK", len, sizeof(len), EMSKname, EAP_EMSK_NAME_LEN) < 0) { diff --git a/src/eap_server/eap_server.c b/src/eap_server/eap_server.c index ebfaa122f..1b571cf59 100644 --- a/src/eap_server/eap_server.c +++ b/src/eap_server/eap_server.c @@ -452,7 +452,7 @@ static void eap_server_erp_init(struct eap_sm *sm) wpa_hexdump_key(MSG_DEBUG, "EAP: EMSK", emsk, emsk_len); - WPA_PUT_BE16(len, 8); + WPA_PUT_BE16(len, EAP_EMSK_NAME_LEN); if (hmac_sha256_kdf(sm->eap_if.eapSessionId, sm->eap_if.eapSessionIdLen, "EMSK", len, sizeof(len), EMSKname, EAP_EMSK_NAME_LEN) < 0) {