From: Jouni Malinen Date: Sun, 11 Oct 2009 17:34:26 +0000 (+0300) Subject: Move TLS_FUNCS and NEED_CRYPTO segment next to each other X-Git-Tag: hostap_0_7_0~140 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7137456941b615225ccc4f548399325b93fcf9b6;p=thirdparty%2Fhostap.git Move TLS_FUNCS and NEED_CRYPTO segment next to each other --- diff --git a/hostapd/Makefile b/hostapd/Makefile index 66d26c54f..3a0975900 100644 --- a/hostapd/Makefile +++ b/hostapd/Makefile @@ -332,6 +332,19 @@ ifdef CONFIG_EAP CFLAGS += -DEAP_SERVER 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 CONFIG_TLS=openssl endif @@ -400,19 +413,6 @@ else OBJS += ../src/crypto/tls_none.o 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 ifndef TLS_FUNCS ifeq ($(CONFIG_TLS), openssl) diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 5b6821358..35b715b84 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -617,6 +617,23 @@ ifdef NEED_MILENAGE OBJS += ../src/hlr_auc_gw/milenage.o 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 CONFIG_TLS=openssl endif @@ -706,23 +723,6 @@ else OBJS += ../src/crypto/tls_none.o 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 ifndef TLS_FUNCS ifeq ($(CONFIG_TLS), openssl)