From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 6 Jan 2021 18:03:45 +0000 (+0000)
Subject: hostapd: Enable WPA-PSK-SHA256 when 802.11w is enabled
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fbetter-wpa3;p=people%2Fms%2Fipfire-2.x.git

hostapd: Enable WPA-PSK-SHA256 when 802.11w is enabled

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 575b696d7b..923b96cbc9 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -691,13 +691,21 @@ END
 	print CONFIGFILE "ieee80211w=0\n";
  }
 
+ my @wpa_key_mgmt=(
+	"WPA-PSK",
+ );
+
+ if (($wlanapsettings{'IEEE80211W'} eq "on") || ($wlanapsettings{'IEEE80211W'} eq "optional")) {
+	push(@wpa_key_mgmt, "WPA-PSK-SHA256");
+ }
+
  if ( $wlanapsettings{'ENC'} eq 'wpa1'){
 	print CONFIGFILE <<END
 ######################### wpa hostapd configuration ############################
 #
 wpa=1
 wpa_passphrase=$wlanapsettings{'PWD'}
-wpa_key_mgmt=WPA-PSK
+wpa_key_mgmt=@wpa_key_mgmt
 wpa_pairwise=TKIP
 END
 ;
@@ -707,7 +715,7 @@ END
 #
 wpa=2
 wpa_passphrase=$wlanapsettings{'PWD'}
-wpa_key_mgmt=WPA-PSK
+wpa_key_mgmt=@wpa_key_mgmt
 rsn_pairwise=CCMP
 END
 ;
@@ -733,12 +741,14 @@ rsn_pairwise=CCMP
 END
 ;
  }elsif ( $wlanapsettings{'ENC'} eq 'wpa2+3'){
+	push(@wpa_key_mgmt, "SAE");
+
 	print CONFIGFILE <<END
 ######################### wpa hostapd configuration ############################
 #
 wpa=2
 wpa_passphrase=$wlanapsettings{'PWD'}
-wpa_key_mgmt=WPA-PSK SAE
+wpa_key_mgmt=@wpa_key_mgmt
 rsn_pairwise=CCMP
 END
 ;