hostap: Enable option to force clients to use 802.11w

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

diff --git a/doc/language_issues.en b/doc/language_issues.en
index a3aeded57ebe2b4c43ad8546a1d86fea837d5631..60df810d7a40449c81462bd642bb34cd2f7ea0f4 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -2176,6 +2176,7 @@ WARNING: untranslated string: wlanap interface = Select interface
 WARNING: untranslated string: wlanap invalid wpa = Invalid length in WPA Passphrase. Must be between 8 and 63 characters.
 WARNING: untranslated string: wlanap link dhcp = Wireless lan DHCP configuration
 WARNING: untranslated string: wlanap link wireless = Activate wireless lan clients
+WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w)
 WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules!
 WARNING: untranslated string: wlanap no interface = Selected interface is not a wirless lan card!

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 164e36dbb00e2cf24e9e206074507c74e245be4f..439b1f546c927afff3194fe5f299d1735e421c8d 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1365,5 +1365,6 @@ WARNING: untranslated string: wlanap = Access Point
 WARNING: untranslated string: wlanap auto = Automatic Channel Selection
 WARNING: untranslated string: wlanap configuration = Access Point Configuration
 WARNING: untranslated string: wlanap country = Country Code
+WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w)
 WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules!

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index df4f19eff7f7eac8a357eca0c778a5c471dd7d3f..97cb2714743b5d19a923a0b6065b98f83d4f0776 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -881,3 +881,4 @@ WARNING: untranslated string: transport mode does not support vti = VTI is not s
 WARNING: untranslated string: update ruleset = Update ruleset
 WARNING: untranslated string: vpn statistics n2n = unknown string
 WARNING: untranslated string: wlanap auto = Automatic Channel Selection
+WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w)

diff --git a/doc/language_issues.it b/doc/language_issues.it
index b2df1499ea99310dc9cf1bf0e62ce1f224cc2289..a5923b3ddb192b7d4064c22cf5993cc441dba744 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1032,5 +1032,6 @@ WARNING: untranslated string: wlan client tls version = TLS Version
 WARNING: untranslated string: wlanap = Access Point
 WARNING: untranslated string: wlanap auto = Automatic Channel Selection
 WARNING: untranslated string: wlanap configuration = Access Point Configuration
+WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w)
 WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules!

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index fa2cea18ed7f73d513e8063e448a4667177c8959..a180b675d9768fa561e425782c04b455ee024c04 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1078,5 +1078,6 @@ WARNING: untranslated string: wlan client tls version = TLS Version
 WARNING: untranslated string: wlanap = Access Point
 WARNING: untranslated string: wlanap auto = Automatic Channel Selection
 WARNING: untranslated string: wlanap configuration = Access Point Configuration
+WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w)
 WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules!

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 164e36dbb00e2cf24e9e206074507c74e245be4f..439b1f546c927afff3194fe5f299d1735e421c8d 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1365,5 +1365,6 @@ WARNING: untranslated string: wlanap = Access Point
 WARNING: untranslated string: wlanap auto = Automatic Channel Selection
 WARNING: untranslated string: wlanap configuration = Access Point Configuration
 WARNING: untranslated string: wlanap country = Country Code
+WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w)
 WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules!

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index da6fecb07365ff56f743d3741879c28c017b48eb..d832d55601dc75a2a083fccab23c7bc085fd3688 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1360,5 +1360,6 @@ WARNING: untranslated string: wlanap = Access Point
 WARNING: untranslated string: wlanap auto = Automatic Channel Selection
 WARNING: untranslated string: wlanap configuration = Access Point Configuration
 WARNING: untranslated string: wlanap country = Country Code
+WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w)
 WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules!

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index d18b14f01a3d570a05a836dfe9cc3281a88481a2..1419af4b9da036223808ad0dd9929dfb7438a27c 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -895,5 +895,6 @@ WARNING: untranslated string: vpn start action add = Wait for connection initiat
 WARNING: untranslated string: vpn statistics n2n = unknown string
 WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: wlanap auto = Automatic Channel Selection
+WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w)
 WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan
 WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules!

diff --git a/doc/language_missings b/doc/language_missings
index 7e7ccfdde509df8cea92baedc1d476a5488a16c8..e41d14fb2a71af67c7759bf554822bee81413d97 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -795,6 +795,7 @@
 < wlanap auto
 < wlanap configuration
 < wlanap country
+< wlanap management frame protection
 < wlanap neighbor scan
 < wlanap neighbor scan warning
 < wlan client
@@ -904,6 +905,7 @@
 < update ruleset
 < Weekly
 < wlanap auto
+< wlanap management frame protection
 ############################################################################
 # Checking cgi-bin translations for language: it                           #
 ############################################################################
@@ -1161,6 +1163,7 @@
 < wlanap
 < wlanap auto
 < wlanap configuration
+< wlanap management frame protection
 < wlanap neighbor scan
 < wlanap neighbor scan warning
 < wlan client anonymous identity
@@ -1492,6 +1495,7 @@
 < wlanap
 < wlanap auto
 < wlanap configuration
+< wlanap management frame protection
 < wlanap neighbor scan
 < wlanap neighbor scan warning
 < wlan client anonymous identity
@@ -2232,6 +2236,7 @@
 < wlanap auto
 < wlanap configuration
 < wlanap country
+< wlanap management frame protection
 < wlanap neighbor scan
 < wlanap neighbor scan warning
 < wlan client
@@ -3009,6 +3014,7 @@
 < wlanap auto
 < wlanap configuration
 < wlanap country
+< wlanap management frame protection
 < wlanap neighbor scan
 < wlanap neighbor scan warning
 < wlan client
@@ -3133,5 +3139,6 @@
 < vpn wait
 < Weekly
 < wlanap auto
+< wlanap management frame protection
 < wlanap neighbor scan
 < wlanap neighbor scan warning

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 5120e2eae7d4acee40af03a566350fa320844e09..dd30e442b54938f118b9d7631df7db83fe89ec7c 100644 (file)
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -76,6 +76,7 @@ $wlanapsettings{'HTCAPS'} = '';
 $wlanapsettings{'VHTCAPS'} = '';
 $wlanapsettings{'NOSCAN'} = 'off';
 $wlanapsettings{'CLIENTISOLATION'} = 'off';
+$wlanapsettings{'IEEE80211W'} = 'off';
 
 &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
 &Header::getcgihash(\%wlanapsettings);
@@ -257,6 +258,10 @@ $checked{'CLIENTISOLATION'}{'off'} = '';
 $checked{'CLIENTISOLATION'}{'on'} = '';
 $checked{'CLIENTISOLATION'}{$wlanapsettings{'CLIENTISOLATION'}} = "checked='checked'";
 
+$checked{'IEEE80211W'}{'off'} = '';
+$checked{'IEEE80211W'}{'on'} = '';
+$checked{'IEEE80211W'}{$wlanapsettings{'IEEE80211W'}} = "checked='checked'";
+
 $selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'";
 $selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'";
 $selected{'COUNTRY'}{$wlanapsettings{'COUNTRY'}} = "selected='selected'";
@@ -443,6 +448,17 @@ print<<END
        </select>
 </td></tr>
 <tr><td width='25%' class='base'>Passphrase:&nbsp;</td><td class='base' colspan='3'><input type='text' name='PWD' size='30' value='$wlanapsettings{'PWD'}' /></td></tr>
+<tr>
+       <td width='25%' class='base'>$Lang::tr{'wlanap management frame protection'}:&nbsp;</td>
+       <td class='base' colspan="3">
+               <label>
+                       $Lang::tr{'on'} <input type='radio' name='IEEE80211W' value='on' $checked{'IEEE80211W'}{'on'} />
+               </label> |
+               <label>
+                       <input type='radio' name='IEEE80211W' value='off' $checked{'IEEE80211W'}{'off'} /> $Lang::tr{'off'}
+               </label>
+       </td>
+</tr>
 <tr><td colspan='4'><br></td></tr>
 END
 ;
@@ -667,6 +683,13 @@ END
 
  }
 
+ # Management Frame Protection (802.11w)
+ if ($wlanapsettings{'IEEE80211W'} eq "on") {
+       print CONFIGFILE "ieee80211w=2\n";
+ } else {
+       print CONFIGFILE "ieee80211w=0\n";
+ }
+
  if ( $wlanapsettings{'ENC'} eq 'wpa1'){
        print CONFIGFILE <<END
 ######################### wpa hostapd configuration ############################

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 4c61150cac66183d2805c3b18ce0c9332dc20798..8b5723a126dc6829ba8eb3124f93e0f325ea3b24 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2851,6 +2851,7 @@
 'wlanap invalid wpa' => 'Ungültige Länge in WPA-Passphrase. Muss zwischen 8 und 63 Zeichen lang sein.',
 'wlanap link dhcp' => 'Wireless Lan DHCP-Einstellungen',
 'wlanap link wireless' => 'Wireless Lan Clients freischalten',
+'wlanap management frame protection' => 'Management Frame Protection (802.11w)',
 'wlanap neighbor scan' => 'Nachbarschaftsscan',
 'wlanap neighbor scan warning' => 'Warnung! Deaktivierung kann gegen Funkregeln verstoßen.',
 'wlanap no interface' => 'Ausgewähltes Interface ist keine WLAN-Karte!',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 8e8fea059881f7de8af1f82f7672027585d91dc2..8ae154247c5ada44ff06d9c8f78f8ed9daa12755 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2900,6 +2900,7 @@
 'wlanap invalid wpa' => 'Invalid length in WPA Passphrase. Must be between 8 and 63 characters.',
 'wlanap link dhcp' => 'Wireless lan DHCP configuration',
 'wlanap link wireless' => 'Activate wireless lan clients',
+'wlanap management frame protection' => 'Management Frame Protection (802.11w)',
 'wlanap neighbor scan' => 'Neighborhood scan',
 'wlanap neighbor scan warning' => 'Warning! Disabling may violate regulatory rules!',
 'wlanap no interface' => 'Selected interface is not a wirless lan card!',

diff --git a/lfs/hostapd b/lfs/hostapd
index c2830b88a46db47353210f5bacfe5262cfd75dcc..ce399df754aa3056fc509fe89633f7a02ce62145 100644 (file)
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 46
+PAK_VER    = 47
 
 DEPS       = ""