From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Fri, 11 Dec 2009 15:24:42 +0000 (+0200)
Subject: Fix dh_groups.o build for some configurations
X-Git-Tag: hostap_0_7_1~367
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50ceddcfd63f230891913dc5bdca5ebf2a66912f;p=thirdparty%2Fhostap.git

Fix dh_groups.o build for some configurations

Need to include dh_groups.o in the build even if not all DH groups
are included. Only internal crypto build case was doing this properly.
---

diff --git a/hostapd/Makefile b/hostapd/Makefile
index 00d58e81d..9d9ec3390 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -627,19 +627,16 @@ OBJS += ../src/crypto/sha256-internal.o
 endif
 endif
 
-ifdef CONFIG_INTERNAL_DH_GROUP5
 ifdef NEED_DH_GROUPS
 OBJS += ../src/crypto/dh_groups.o
-OBJS += ../src/crypto/dh_group5.o
-ifdef NEED_DH_GROUPS_ALL
-CFLAGS += -DALL_DH_GROUPS
-endif
 endif
-else
 ifdef NEED_DH_GROUPS_ALL
-OBJS += ../src/crypto/dh_groups.o
 CFLAGS += -DALL_DH_GROUPS
 endif
+ifdef CONFIG_INTERNAL_DH_GROUP5
+ifdef NEED_DH_GROUPS
+OBJS += ../src/crypto/dh_group5.o
+endif
 endif
 
 ifdef CONFIG_RADIUS_SERVER
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 5f495de29..d111c38e2 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -981,19 +981,16 @@ endif
 OBJS += $(SHA256OBJS)
 endif
 
-ifdef CONFIG_INTERNAL_DH_GROUP5
 ifdef NEED_DH_GROUPS
 OBJS += ../src/crypto/dh_groups.o
-OBJS += ../src/crypto/dh_group5.o
-ifdef NEED_DH_GROUPS_ALL
-CFLAGS += -DALL_DH_GROUPS
-endif
 endif
-else
 ifdef NEED_DH_GROUPS_ALL
-OBJS += ../src/crypto/dh_groups.o
 CFLAGS += -DALL_DH_GROUPS
 endif
+ifdef CONFIG_INTERNAL_DH_GROUP5
+ifdef NEED_DH_GROUPS
+OBJS += ../src/crypto/dh_group5.o
+endif
 endif
 
 ifdef CONFIG_CTRL_IFACE