From 6115238492be5ac7fddfabc8b90646daf9782b8a Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 12 Mar 2017 00:38:24 +0200 Subject: [PATCH] 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 --- hostapd/Android.mk | 6 ++++++ hostapd/Makefile | 6 ++++++ hostapd/android.config | 4 ++++ hostapd/defconfig | 4 ++++ wpa_supplicant/Android.mk | 6 ++++++ wpa_supplicant/Makefile | 6 ++++++ wpa_supplicant/android.config | 4 ++++ wpa_supplicant/defconfig | 4 ++++ 8 files changed, 40 insertions(+) diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 14367577a..10018bcea 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 bc56c4cf2..34a0e68a1 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 1715cc848..8b130a04f 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 e92c0ed00..2370fc12c 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 17026f60a..bf6ad882d 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 5b207f489..968f7bc3a 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 4de7e9cf1..08134ada3 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 8b1ff7534..7cb86dd35 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