aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2017-03-11 22:38:24 (GMT)
committerJouni Malinen <j@w1.fi>2017-03-12 18:43:06 (GMT)
commit6115238492be5ac7fddfabc8b90646daf9782b8a (patch)
tree96945c0eb7cacc3f4c334344b204c339f724ea20
parent07a5fe823e47a7fc5c6eec1e53b068f12e197b5b (diff)
downloadhostap-6115238492be5ac7fddfabc8b90646daf9782b8a.zip
hostap-6115238492be5ac7fddfabc8b90646daf9782b8a.tar.gz
hostap-6115238492be5ac7fddfabc8b90646daf9782b8a.tar.bz2
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>
-rw-r--r--hostapd/Android.mk6
-rw-r--r--hostapd/Makefile6
-rw-r--r--hostapd/android.config4
-rw-r--r--hostapd/defconfig4
-rw-r--r--wpa_supplicant/Android.mk6
-rw-r--r--wpa_supplicant/Makefile6
-rw-r--r--wpa_supplicant/android.config4
-rw-r--r--wpa_supplicant/defconfig4
8 files changed, 40 insertions, 0 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 1436757..10018bc 100644
--- 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 bc56c4c..34a0e68 100644
--- 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 1715cc8..8b130a0 100644
--- 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 e92c0ed..2370fc1 100644
--- 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 17026f6..bf6ad88 100644
--- 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 5b207f4..968f7bc 100644
--- 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 4de7e9c..08134ad 100644
--- 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 8b1ff75..7cb86dd 100644
--- 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