OWE: Add CONFIG_OWE=y build option

This can be used to enable OWE support in hostapd and wpa_supplicant
builds.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 14367577af3b78286408e5e29bc063346b254931..10018bceaec55d84f6649728d080510e2c59745a 100644 (file)
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -261,6 +261,12 @@ NEED_ECC=y
 NEED_DH_GROUPS=y
 endif
 
+ifdef CONFIG_OWE
+L_CFLAGS += -DCONFIG_OWE
+NEED_ECC=y
+NEED_HMAC_SHA256_KDF=y
+endif
+
 ifdef CONFIG_FILS
 L_CFLAGS += -DCONFIG_FILS
 OBJS += src/ap/fils_hlp.c

diff --git a/hostapd/Makefile b/hostapd/Makefile
index bc56c4cf20555874ab0d7c74b8fb123ea44f6ed0..34a0e68a19a16bdecc9b82998374d27fc1fc9001 100644 (file)
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -305,6 +305,12 @@ NEED_DH_GROUPS=y
 NEED_AP_MLME=y
 endif
 
+ifdef CONFIG_OWE
+CFLAGS += -DCONFIG_OWE
+NEED_ECC=y
+NEED_HMAC_SHA256_KDF=y
+endif
+
 ifdef CONFIG_FILS
 CFLAGS += -DCONFIG_FILS
 OBJS += ../src/ap/fils_hlp.o

diff --git a/hostapd/android.config b/hostapd/android.config
index 1715cc848a0e6fc030d15238809270f97a985aeb..8b130a04fb1e7a5fdd150d117728d97a2106b6e0 100644 (file)
--- a/hostapd/android.config
+++ b/hostapd/android.config
@@ -202,3 +202,7 @@ CONFIG_AP=y
 
 # Include internal line edit mode in hostapd_cli.
 CONFIG_WPA_CLI_EDIT=y
+
+# Opportunistic Wireless Encryption (OWE)
+# Experimental implementation of draft-harkins-owe-07.txt
+#CONFIG_OWE=y

diff --git a/hostapd/defconfig b/hostapd/defconfig
index e92c0ed002f165e773a0a21d33957a326b70a267..2370fc12c8984df17e82e7268f68b658eb7a29ac 100644 (file)
--- a/hostapd/defconfig
+++ b/hostapd/defconfig
@@ -362,3 +362,7 @@ CONFIG_IPV6=y
 # Include internal line edit mode in hostapd_cli. This can be used to provide
 # limited command line editing and history support.
 #CONFIG_WPA_CLI_EDIT=y
+
+# Opportunistic Wireless Encryption (OWE)
+# Experimental implementation of draft-harkins-owe-07.txt
+#CONFIG_OWE=y

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 17026f60a1b673a580b47ed0a71a2d9318d346e8..bf6ad882d663c10d7707102c15cd0e447a7dde0b 100644 (file)
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -243,6 +243,12 @@ NEED_ECC=y
 NEED_DH_GROUPS=y
 endif
 
+ifdef CONFIG_OWE
+L_CFLAGS += -DCONFIG_OWE
+NEED_ECC=y
+NEED_HMAC_SHA256_KDF=y
+endif
+
 ifdef CONFIG_FILS
 L_CFLAGS += -DCONFIG_FILS
 NEED_SHA384=y

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 5b207f489edd8e706e028725cb0541908434081e..968f7bc3a72d9abfa3c28de41c8fabf573efe3c9 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -276,6 +276,12 @@ NEED_ECC=y
 NEED_DH_GROUPS=y
 endif
 
+ifdef CONFIG_OWE
+CFLAGS += -DCONFIG_OWE
+NEED_ECC=y
+NEED_HMAC_SHA256_KDF=y
+endif
+
 ifdef CONFIG_FILS
 CFLAGS += -DCONFIG_FILS
 NEED_SHA384=y

diff --git a/wpa_supplicant/android.config b/wpa_supplicant/android.config
index 4de7e9cf1eb01937f462523b03ac590f4392e070..08134ada3f5aede5ec72d0f1a282f7343fe5a921 100644 (file)
--- a/wpa_supplicant/android.config
+++ b/wpa_supplicant/android.config
@@ -541,4 +541,8 @@ CONFIG_WIFI_DISPLAY=y
 # channels (experimental)
 #CONFIG_BGSCAN_LEARN=y
 
+# Opportunistic Wireless Encryption (OWE)
+# Experimental implementation of draft-harkins-owe-07.txt
+#CONFIG_OWE=y
+
 include $(wildcard $(LOCAL_PATH)/android_config_*.inc)

diff --git a/wpa_supplicant/defconfig b/wpa_supplicant/defconfig
index 8b1ff753433b74e1cd41a7d1abe398a9351173da..7cb86dd3525713a27a49b7cc316b12360de83c77 100644 (file)
--- a/wpa_supplicant/defconfig
+++ b/wpa_supplicant/defconfig
@@ -581,3 +581,7 @@ CONFIG_PEERKEY=y
 # Learn channels used by the network and try to avoid bgscans on other
 # channels (experimental)
 #CONFIG_BGSCAN_LEARN=y
+
+# Opportunistic Wireless Encryption (OWE)
+# Experimental implementation of draft-harkins-owe-07.txt
+#CONFIG_OWE=y