aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd
diff options
context:
space:
mode:
authorJouni Malinen <jouni@codeaurora.org>2019-04-25 16:45:27 (GMT)
committerJouni Malinen <j@w1.fi>2019-04-25 20:49:49 (GMT)
commit2b84ca4dd96459b661b0ebaf40ec43074fc9f42c (patch)
tree35a6a9dc161f8780f6523e1ff1b39d94caca89cd /hostapd
parentff229da3095917fe1d152ca256c83366b0f3ee1d (diff)
downloadhostap-2b84ca4dd96459b661b0ebaf40ec43074fc9f42c.zip
hostap-2b84ca4dd96459b661b0ebaf40ec43074fc9f42c.tar.gz
hostap-2b84ca4dd96459b661b0ebaf40ec43074fc9f42c.tar.bz2
Share common SAE and EAP-pwd functionality: suitable groups
Start sharing common SAE and EAP-pwd functionality by adding a new source code file that can be included into both. This first step is bringing in a shared function to check whether a group is suitable. Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
Diffstat (limited to 'hostapd')
-rw-r--r--hostapd/Android.mk6
-rw-r--r--hostapd/Makefile6
2 files changed, 12 insertions, 0 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 57a894c..e082cab 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -269,6 +269,7 @@ L_CFLAGS += -DCONFIG_SAE
OBJS += src/common/sae.c
NEED_ECC=y
NEED_DH_GROUPS=y
+NEED_DRAGONFLY=y
endif
ifdef CONFIG_OWE
@@ -462,6 +463,7 @@ L_CFLAGS += -DEAP_SERVER_PWD
OBJS += src/eap_server/eap_server_pwd.c src/eap_common/eap_pwd_common.c
NEED_SHA256=y
NEED_ECC=y
+NEED_DRAGONFLY=y
endif
ifdef CONFIG_EAP_EKE
@@ -595,6 +597,10 @@ ifdef CONFIG_PKCS12
L_CFLAGS += -DPKCS12_FUNCS
endif
+ifdef NEED_DRAGONFLY
+OBJS += src/common/dragonfly.c
+endif
+
ifdef MS_FUNCS
OBJS += src/crypto/ms_funcs.c
NEED_DES=y
diff --git a/hostapd/Makefile b/hostapd/Makefile
index 6e263c5..2b33d57 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -313,6 +313,7 @@ OBJS += ../src/common/sae.o
NEED_ECC=y
NEED_DH_GROUPS=y
NEED_AP_MLME=y
+NEED_DRAGONFLY=y
endif
ifdef CONFIG_OWE
@@ -496,6 +497,7 @@ CFLAGS += -DEAP_SERVER_PWD
OBJS += ../src/eap_server/eap_server_pwd.o ../src/eap_common/eap_pwd_common.o
NEED_SHA256=y
NEED_ECC=y
+NEED_DRAGONFLY=y
endif
ifdef CONFIG_EAP_EKE
@@ -629,6 +631,10 @@ ifdef CONFIG_PKCS12
CFLAGS += -DPKCS12_FUNCS
endif
+ifdef NEED_DRAGONFLY
+OBJS += ../src/common/dragonfly.o
+endif
+
ifdef MS_FUNCS
OBJS += ../src/crypto/ms_funcs.o
NEED_DES=y