From f06fdde5b11736782797a13bc13ca148699446da Mon Sep 17 00:00:00 2001
From: James Prestwood <prestwoj@gmail.com>
Date: Mon, 16 Sep 2019 10:57:06 -0700
Subject: [PATCH] doc: host our own hostapd .config file

The test-runner hostapd section continues to grow with various
options to enable. The wording for each of the options was such
that it appeared optional (for test X uncomment Y). Since anyone
running test-runner will likely want the ability to run all
tests it made sense for us to just host our own hostapd config
file that can be copied into the hostapd tree.
---
 doc/hostapd.config  | 36 +++++++++++++++++++++++++++++
 doc/test-runner.txt | 55 ++++-----------------------------------------
 2 files changed, 40 insertions(+), 51 deletions(-)
 create mode 100644 doc/hostapd.config

diff --git a/doc/hostapd.config b/doc/hostapd.config
new file mode 100644
index 00000000..cf88386e
--- /dev/null
+++ b/doc/hostapd.config
@@ -0,0 +1,36 @@
+CONFIG_DRIVER_HOSTAP=y
+CONFIG_DRIVER_NL80211=y
+CONFIG_LIBNL32=y
+CONFIG_IAPP=y
+CONFIG_RSN_PREAUTH=y
+CONFIG_IEEE80211W=y
+CONFIG_EAP=y
+CONFIG_ERP=y
+CONFIG_EAP_MD5=y
+CONFIG_EAP_TLS=y
+CONFIG_EAP_MSCHAPV2=y
+CONFIG_EAP_PEAP=y
+CONFIG_EAP_GTC=y
+CONFIG_EAP_TTLS=y
+CONFIG_EAP_SIM=y
+CONFIG_EAP_AKA=y
+CONFIG_EAP_AKA_PRIME=y
+CONFIG_EAP_PWD=y
+CONFIG_WPS=y
+CONFIG_PKCS12=y
+CONFIG_RADIUS_SERVER=y
+CONFIG_IPV6=y
+CONFIG_IEEE80211R=y
+CONFIG_IEEE80211N=y
+CONFIG_WNM=y
+CONFIG_IEEE80211AC=y
+CONFIG_IEEE80211AX=y
+CONFIG_NO_VLAN=y
+CONFIG_INTERWORKING=y
+CONFIG_HS20=y
+CONFIG_FILS=y
+CONFIG_FILS_SK_PFS=y
+CONFIG_OCV=y
+CONFIG_OWE=y
+CONFIG_DPP=y
+CONFIG_SAE=y
diff --git a/doc/test-runner.txt b/doc/test-runner.txt
index 4b0ba420..3660381a 100644
--- a/doc/test-runner.txt
+++ b/doc/test-runner.txt
@@ -268,63 +268,16 @@ follows:
 
 	$ cd hostap/hostapd
 
-	$ cp defconfig .config
-
-	$ vi .config
-
-	Find the following lines:
-
-		#CONFIG_DRIVER_NL80211=y
-		#CONFIG_LIBNL32=y
-
-	and uncomment it by removing the '#' sign.
-
-	For WPS tests uncomment the following:
-
-		#CONFIG_WPS=y
-
-	For 802.11r (fast roaming) tests uncomment the following:
-
-		#CONFIG_IEEE80211R=y
-		#CONFIG_WNM_AP=y
-		#CONFIG_WNM=y
-
-	For EAP-SIM/AKA tests uncomment the following:
-
-		#CONFIG_EAP_SIM=y
-		#CONDIG_EAP_AKA=y
-		#CONFIG_EAP_AKA_PRIME=y
-
-	For EAP-PWD tests uncomment the following:
-
-		#CONFIG_EAP_PWD=y
-
-	For SAE tests add the following lines:
-
-		CONFIG_SAE=y
-		CONFIG_OWE=y
-		CONFIG_DPP=y
-
-	For pre-authentication tests add the following:
-
-		CONFIG_RADIUS_SERVER=y
-
-	For High Throughput tests add the following:
-
-		CONFIG_IEEE80211N=y
-		CONFIG_IEEE80211AC=y
-
-	For FILS tests add the following:
-
-		CONFIG_FILS=y
-		CONFIG_FILS_SK_PFS=y
-		CONFIG_OCV=y
+	$ cp <iwd>/doc/hostapd.config .config
 
 	Note: You may need to pre-install: 'gnutls-devel' and 'libgcrypt-devel'
 	libraries.
 
 	$ make install
 
+Note: All hostapd build options (CONFIG_*) are stored in doc/hostapd.config.
+Any new options which are required for a test should be added there.
+
 Note: If 'make install' fails with the netlink warnings you may need to
 install libnl-1.0pre8 (or later).