]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
FILS: Fix ifdef for PTK derivation with SHA384-based AKM
authorJouni Malinen <jouni@qca.qualcomm.com>
Thu, 16 Feb 2017 19:12:40 +0000 (21:12 +0200)
committerJouni Malinen <j@w1.fi>
Thu, 16 Feb 2017 20:15:29 +0000 (22:15 +0200)
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 <jouni@qca.qualcomm.com>
src/common/wpa_common.c

index 3280baee52fc2f0d4a63481af32c02a82afdd443..fd167d6f54308fa27ee28758642bb3f6f1902181 100644 (file)
@@ -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),