Merge remote-tracking branch 'ms/wifi-fixes'

[ipfire-2.x.git] / html / cgi-bin / wirelessclient.cgi

diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi
index 6978663cf39d4d7aaa9c7eea8634ccfc435162e7..d8637ccd2aec092dccf1debbb7653470730f15e7 100644 (file)
--- a/html/cgi-bin/wirelessclient.cgi
+++ b/html/cgi-bin/wirelessclient.cgi
@@ -324,6 +324,8 @@ END
                        $encryption_mode = $Lang::tr{'wlan client encryption wpa'};
                } elsif ($config[3] eq "WPA2") {
                        $encryption_mode = $Lang::tr{'wlan client encryption wpa2'};
+               } elsif ($config[3] eq "WPA3") {
+                       $encryption_mode = $Lang::tr{'wlan client encryption wpa3'};
                } elsif ($config[3] eq "EAP") {
                        $encryption_mode = $Lang::tr{'wlan client encryption eap'};
                }
@@ -462,6 +464,7 @@ sub showEditBox() {
        my %selected = ();
        $selected{'ENCRYPTION'} = ();
        $selected{'ENCRYPTION'}{'NONE'} = '';
+       $selected{'ENCRYPTION'}{'WPA3'} = '';
        $selected{'ENCRYPTION'}{'WPA2'} = '';
        $selected{'ENCRYPTION'}{'WPA'} = '';
        $selected{'ENCRYPTION'}{'WEP'} = '';
@@ -505,9 +508,10 @@ sub showEditBox() {
                                                <select name='ENCRYPTION'>
                                                        <option value="NONE" $selected{'ENCRYPTION'}{'NONE'}>$Lang::tr{'wlan client encryption none'}</option>
                                                        <option value="EAP"  $selected{'ENCRYPTION'}{'EAP'}>$Lang::tr{'wlan client encryption eap'}</option>
+                                                       <option value="WPA3" $selected{'ENCRYPTION'}{'WPA3'}>$Lang::tr{'wlan client encryption wpa3'}</option>
                                                        <option value="WPA2" $selected{'ENCRYPTION'}{'WPA2'}>$Lang::tr{'wlan client encryption wpa2'}</option>
                                                        <option value="WPA"  $selected{'ENCRYPTION'}{'WPA'}>$Lang::tr{'wlan client encryption wpa'}</option>
-                                                       <option value="WEP"  $selected{'ENCRYPTION'}{'WEP'}>$Lang::tr{'wlan client encryption wep'}</option>                                                    
+                                                       <option value="WEP"  $selected{'ENCRYPTION'}{'WEP'}>$Lang::tr{'wlan client encryption wep'}</option>
                                                </select>
                                        </td>
                                        <td colspan="2" width='40%'></td>
@@ -680,6 +684,19 @@ sub ShowStatus() {
                                </tr>
 END
 
+               if ($status{'pmf'} eq "1") {
+                       print <<END;
+                               <tr>
+                                       <td width='20%'>
+                                               $Lang::tr{'wlan client management frame protection'}
+                                       </td>
+                                       <td width='80%'>
+                                               $Lang::tr{'active'}
+                                       </td>
+                               </tr>
+END
+               }
+
                if ($status{'EAP state'}) {
                        my $selected_method = $status{'selectedMethod'};
                        $selected_method =~ s/\d+ \((.*)\)/$1/e;
@@ -734,12 +751,25 @@ END
                }
 
                if (($status{'pairwise_cipher'} ne "NONE") || ($status{'group_cipher'} ne "NONE")) {
-                       print <<END;
+                       if ($status{'key_mgmt'} eq "SAE") {
+                               print <<END;
+                               <tr>
+                                       <td colspan='2'>
+                                               <strong>$Lang::tr{'wlan client encryption wpa3'}</strong>
+                                       </td>
+                               </tr>
+END
+                       } else {
+                               print <<END;
                                <tr>
                                        <td colspan='2'>
                                                <strong>$Lang::tr{'wlan client encryption wpa'}</strong>
                                        </td>
                                </tr>
+END
+                       }
+
+                       print <<END;
                                <tr>
                                        <td width='20%'>
                                                $Lang::tr{'wlan client pairwise cipher'}
@@ -839,7 +869,6 @@ sub ValidateInput($) {
        # Check for invalid key length.
        } elsif (ValidKeyLength($settings{'ENCRYPTION'}, $settings{'PSK'})) {
                return "$Lang::tr{'wlan client invalid key length'}";
-
        }
 
        # Reset WPA mode, if WPA(2) is not selected.