Fix IEEE 802.11r key derivation function to match with the standard

[wpasupplicant] / hostapd / mlme.c

diff --git a/hostapd/mlme.c b/hostapd/mlme.c
index 318ca86..3945dfe 100644 (file)
--- a/hostapd/mlme.c
+++ b/hostapd/mlme.c
@@ -22,6 +22,7 @@
 #include "mlme.h"
 
 
+#ifndef CONFIG_NO_HOSTAPD_LOGGER
 static const char * mlme_auth_alg_str(int alg)
 {
        switch (alg) {
@@ -35,6 +36,7 @@ static const char * mlme_auth_alg_str(int alg)
 
        return "unknown";
 }
+#endif /* CONFIG_NO_HOSTAPD_LOGGER */
 
 
 /**
@@ -58,7 +60,7 @@ void mlme_authenticate_indication(struct hostapd_data *hapd,
                       HOSTAPD_LEVEL_DEBUG,
                       "MLME-AUTHENTICATE.indication(" MACSTR ", %s)",
                       MAC2STR(sta->addr), mlme_auth_alg_str(sta->auth_alg));
-       if (sta->auth_alg != WLAN_AUTH_FT)
+       if (sta->auth_alg != WLAN_AUTH_FT && !(sta->flags & WLAN_STA_MFP))
                mlme_deletekeys_request(hapd, sta);
 }