From e491389ebc4a0d2b32412ab5b3e7b284f41ece4c Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Thu, 16 Feb 2017 21:12:40 +0200 Subject: [PATCH] FILS: Fix ifdef for PTK derivation with SHA384-based AKM sha384_prf() is used both with Suite B and FILS, so add CONFIG_FILS as another alternative to building in this functionality. Signed-off-by: Jouni Malinen --- src/common/wpa_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/wpa_common.c b/src/common/wpa_common.c index 3280baee5..fd167d6f5 100644 --- a/src/common/wpa_common.c +++ b/src/common/wpa_common.c @@ -194,12 +194,12 @@ int wpa_pmk_to_ptk(const u8 *pmk, size_t pmk_len, const char *label, ptk->tk_len = wpa_cipher_key_len(cipher); ptk_len = ptk->kck_len + ptk->kek_len + ptk->tk_len; -#ifdef CONFIG_SUITEB192 +#if defined(CONFIG_SUITEB192) || defined(CONFIG_FILS) if (wpa_key_mgmt_sha384(akmp)) sha384_prf(pmk, pmk_len, label, data, sizeof(data), tmp, ptk_len); else -#endif /* CONFIG_SUITEB192 */ +#endif /* CONFIG_SUITEB192 || CONFIG_FILS */ #ifdef CONFIG_IEEE80211W if (wpa_key_mgmt_sha256(akmp)) sha256_prf(pmk, pmk_len, label, data, sizeof(data),