wireless client: Remove option for WEP

This has not been compiled into our version of wpa_supplicant (if it has
been ever) and so there is no danger to disable this without any further
ado.

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

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 867715953ea439c4a85e71b161b21aeb169bbdd0..6536ad71fafe7c03ac402d439ba64a41665188f6 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -2154,7 +2154,6 @@ WARNING: untranslated string: wlan client edit entry = Edit wireless client conf
 WARNING: untranslated string: wlan client encryption = Encryption
 WARNING: untranslated string: wlan client encryption eap = EAP
 WARNING: untranslated string: wlan client encryption none = None
-WARNING: untranslated string: wlan client encryption wep = WEP
 WARNING: untranslated string: wlan client encryption wpa = WPA
 WARNING: untranslated string: wlan client encryption wpa2 = WPA2
 WARNING: untranslated string: wlan client encryption wpa3 = WPA3

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 091f0a8cb2e460a5b7b98b65b60b5aba10090ce6..160d2a27ecaa91c0891c60d701132b6ca2986da3 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1554,7 +1554,6 @@ WARNING: untranslated string: wlan client edit entry = Edit wireless client conf
 WARNING: untranslated string: wlan client encryption = Encryption
 WARNING: untranslated string: wlan client encryption eap = EAP
 WARNING: untranslated string: wlan client encryption none = None
-WARNING: untranslated string: wlan client encryption wep = WEP
 WARNING: untranslated string: wlan client encryption wpa = WPA
 WARNING: untranslated string: wlan client encryption wpa2 = WPA2
 WARNING: untranslated string: wlan client encryption wpa3 = WPA3

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 6314c44564ec9100ce6e88bc4be458c6f5a26513..67ca845578f31d6484ff48b9edcc3871ade7d480 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1560,7 +1560,6 @@ WARNING: untranslated string: wlan client edit entry = Edit wireless client conf
 WARNING: untranslated string: wlan client encryption = Encryption
 WARNING: untranslated string: wlan client encryption eap = EAP
 WARNING: untranslated string: wlan client encryption none = None
-WARNING: untranslated string: wlan client encryption wep = WEP
 WARNING: untranslated string: wlan client encryption wpa = WPA
 WARNING: untranslated string: wlan client encryption wpa2 = WPA2
 WARNING: untranslated string: wlan client encryption wpa3 = WPA3

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 6589fe087eb9658b67e156837280168d3e8747f5..7b7425db2b8e2c81d20fbce5dcfd721b9f998686 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1555,7 +1555,6 @@ WARNING: untranslated string: wlan client edit entry = Edit wireless client conf
 WARNING: untranslated string: wlan client encryption = Encryption
 WARNING: untranslated string: wlan client encryption eap = EAP
 WARNING: untranslated string: wlan client encryption none = None
-WARNING: untranslated string: wlan client encryption wep = WEP
 WARNING: untranslated string: wlan client encryption wpa = WPA
 WARNING: untranslated string: wlan client encryption wpa2 = WPA2
 WARNING: untranslated string: wlan client encryption wpa3 = WPA3

diff --git a/doc/language_missings b/doc/language_missings
index 68ccda06214335c85f756b8c6b42fbdec7299832..44946ebf080c133ba79bdce13b3d402e786661ee 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -942,7 +942,6 @@
 < wlan client encryption
 < wlan client encryption eap
 < wlan client encryption none
-< wlan client encryption wep
 < wlan client encryption wpa
 < wlan client encryption wpa2
 < wlan client encryption wpa3
@@ -2876,7 +2875,6 @@
 < wlan client encryption
 < wlan client encryption eap
 < wlan client encryption none
-< wlan client encryption wep
 < wlan client encryption wpa
 < wlan client encryption wpa2
 < wlan client encryption wpa3
@@ -3821,7 +3819,6 @@
 < wlan client encryption
 < wlan client encryption eap
 < wlan client encryption none
-< wlan client encryption wep
 < wlan client encryption wpa
 < wlan client encryption wpa2
 < wlan client encryption wpa3

diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi
index 00d17790422d7644e8af5d7224ddc7872f8ebb2a..19c5bea501af8151d14745b9c36b92671f4722a4 100644 (file)
--- a/html/cgi-bin/wirelessclient.cgi
+++ b/html/cgi-bin/wirelessclient.cgi
@@ -318,8 +318,6 @@ END
                my $encryption_mode = $Lang::tr{'unknown'};
                if ($config[3] eq "NONE") {
                        $encryption_mode = $Lang::tr{'wlan client encryption none'};
-               } elsif ($config[3] eq "WEP") {
-                       $encryption_mode = $Lang::tr{'wlan client encryption wep'};
                } elsif ($config[3] eq "WPA") {
                        $encryption_mode = $Lang::tr{'wlan client encryption wpa'};
                } elsif ($config[3] eq "WPA2") {
@@ -467,7 +465,6 @@ sub showEditBox() {
        $selected{'ENCRYPTION'}{'WPA3'} = '';
        $selected{'ENCRYPTION'}{'WPA2'} = '';
        $selected{'ENCRYPTION'}{'WPA'} = '';
-       $selected{'ENCRYPTION'}{'WEP'} = '';
        $selected{'ENCRYPTION'}{$settings{'ENCRYPTION'}} = "selected='selected'";
 
        $selected{'WPA_MODE'} = ();
@@ -511,7 +508,6 @@ sub showEditBox() {
                                                        <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>
                                                </select>
                                        </td>
                                        <td colspan="2" width='40%'></td>
@@ -838,15 +834,7 @@ sub ValidKeyLength($$) {
 
        my $key_length = length($key);
 
-       if ($algo eq "WEP") {
-               # Key must be 13 or 26 characters.
-               if (($key_length == 13) || ($key_length == 26)) {
-                       return 0;
-               }
-
-               return 1;
-
-       } elsif (($algo eq "WPA2") || ($algo eq "WPA")) {
+       if (($algo eq "WPA2") || ($algo eq "WPA")) {
                # Key must be between 8 and 63 chars.
                if (($key_length >= 8) && ($key_length <= 63)) {
                        return 0;

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index a9b4dadd8e4e67d887e4c82d316b862fc88ab78a..0be0976092cae882d2aaa03580b6769ad8eaaa1b 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1,4 +1,4 @@
-%tr = ( 
+%tr = (
 %tr,
 
 '24 hours' => '24 Stunden',
@@ -2932,7 +2932,6 @@
 'wlan client encryption' => 'Verschlüsselung',
 'wlan client encryption eap' => 'EAP',
 'wlan client encryption none' => 'Keine',
-'wlan client encryption wep' => 'WEP',
 'wlan client encryption wpa' => 'WPA',
 'wlan client encryption wpa2' => 'WPA2',
 'wlan client group cipher' => 'Gruppenchiffre',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index ed0d756f52fafd704b7dcc103d49a77b9fdfbb0e..d98422621654cd893201d21451de89b90978460e 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1,4 +1,4 @@
-%tr = ( 
+%tr = (
 %tr,
 
 '24 hours' => '24 Hours',
@@ -2997,7 +2997,6 @@
 'wlan client encryption' => 'Encryption',
 'wlan client encryption eap' => 'EAP',
 'wlan client encryption none' => 'None',
-'wlan client encryption wep' => 'WEP',
 'wlan client encryption wpa' => 'WPA',
 'wlan client encryption wpa2' => 'WPA2',
 'wlan client encryption wpa3' => 'WPA3',

diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 5fadb46573782a192c4ac0c4fee281b982a39b58..bd83b8db49b876219fd47a1d8e9a1f292a86be9e 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -1,4 +1,4 @@
-%tr = ( 
+%tr = (
 %tr,
 
 'Act as' => 'Actuar Como:',

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 96c9209a2c7037da843db81b9c810383074175d6..9852b892b0e2defd515803e719d1c57059829dc9 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -1,4 +1,4 @@
-%tr = ( 
+%tr = (
 %tr,
 
 '24 hours' => '24 heures',
@@ -2967,7 +2967,6 @@
 'wlan client encryption' => 'Chiffrement ',
 'wlan client encryption eap' => 'EAP',
 'wlan client encryption none' => 'Aucun',
-'wlan client encryption wep' => 'WEP',
 'wlan client encryption wpa' => 'WPA',
 'wlan client encryption wpa2' => 'WPA2',
 'wlan client encryption wpa3' => 'WPA3',

diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index 05a40a942808cb25151bd1cc4231ef752d397836..f333bad43bdd308e3f494f91bdfe55c1a6882f50 100644 (file)
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -1,4 +1,4 @@
-%tr = ( 
+%tr = (
 %tr,
 
 'Act as' => 'Lavora come:',
@@ -2607,7 +2607,6 @@
 'wlan client edit entry' => 'Edit wireless client configuration',
 'wlan client encryption' => 'Encryption',
 'wlan client encryption none' => 'None',
-'wlan client encryption wep' => 'WEP',
 'wlan client encryption wpa' => 'WPA',
 'wlan client encryption wpa2' => 'WPA2',
 'wlan client group cipher' => 'Group cipher',

diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 7dc7ff663857aa417ba22179c5be0726f4885502..3169908db2bbf87651fb53a67e0de194f2ddc587 100644 (file)
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -1,4 +1,4 @@
-%tr = ( 
+%tr = (
 %tr,
 
 'Act as' => 'Fungeren als:',
@@ -2555,7 +2555,6 @@
 'wlan client edit entry' => 'Wijzig draadloze client configuratie',
 'wlan client encryption' => 'Encryptie',
 'wlan client encryption none' => 'Geen',
-'wlan client encryption wep' => 'WEP',
 'wlan client encryption wpa' => 'WPA',
 'wlan client encryption wpa2' => 'WPA2',
 'wlan client group cipher' => 'Group cipher',

diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index 54e5bb0890159cc44783d4e40c60922627457b79..f44c4bcae7a4c722ad317f8fe0d8c2722bad6685 100644 (file)
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -1,4 +1,4 @@
-%tr = ( 
+%tr = (
 %tr,
 
 'Act as' => 'Act as:',

diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index 7741006b3fb90fb30dab72ed1e3f52106283d127..d5bac720419992a367f1d245cf0f50097f4816dd 100644 (file)
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -1,4 +1,4 @@
-%tr = ( 
+%tr = (
 %tr,
 
 'Act as' => 'В качестве:',

diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index 8831d99a43931e9d3e68094557780df0f2df7b55..16004382049e5a8dda10f808f6873a49cb3db3e6 100644 (file)
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -1,4 +1,4 @@
-%tr = ( 
+%tr = (
 %tr,
 
 '24 hours' => '24 Saat',
@@ -2792,7 +2792,6 @@
 'wlan client encryption' => 'Şifreleme',
 'wlan client encryption eap' => 'EAP',
 'wlan client encryption none' => 'Hiçbiri',
-'wlan client encryption wep' => 'WEP',
 'wlan client encryption wpa' => 'WPA',
 'wlan client encryption wpa2' => 'WPA2',
 'wlan client group cipher' => 'Grup şifreleme',