From patchwork Tue Feb 22 12:50:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5226 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4K2zZd4hLbz3xgb for ; Tue, 22 Feb 2022 12:51:53 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4K2zZX48rwzWG; Tue, 22 Feb 2022 12:51:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4K2zZX2MGnz30HP; Tue, 22 Feb 2022 12:51:48 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4K2zZV42myz2ypn for ; Tue, 22 Feb 2022 12:51:46 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4K2zZV2gHHz11b; Tue, 22 Feb 2022 12:51:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1645534306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DXGsOXLv3y+lA0whKBZNMvHh8YWFy5kkPN9AmagDykk=; b=kcy3QlEgMw6juq0+zfYzVhHeg0mE9Gj6uGwlT6U80VHLwppH878PkWsyimj0NtpKZPlHyL lxOFXM9Eq6WLtDOcVDz/dwZW6le/L8g8dCPuLtjZ8v2iwg/FXtc5M+MGo0iuwghlPdlQON Pt7x24nwRbW1XuKgNE3QSUplxFjS1PzloECc49fQAGXlTC72grg8jc+6Y2D/QeA2uxXecR b0M00+zRvooMWBfYg7xkBXwtNa0z/PHkBUwCQnaj1A8pzY8HWLhF+44jaF7lcD4jfq141O y0nPXE6X2DeuH2k5Mf+YrmigZ7sEGApgd9nTZ0J95Ox5jrkwjbxaag/oCQEwuQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1645534306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DXGsOXLv3y+lA0whKBZNMvHh8YWFy5kkPN9AmagDykk=; b=DZIQaY0rQaElIE8edEnq1oyfo7/48Eqmun5gcMa7MzhPCeGFJRCYtbGLWCPzf6kziCzIFs rtBMUoxpzpHzSIAw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 02/50] wireless client: Remove option for WEP Date: Tue, 22 Feb 2022 12:50:47 +0000 Message-Id: <20220222125135.1211290-3-michael.tremer@ipfire.org> In-Reply-To: <20220222125135.1211290-1-michael.tremer@ipfire.org> References: <20220222125135.1211290-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 867715953..6536ad71f 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 091f0a8cb..160d2a27e 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 6314c4456..67ca84557 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 6589fe087..7b7425db2 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 68ccda062..44946ebf0 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 00d177904..19c5bea50 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 a9b4dadd8..0be097609 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 ed0d756f5..d98422621 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 5fadb4657..bd83b8db4 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 96c9209a2..9852b892b 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 05a40a942..f333bad43 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 7dc7ff663..3169908db 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 54e5bb089..f44c4bcae 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 7741006b3..d5bac7204 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 8831d99a4..160043820 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',