From 40124af8deb17b3f470979acdd5e18f4c3bbfb9f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 20 Feb 2022 17:56:31 +0000 Subject: [PATCH] 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 --- doc/language_issues.en | 1 - doc/language_issues.es | 1 - doc/language_issues.pl | 1 - doc/language_issues.ru | 1 - doc/language_missings | 3 --- html/cgi-bin/wirelessclient.cgi | 14 +------------- langs/de/cgi-bin/de.pl | 3 +-- langs/en/cgi-bin/en.pl | 3 +-- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 3 +-- langs/it/cgi-bin/it.pl | 3 +-- langs/nl/cgi-bin/nl.pl | 3 +-- langs/pl/cgi-bin/pl.pl | 2 +- langs/ru/cgi-bin/ru.pl | 2 +- langs/tr/cgi-bin/tr.pl | 3 +-- 15 files changed, 10 insertions(+), 35 deletions(-) diff --git a/doc/language_issues.en b/doc/language_issues.en index 867715953e..6536ad71fa 100644 --- 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 091f0a8cb2..160d2a27ec 100644 --- 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 6314c44564..67ca845578 100644 --- 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 6589fe087e..7b7425db2b 100644 --- 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 68ccda0621..44946ebf08 100644 --- 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 00d1779042..19c5bea501 100644 --- 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() { - @@ -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 a9b4dadd8e..0be0976092 100644 --- 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 ed0d756f52..d984226216 100644 --- 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 5fadb46573..bd83b8db49 100644 --- 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 96c9209a2c..9852b892b0 100644 --- 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 05a40a9428..f333bad43b 100644 --- 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 7dc7ff6638..3169908db2 100644 --- 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 54e5bb0890..f44c4bcae7 100644 --- 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 7741006b3f..d5bac72041 100644 --- 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 8831d99a43..1600438204 100644 --- 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', -- 2.39.2