diff options
author | Hai Shalom <haishalom@google.com> | 2019-07-22 12:10:00 -0700 |
---|---|---|
committer | Hai Shalom <haishalom@google.com> | 2019-07-23 08:38:09 -0700 |
commit | 81f62d8b157eaf8f9ea3fd74d571b30e4aadd954 (patch) | |
tree | 64478039a5e0a026cbaa22eddd8324063c5a1376 /wpa_supplicant/wpa_supplicant.conf | |
parent | f1c9764c0e022457636216594483865aea6a1286 (diff) | |
download | wpa_supplicant_8-81f62d8b157eaf8f9ea3fd74d571b30e4aadd954.tar.gz |
[wpa_supplicant] Cumulative patch from b8491ae5a
Also revert local solution for encrypted IMSI and use the upstream version.
Bug: 134177972
Test: Device boots up and connects to WPA3/OWE wifi networks, run traffic.
Test: Able to turn on/off softap, associate wifi STA, run traffic.
Test: Regression test passed (Bug: 137653009)
Change-Id: Ie34a0138a3a2039b03101c788b43acbb33f8332a
Diffstat (limited to 'wpa_supplicant/wpa_supplicant.conf')
-rw-r--r-- | wpa_supplicant/wpa_supplicant.conf | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf index a9205f0b..1159bdcd 100644 --- a/wpa_supplicant/wpa_supplicant.conf +++ b/wpa_supplicant/wpa_supplicant.conf @@ -1058,6 +1058,14 @@ fast_reauth=1 # 0 = disabled (default unless changed with the global okc parameter) # 1 = enabled # +# ft_eap_pmksa_caching: +# Whether FT-EAP PMKSA caching is allowed +# 0 = do not try to use PMKSA caching with FT-EAP (default) +# 1 = try to use PMKSA caching with FT-EAP +# This controls whether to try to use PMKSA caching with FT-EAP for the +# FT initial mobility domain association. +#ft_eap_pmksa_caching=0 +# # wep_key0..3: Static WEP key (ASCII in double quotation, e.g. "abcde" or # hex without quotation, e.g., 0102030405) # wep_tx_keyidx: Default WEP key index (TX) (0..3) @@ -1508,6 +1516,12 @@ fast_reauth=1 # Transitioning between states). #fst_llt=100 +# BSS Transition Management +# disable_btm - Disable BSS transition management in STA +# Set to 0 to enable BSS transition management (default behavior) +# Set to 1 to disable BSS transition management +#disable_btm=0 + # Example blocks: # Simple case: WPA-PSK, PSK as an ASCII passphrase, allow all valid ciphers |