DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Move TLS_FUNCS and NEED_CRYPTO segment next to each other

Browse source
This commit is contained in:
Jouni Malinen 2009-10-11 20:34:26 +03:00
parent 9d388d5007
commit 7137456941
2 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
hostapd/Makefile
View file

@ -332,6 +332,19 @@ ifdef CONFIG_EAP
CFLAGS += -DEAP_SERVER CFLAGS += -DEAP_SERVER
endif endif
ifdef CONFIG_PKCS12
CFLAGS += -DPKCS12_FUNCS
endif
ifdef MS_FUNCS
OBJS += ../src/crypto/ms_funcs.o
NEED_CRYPTO=y
endif
ifdef CHAP
OBJS += ../src/eap_common/chap.o
endif
ifndef CONFIG_TLS ifndef CONFIG_TLS
CONFIG_TLS=openssl CONFIG_TLS=openssl
endif endif
@ -400,19 +413,6 @@ else
OBJS += ../src/crypto/tls_none.o OBJS += ../src/crypto/tls_none.o
endif endif
ifdef CONFIG_PKCS12
CFLAGS += -DPKCS12_FUNCS
endif
ifdef MS_FUNCS
OBJS += ../src/crypto/ms_funcs.o
NEED_CRYPTO=y
endif
ifdef CHAP
OBJS += ../src/eap_common/chap.o
endif
ifdef NEED_CRYPTO ifdef NEED_CRYPTO
ifndef TLS_FUNCS ifndef TLS_FUNCS
ifeq ($(CONFIG_TLS), openssl) ifeq ($(CONFIG_TLS), openssl)

34
wpa_supplicant/Makefile
View file

@ -617,6 +617,23 @@ ifdef NEED_MILENAGE
OBJS += ../src/hlr_auc_gw/milenage.o OBJS += ../src/hlr_auc_gw/milenage.o
endif endif
ifdef CONFIG_PKCS12
CFLAGS += -DPKCS12_FUNCS
endif
ifdef CONFIG_SMARTCARD
CFLAGS += -DCONFIG_SMARTCARD
endif
ifdef MS_FUNCS
OBJS += ../src/crypto/ms_funcs.o
NEED_CRYPTO=y
endif
ifdef CHAP
OBJS += ../src/eap_common/chap.o
endif
ifndef CONFIG_TLS ifndef CONFIG_TLS
CONFIG_TLS=openssl CONFIG_TLS=openssl
endif endif
@ -706,23 +723,6 @@ else
OBJS += ../src/crypto/tls_none.o OBJS += ../src/crypto/tls_none.o
endif endif
ifdef CONFIG_PKCS12
CFLAGS += -DPKCS12_FUNCS
endif
ifdef CONFIG_SMARTCARD
CFLAGS += -DCONFIG_SMARTCARD
endif
ifdef MS_FUNCS
OBJS += ../src/crypto/ms_funcs.o
NEED_CRYPTO=y
endif
ifdef CHAP
OBJS += ../src/eap_common/chap.o
endif
ifdef NEED_CRYPTO ifdef NEED_CRYPTO
ifndef TLS_FUNCS ifndef TLS_FUNCS
ifeq ($(CONFIG_TLS), openssl) ifeq ($(CONFIG_TLS), openssl)