From 50ceddcfd63f230891913dc5bdca5ebf2a66912f Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 11 Dec 2009 17:24:42 +0200 Subject: [PATCH] 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. --- hostapd/Makefile | 15 ++++++--------- wpa_supplicant/Makefile | 15 ++++++--------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/hostapd/Makefile b/hostapd/Makefile index 00d58e81d..9d9ec3390 100644 --- a/hostapd/Makefile +++ b/hostapd/Makefile @@ -627,18 +627,15 @@ OBJS += ../src/crypto/sha256-internal.o endif endif -ifdef CONFIG_INTERNAL_DH_GROUP5 ifdef NEED_DH_GROUPS OBJS += ../src/crypto/dh_groups.o +endif +ifdef NEED_DH_GROUPS_ALL +CFLAGS += -DALL_DH_GROUPS +endif +ifdef CONFIG_INTERNAL_DH_GROUP5 +ifdef NEED_DH_GROUPS 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 endif diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 5f495de29..d111c38e2 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -981,18 +981,15 @@ endif OBJS += $(SHA256OBJS) endif -ifdef CONFIG_INTERNAL_DH_GROUP5 ifdef NEED_DH_GROUPS OBJS += ../src/crypto/dh_groups.o +endif +ifdef NEED_DH_GROUPS_ALL +CFLAGS += -DALL_DH_GROUPS +endif +ifdef CONFIG_INTERNAL_DH_GROUP5 +ifdef NEED_DH_GROUPS 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 endif