diff options
| author | Andrej Shadura <andrewsh@debian.org> | 2018-10-07 11:11:11 +0200 |
|---|---|---|
| committer | Andrej Shadura <andrewsh@debian.org> | 2018-10-07 11:11:11 +0200 |
| commit | 136df9a6a54c7e20de2d599360fe846b3020e9a4 (patch) | |
| tree | 9ac1b5f9e67ad350c4d490a96c7fc7499611d433 /hostapd | |
| parent | 9beb1c24e24ba27d5eb40076905efda8c84ef0c7 (diff) | |
New upstream version 2.7~git20181004+1dd66fc
Diffstat (limited to 'hostapd')
| -rw-r--r-- | hostapd/config_file.c | 4 | ||||
| -rw-r--r-- | hostapd/hostapd.conf | 18 |
2 files changed, 20 insertions, 2 deletions
diff --git a/hostapd/config_file.c b/hostapd/config_file.c index 37308db..b1ab13e 100644 --- a/hostapd/config_file.c +++ b/hostapd/config_file.c @@ -1237,6 +1237,8 @@ static int hostapd_config_ht_capab(struct hostapd_config *conf, conf->ht_capab |= HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET; conf->ht40_plus_minus_allowed = 1; } + if (!os_strstr(capab, "[HT40+]") && !os_strstr(capab, "[HT40-]")) + conf->secondary_channel = 0; if (os_strstr(capab, "[SMPS-STATIC]")) { conf->ht_capab &= ~HT_CAP_INFO_SMPS_MASK; conf->ht_capab |= HT_CAP_INFO_SMPS_STATIC; @@ -3865,6 +3867,7 @@ static int hostapd_config_fill(struct hostapd_config *conf, } else if (os_strcmp(buf, "sae_commit_override") == 0) { wpabuf_free(bss->sae_commit_override); bss->sae_commit_override = wpabuf_parse_bin(pos); +#endif /* CONFIG_TESTING_OPTIONS */ #ifdef CONFIG_SAE } else if (os_strcmp(buf, "sae_password") == 0) { if (parse_sae_password(bss, pos) < 0) { @@ -3873,7 +3876,6 @@ static int hostapd_config_fill(struct hostapd_config *conf, return 1; } #endif /* CONFIG_SAE */ -#endif /* CONFIG_TESTING_OPTIONS */ } else if (os_strcmp(buf, "vendor_elements") == 0) { if (parse_wpabuf_hex(line, buf, &bss->vendor_elements, pos)) return 1; diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf index 0de4b85..70f9713 100644 --- a/hostapd/hostapd.conf +++ b/hostapd/hostapd.conf @@ -1239,7 +1239,10 @@ own_ip_addr=127.0.0.1 # and/or WPA2 (full IEEE 802.11i/RSN): # bit0 = WPA # bit1 = IEEE 802.11i/RSN (WPA2) (dot11RSNAEnabled) -#wpa=1 +# Note that WPA3 is also configured with bit1 since it uses RSN just like WPA2. +# In other words, for WPA3, wpa=2 is used the configuration (and +# wpa_key_mgmt=SAE for WPA3-Personal instead of wpa_key_mgmt=WPA-PSK). +#wpa=2 # WPA pre-shared keys for WPA-PSK. This can be either entered as a 256-bit # secret in hex format (64 hex digits), wpa_psk, or as an ASCII passphrase @@ -1268,10 +1271,23 @@ own_ip_addr=127.0.0.1 # Set of accepted key management algorithms (WPA-PSK, WPA-EAP, or both). The # entries are separated with a space. WPA-PSK-SHA256 and WPA-EAP-SHA256 can be # added to enable SHA256-based stronger algorithms. +# WPA-PSK = WPA-Personal / WPA2-Personal +# WPA-PSK-SHA256 = WPA2-Personal using SHA256 +# WPA-EAP = WPA-Enterprise / WPA2-Enterprise +# WPA-EAP-SHA256 = WPA2-Enterprise using SHA256 +# SAE = SAE (WPA3-Personal) +# WPA-EAP-SUITE-B-192 = WPA3-Enterprise with 192-bit security/CNSA suite +# FT-PSK = FT with passphrase/PSK +# FT-EAP = FT with EAP +# FT-EAP-SHA384 = FT with EAP using SHA384 +# FT-SAE = FT with SAE # FILS-SHA256 = Fast Initial Link Setup with SHA256 # FILS-SHA384 = Fast Initial Link Setup with SHA384 # FT-FILS-SHA256 = FT and Fast Initial Link Setup with SHA256 # FT-FILS-SHA384 = FT and Fast Initial Link Setup with SHA384 +# OWE = Opportunistic Wireless Encryption (a.k.a. Enhanced Open) +# DPP = Device Provisioning Protocol +# OSEN = Hotspot 2.0 online signup with encryption # (dot11RSNAConfigAuthenticationSuitesTable) #wpa_key_mgmt=WPA-PSK WPA-EAP |