OCV: Add build configuration for channel validation support

Add compilation flags for Operating Channel Verification (OCV) support.

Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 322f6a63255c914771336406a38c0aaa4ec38178..82d43c75464b65abf874a9daee2058d3f9de5cfa 100644 (file)
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -235,6 +235,11 @@ L_CFLAGS += -DCONFIG_SUITEB192
 NEED_SHA384=y
 endif
 
+ifdef CONFIG_OCV
+L_CFLAGS += -DCONFIG_OCV
+CONFIG_IEEE80211W=y
+endif
+
 ifdef CONFIG_IEEE80211W
 L_CFLAGS += -DCONFIG_IEEE80211W
 NEED_SHA256=y

diff --git a/hostapd/Makefile b/hostapd/Makefile
index 2ce8b7ded84247ecb208c64ab847e30628343c4e..d88964c3280fb25d89a639e376b4cc8486e7325b 100644 (file)
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -278,6 +278,11 @@ CFLAGS += -DCONFIG_SUITEB192
 NEED_SHA384=y
 endif
 
+ifdef CONFIG_OCV
+CFLAGS += -DCONFIG_OCV
+CONFIG_IEEE80211W=y
+endif
+
 ifdef CONFIG_IEEE80211W
 CFLAGS += -DCONFIG_IEEE80211W
 NEED_SHA256=y

diff --git a/hostapd/android.config b/hostapd/android.config
index 08d21f044aa7dfaff47a15fa31b93e2f9387d398..e14423f268ccf8e8f40d9fa5096f6c685bf663be 100644 (file)
--- a/hostapd/android.config
+++ b/hostapd/android.config
@@ -50,6 +50,9 @@ CONFIG_DRIVER_NL80211_QCA=y
 # Driver support is also needed for IEEE 802.11w.
 CONFIG_IEEE80211W=y
 
+# Support Operating Channel Validation
+#CONFIG_OCV=y
+
 # Integrated EAP server
 #CONFIG_EAP=y
 

diff --git a/hostapd/defconfig b/hostapd/defconfig
index 77a894d5e11a3d4b83a46db57b4fb8977769b625..58e525dfaed0edae60402c4d013bed824cb3ff48 100644 (file)
--- a/hostapd/defconfig
+++ b/hostapd/defconfig
@@ -53,6 +53,9 @@ CONFIG_RSN_PREAUTH=y
 # IEEE 802.11w (management frame protection)
 CONFIG_IEEE80211W=y
 
+# Support Operating Channel Validation
+#CONFIG_OCV=y
+
 # Integrated EAP server
 CONFIG_EAP=y
 

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index a6809956d86ff1a505e7389f02f7f585164e7b9e..f3b6d2cfab3082ac96f639e12b02e09e487e0e54 100644 (file)
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -207,6 +207,11 @@ L_CFLAGS += -DCONFIG_SUITEB192
 NEED_SHA384=y
 endif
 
+ifdef CONFIG_OCV
+L_CFLAGS += -DCONFIG_OCV
+CONFIG_IEEE80211W=y
+endif
+
 ifdef CONFIG_IEEE80211W
 L_CFLAGS += -DCONFIG_IEEE80211W
 NEED_SHA256=y

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index c2e93e20b58ac55a4248406c084606e6b387984a..69132bb57328bd52e90afaee6ea90638f7d1f591 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -240,6 +240,11 @@ CFLAGS += -DCONFIG_SUITEB192
 NEED_SHA384=y
 endif
 
+ifdef CONFIG_OCV
+CFLAGS += -DCONFIG_OCV
+CONFIG_IEEE80211W=y
+endif
+
 ifdef CONFIG_IEEE80211W
 CFLAGS += -DCONFIG_IEEE80211W
 NEED_SHA256=y

diff --git a/wpa_supplicant/android.config b/wpa_supplicant/android.config
index c97f591311d3cea50c1a162dba6ceb5b736fabba..6ecef0582519ff610e2962cec9293a73f886814a 100644 (file)
--- a/wpa_supplicant/android.config
+++ b/wpa_supplicant/android.config
@@ -280,6 +280,9 @@ CONFIG_L2_PACKET=linux
 # Driver support is also needed for IEEE 802.11w.
 CONFIG_IEEE80211W=y
 
+# Support Operating Channel Validation
+#CONFIG_OCV=y
+
 # Select TLS implementation
 # openssl = OpenSSL (default)
 # gnutls = GnuTLS

diff --git a/wpa_supplicant/defconfig b/wpa_supplicant/defconfig
index af281e56d2e138a1d53a317fdb5485084659e41c..da0b3f126069abac19824346831ee9b334d1ead0 100644 (file)
--- a/wpa_supplicant/defconfig
+++ b/wpa_supplicant/defconfig
@@ -301,6 +301,9 @@ CONFIG_BACKEND=file
 # Driver support is also needed for IEEE 802.11w.
 #CONFIG_IEEE80211W=y
 
+# Support Operating Channel Validation
+#CONFIG_OCV=y
+
 # Select TLS implementation
 # openssl = OpenSSL (default)
 # gnutls = GnuTLS