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 00d58e81d8e720da00a6f7d704f5e4d2800bae4d..9d9ec3390306ba188d28459ad6fe144f7dda03b6 100644 (file)
--- 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 5f495de290124ad5534878e3f182e45d1702e377..d111c38e2741d77e27b3c3b9b0029a5ff3506dcb 100644 (file)
--- 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