Revert "[wpa_supplicant] Cumulative patch from c4e90da6d"
This reverts commit 39bc25d3a79c1375de430a7918d949c1a86f70c6.
Test: Compilation
Change-Id: Iae7670429466958911b5296cb1359bceecc0b03e
Exempt-From-Owner-Approval: Revert since it's breaking the build
diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index ab37f03..a005217 100644
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -438,13 +438,6 @@
wmm_ac_vo_acm=0
# Note: for IEEE 802.11b mode: cWmin=3 cWmax=4 burst=102
-# Enable Multi-AP functionality
-# 0 = disabled (default)
-# 1 = AP support backhaul BSS
-# 2 = AP support fronthaul BSS
-# 3 = AP supports both backhaul BSS and fronthaul BSS
-#multi_ap=0
-
# Static WEP key configuration
#
# The key number to use when transmitting.
@@ -801,30 +794,6 @@
# unsigned integer = duration in units of 16 us
#he_rts_threshold=0
-#he_mu_edca_qos_info_param_count
-#he_mu_edca_qos_info_q_ack
-#he_mu_edca_qos_info_queue_request=1
-#he_mu_edca_qos_info_txop_request
-#he_mu_edca_ac_be_aifsn=0
-#he_mu_edca_ac_be_ecwmin=15
-#he_mu_edca_ac_be_ecwmax=15
-#he_mu_edca_ac_be_timer=255
-#he_mu_edca_ac_bk_aifsn=0
-#he_mu_edca_ac_bk_aci=1
-#he_mu_edca_ac_bk_ecwmin=15
-#he_mu_edca_ac_bk_ecwmax=15
-#he_mu_edca_ac_bk_timer=255
-#he_mu_edca_ac_vi_ecwmin=15
-#he_mu_edca_ac_vi_ecwmax=15
-#he_mu_edca_ac_vi_aifsn=0
-#he_mu_edca_ac_vi_aci=2
-#he_mu_edca_ac_vi_timer=255
-#he_mu_edca_ac_vo_aifsn=0
-#he_mu_edca_ac_vo_aci=3
-#he_mu_edca_ac_vo_ecwmin=15
-#he_mu_edca_ac_vo_ecwmax=15
-#he_mu_edca_ac_vo_timer=255
-
##### IEEE 802.1X-2004 related configuration ##################################
# Require IEEE 802.1X authorization
@@ -922,57 +891,18 @@
# valid CRL signed by the CA is required to be included in the ca_cert file.
# This can be done by using PEM format for CA certificate and CRL and
# concatenating these into one file. Whenever CRL changes, hostapd needs to be
-# restarted to take the new CRL into use. Alternatively, crl_reload_interval can
-# be used to configure periodic updating of the loaded CRL information.
+# restarted to take the new CRL into use.
# 0 = do not verify CRLs (default)
# 1 = check the CRL of the user certificate
# 2 = check all CRLs in the certificate path
#check_crl=1
-# Specify whether to ignore certificate CRL validity time mismatches with
-# errors X509_V_ERR_CERT_HAS_EXPIRED and X509_V_ERR_CERT_NOT_YET_VALID.
-#
-# 0 = ignore errors
-# 1 = do not ignore errors (default)
-#check_crl_strict=1
-
-# CRL reload interval in seconds
-# This can be used to reload ca_cert file and the included CRL on every new TLS
-# session if difference between last reload and the current reload time in
-# seconds is greater than crl_reload_interval.
-# Note: If interval time is very short, CPU overhead may be negatively affected
-# and it is advised to not go below 300 seconds.
-# This is applicable only with check_crl values 1 and 2.
-# 0 = do not reload CRLs (default)
-# crl_reload_interval = 300
-
# TLS Session Lifetime in seconds
# This can be used to allow TLS sessions to be cached and resumed with an
# abbreviated handshake when using EAP-TLS/TTLS/PEAP.
# (default: 0 = session caching and resumption disabled)
#tls_session_lifetime=3600
-# TLS flags
-# [ALLOW-SIGN-RSA-MD5] = allow MD5-based certificate signatures (depending on
-# the TLS library, these may be disabled by default to enforce stronger
-# security)
-# [DISABLE-TIME-CHECKS] = ignore certificate validity time (this requests
-# the TLS library to accept certificates even if they are not currently
-# valid, i.e., have expired or have not yet become valid; this should be
-# used only for testing purposes)
-# [DISABLE-TLSv1.0] = disable use of TLSv1.0
-# [ENABLE-TLSv1.0] = explicitly enable use of TLSv1.0 (this allows
-# systemwide TLS policies to be overridden)
-# [DISABLE-TLSv1.1] = disable use of TLSv1.1
-# [ENABLE-TLSv1.1] = explicitly enable use of TLSv1.1 (this allows
-# systemwide TLS policies to be overridden)
-# [DISABLE-TLSv1.2] = disable use of TLSv1.2
-# [ENABLE-TLSv1.2] = explicitly enable use of TLSv1.2 (this allows
-# systemwide TLS policies to be overridden)
-# [DISABLE-TLSv1.3] = disable use of TLSv1.3
-# [ENABLE-TLSv1.3] = enable TLSv1.3 (experimental - disabled by default)
-#tls_flags=[flag1][flag2]...
-
# Cached OCSP stapling response (DER encoded)
# If set, this file is sent as a certificate status response by the EAP server
# if the EAP peer requests certificate status in the ClientHello message.
@@ -1174,8 +1104,8 @@
# Tunnel-Medium-Type (value 6 = IEEE 802), Tunnel-Private-Group-ID (value
# VLANID as a string). Optionally, the local MAC ACL list (accept_mac_file) can
# be used to set static client MAC address to VLAN ID mapping.
-# 0 = disabled (default); only VLAN IDs from accept_mac_file will be used
-# 1 = optional; use default interface if RADIUS server does not include VLAN ID
+# 0 = disabled (default)
+# 1 = option; use default interface if RADIUS server does not include VLAN ID
# 2 = required; reject authentication if RADIUS server does not include VLAN ID
#dynamic_vlan=0
@@ -1198,7 +1128,6 @@
# white space (space or tab).
# If no entries are provided by this file, the station is statically mapped
# to <bss-iface>.<vlan-id> interfaces.
-# Each line can optionally also contain the name of a bridge to add the VLAN to
#vlan_file=/etc/hostapd.vlan
# Interface where 802.1q tagged packets should appear when a RADIUS server is
@@ -1489,13 +1418,6 @@
# dot11AssociationSAQueryRetryTimeout, 1...4294967295
#assoc_sa_query_retry_timeout=201
-# ocv: Operating Channel Validation
-# This is a countermeasure against multi-channel man-in-the-middle attacks.
-# Enabling this automatically also enables ieee80211w, if not yet enabled.
-# 0 = disabled (default)
-# 1 = enabled
-#ocv=1
-
# disable_pmksa_caching: Disable PMKSA caching
# This parameter can be used to disable caching of PMKSA created through EAP
# authentication. RSN preauthentication may still end up using PMKSA caching if
@@ -2351,21 +2273,6 @@
# Default is 0 = OCE disabled
#oce=0
-# RSSI-based assocition rejection
-#
-# Reject STA association if RSSI is below given threshold (in dBm)
-# Allowed range: -60 to -90 dBm; default = 0 (rejection disabled)
-# Note: This rejection happens based on a signal strength detected while
-# receiving a single frame and as such, there is significant risk of the value
-# not being accurate and this resulting in valid stations being rejected. As
-# such, this functionality is not recommended to be used for purposes other than
-# testing.
-#rssi_reject_assoc_rssi=-75
-#
-# Association retry delay in seconds allowed by the STA if RSSI has not met the
-# threshold (range: 0..255, default=30).
-#rssi_reject_assoc_timeout=30
-
##### Fast Session Transfer (FST) support #####################################
#
# The options in this section are only available when the build configuration