dbus: Fix passive/active scans in some cases

[libeap.git] / wpa_supplicant / wpa_supplicant.conf

diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf
index 1ee282a..b015744 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.conf
+++ b/wpa_supplicant/wpa_supplicant.conf
@@ -196,6 +196,16 @@ fast_reauth=1
 # 4-octet operating system version number (hex string)
 #os_version=01020300
 
+# Config Methods
+# List of the supported configuration methods
+# Available methods: usba ethernet label display ext_nfc_token int_nfc_token
+#      nfc_interface push_button keypad virtual_display physical_display
+#      virtual_push_button physical_push_button
+# For WSC 1.0:
+#config_methods=label display push_button keypad
+# For WSC 2.0:
+#config_methods=label virtual_display virtual_push_button keypad
+
 # Credential processing
 #   0 = process received credentials internally (default)
 #   1 = do not process received credentials; just pass them over ctrl_iface to
@@ -204,6 +214,20 @@ fast_reauth=1
 #      to external program(s)
 #wps_cred_processing=0
 
+# Maximum number of BSS entries to keep in memory
+# Default: 200
+# This can be used to limit memory use on the BSS entries (cached scan
+# results). A larger value may be needed in environments that have huge number
+# of APs when using ap_scan=1 mode.
+#bss_max_count=200
+
+
+# filter_ssids - SSID-based scan result filtering
+# 0 = do not filter scan results (default)
+# 1 = only include configured SSIDs in scan results/BSS table
+#filter_ssids=0
+
+
 # network block
 #
 # Each network (usually AP's sharing the same SSID) is configured as a separate
@@ -268,6 +292,11 @@ fast_reauth=1
 # be used to optimize scanning to not occur on channels that the network does
 # not use. Example: scan_freq=2412 2437 2462
 #
+# freq_list: Array of allowed frequencies
+# Space-separated list of frequencies in MHz to allow for selecting the BSS. If
+# set, scan results that do not match any of the specified frequencies are not
+# considered when selecting a BSS.
+#
 # proto: list of accepted protocols
 # WPA = WPA/IEEE 802.11i/D3.0
 # RSN = WPA2/IEEE 802.11i (also WPA2 can be used as an alias for RSN)
@@ -384,6 +413,16 @@ fast_reauth=1
 #      a trusted CA certificate should always be configured when using
 #      EAP-TLS/TTLS/PEAP. Full path should be used since working directory may
 #      change when wpa_supplicant is run in the background.
+#
+#      Alternatively, this can be used to only perform matching of the server
+#      certificate (SHA-256 hash of the DER encoded X.509 certificate). In
+#      this case, the possible CA certificates in the server certificate chain
+#      are ignored and only the server certificate is verified. This is
+#      configured with the following format:
+#      hash:://server/sha256/cert_hash_in_hex
+#      For example: "hash://server/sha256/
+#      5a1bc1296205e6fdbe3979728efe3920798885c1c4590b5f90f43222d239ca6a"
+#
 #      On Windows, trusted CA certificates can be loaded from the system
 #      certificate store by setting this to cert_store://<name>, e.g.,
 #      ca_cert="cert_store://CA" or ca_cert="cert_store://ROOT".