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.
This commit is contained in:
Jouni Malinen 2009-12-11 17:24:42 +02:00 committed by Jouni Malinen
parent 616ea674c8
commit 50ceddcfd6
2 changed files with 12 additions and 18 deletions

View file

@ -627,18 +627,15 @@ OBJS += ../src/crypto/sha256-internal.o
endif endif
endif endif
ifdef CONFIG_INTERNAL_DH_GROUP5
ifdef NEED_DH_GROUPS ifdef NEED_DH_GROUPS
OBJS += ../src/crypto/dh_groups.o 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 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
endif endif

View file

@ -981,18 +981,15 @@ endif
OBJS += $(SHA256OBJS) OBJS += $(SHA256OBJS)
endif endif
ifdef CONFIG_INTERNAL_DH_GROUP5
ifdef NEED_DH_GROUPS ifdef NEED_DH_GROUPS
OBJS += ../src/crypto/dh_groups.o 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 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
endif endif