From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/3] hostapd: Add WPA3 authentication to the web UI
Date: Mon, 19 Oct 2020 14:48:55 +0000
Message-ID: <20201019144857.22211-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5801375977651396196=="
List-Id: <development.lists.ipfire.org>

--===============5801375977651396196==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 html/cgi-bin/wlanap.cgi | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 2c28d50e5..29fdd1cd5 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -130,7 +130,7 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap del =
interface'}" ){
=20
 if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
 	# verify WPA Passphrase - only with enabled enc
-	if (($wlanapsettings{'ENC'} eq "wpa1") || ($wlanapsettings{'ENC'} eq "wpa2"=
) || ($wlanapsettings{'ENC'} eq "wpa1+2")){
+	if ($wlanapsettings{'ENC'} ne "none") {
 		# must be 8 .. 63 characters
 		if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'=
}) > 63)){
 			$errormessage .=3D "$Lang::tr{'wlanap invalid wpa'}<br />";
@@ -442,7 +442,9 @@ print<<END
 		<option value=3D'none' $selected{'ENC'}{'none'}>$Lang::tr{'wlanap none'}</=
option>
 		<option value=3D'wpa1' $selected{'ENC'}{'wpa1'}>WPA1</option>
 		<option value=3D'wpa2' $selected{'ENC'}{'wpa2'}>WPA2</option>
+		<option value=3D'wpa3' $selected{'ENC'}{'wpa3'}>WPA3</option>
 		<option value=3D'wpa1+2' $selected{'ENC'}{'wpa1+2'}>WPA1+2</option>
+		<option value=3D'wpa2+3' $selected{'ENC'}{'wpa2+3'}>WPA2+3</option>
 	</select>
 </td></tr>
 <tr><td width=3D'25%' class=3D'base'>Passphrase:&nbsp;</td><td class=3D'base=
' colspan=3D'3'><input type=3D'text' name=3D'PWD' size=3D'30' value=3D'$wlana=
psettings{'PWD'}' /></td></tr>
@@ -707,6 +709,16 @@ wpa_passphrase=3D$wlanapsettings{'PWD'}
 wpa_key_mgmt=3DWPA-PSK
 rsn_pairwise=3DCCMP
 END
+;
+ }elsif ( $wlanapsettings{'ENC'} eq 'wpa3'){
+	print CONFIGFILE <<END
+######################### wpa hostapd configuration ########################=
####
+#
+wpa=3D2
+wpa_passphrase=3D$wlanapsettings{'PWD'}
+wpa_key_mgmt=3DSAE
+rsn_pairwise=3DCCMP
+END
 ;
  } elsif ( $wlanapsettings{'ENC'} eq 'wpa1+2'){
 	print CONFIGFILE <<END
@@ -718,6 +730,16 @@ wpa_key_mgmt=3DWPA-PSK
 wpa_pairwise=3DTKIP
 rsn_pairwise=3DCCMP
 END
+;
+ }elsif ( $wlanapsettings{'ENC'} eq 'wpa2+3'){
+	print CONFIGFILE <<END
+######################### wpa hostapd configuration ########################=
####
+#
+wpa=3D2
+wpa_passphrase=3D$wlanapsettings{'PWD'}
+wpa_key_mgmt=3DWPA-PSK SAE
+rsn_pairwise=3DCCMP
+END
 ;
  }
 	close CONFIGFILE;
--=20
2.20.1


--===============5801375977651396196==--