Move TLS_FUNCS and NEED_CRYPTO segment next to each other

diff --git a/hostapd/Makefile b/hostapd/Makefile
index 66d26c54f9fb2dc4511d965e2d579d4657a7baaa..3a0975900fceddd47c50eb766f0f185ae81e75b1 100644 (file)
--- 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 5b682135820f4e2f96ce0b1a1fa2d097fb130edd..35b715b8410e005dad92540f0acfbb7a143918ae 100644 (file)
--- 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)