diff options
| author | Jouni Malinen <jouni.malinen@atheros.com> | 2009-12-11 17:24:42 +0200 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2009-12-11 17:24:42 +0200 |
| commit | 50ceddcfd63f230891913dc5bdca5ebf2a66912f (patch) | |
| tree | 733a2a9e843b8bcb866d3c51755efb3a45df8306 | |
| parent | 616ea674c8b21587436b5f7800899d85c8e96b51 (diff) | |
| download | external_wpa_supplicant_8_ti-50ceddcfd63f230891913dc5bdca5ebf2a66912f.zip external_wpa_supplicant_8_ti-50ceddcfd63f230891913dc5bdca5ebf2a66912f.tar.gz external_wpa_supplicant_8_ti-50ceddcfd63f230891913dc5bdca5ebf2a66912f.tar.bz2 | |
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.
| -rw-r--r-- | hostapd/Makefile | 11 | ||||
| -rw-r--r-- | wpa_supplicant/Makefile | 11 |
2 files changed, 8 insertions, 14 deletions
diff --git a/hostapd/Makefile b/hostapd/Makefile index 00d58e8..9d9ec33 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 5f495de..d111c38 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 |