Internal X.509/TLSv1: Support SHA-256 in X.509 certificate digest

[libeap.git] / wpa_supplicant / Makefile

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 30318a9..9920f1b 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -127,6 +127,15 @@ CFLAGS += -DCONFIG_DRIVER_WEXT
 CONFIG_WIRELESS_EXTENSION=y
 endif
 
+ifdef CONFIG_DRIVER_NL80211
+CFLAGS += -DCONFIG_DRIVER_NL80211
+OBJS_d += ../src/drivers/driver_nl80211.o
+LIBS += -lnl
+ifdef CONFIG_CLIENT_MLME
+OBJS_d += ../src/drivers/radiotap.o
+endif
+endif
+
 ifdef CONFIG_DRIVER_PRISM54
 CFLAGS += -DCONFIG_DRIVER_PRISM54
 OBJS_d += ../src/drivers/driver_prism54.o
@@ -183,7 +192,10 @@ endif
 
 ifdef CONFIG_DRIVER_NDIS
 CFLAGS += -DCONFIG_DRIVER_NDIS
-OBJS_d += ../src/drivers/driver_ndis.o ../src/drivers/driver_ndis_.o
+OBJS_d += ../src/drivers/driver_ndis.o
+ifdef CONFIG_NDIS_EVENTS_INTEGRATED
+OBJS_d += ../src/drivers/driver_ndis_.o
+endif
 ifndef CONFIG_L2_PACKET
 CONFIG_L2_PACKET=pcap
 endif
@@ -270,6 +282,7 @@ EAPDYN += ../src/eap_peer/eap_peap.so
 else
 CFLAGS += -DEAP_PEAP
 OBJS += ../src/eap_peer/eap_peap.o
+OBJS += ../src/eap_common/eap_peap_common.o
 OBJS_h += ../src/eap_server/eap_peap.o
 endif
 TLS_FUNCS=y
@@ -621,14 +634,8 @@ CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT
 ifeq ($(CONFIG_CRYPTO), internal)
 ifdef CONFIG_INTERNAL_LIBTOMMATH
 CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
-ifdef CONFIG_INTERNAL_LIBTOMMATH_FAST_EXPTMOD
-CFLAGS += -DLTM_FAST_EXPTMOD
-endif
-ifdef CONFIG_INTERNAL_LIBTOMMATH_FAST_SQR
-CFLAGS += -DLTM_FAST_SQR
-endif
-ifdef CONFIG_INTERNAL_LIBTOMMATH_FAST_DIV
-CFLAGS += -DLTM_FAST_DIV
+ifdef CONFIG_INTERNAL_LIBTOMMATH_FAST
+CFLAGS += -DLTM_FAST
 endif
 else
 LIBS += -ltommath
@@ -769,8 +776,14 @@ ifdef CONFIG_IEEE80211R
 NEED_SHA256=y
 endif
 
+ifdef CONFIG_IEEE80211W
+CFLAGS += -DCONFIG_IEEE80211W
+NEED_SHA256=y
+endif
+
 ifdef NEED_SHA256
 OBJS += ../src/crypto/sha256.o
+CFLAGS += -DNEED_SHA256
 endif
 
 ifdef CONFIG_WIRELESS_EXTENSION
@@ -854,11 +867,6 @@ ifdef CONFIG_PEERKEY
 CFLAGS += -DCONFIG_PEERKEY
 endif
 
-ifdef CONFIG_IEEE80211W
-CFLAGS += -DCONFIG_IEEE80211W
-NEED_SHA256=y
-endif
-
 ifdef CONFIG_IEEE80211R
 CFLAGS += -DCONFIG_IEEE80211R
 OBJS += ../src/rsn_supp/wpa_ft.o
@@ -1029,6 +1037,7 @@ OBJSx=tests/test_x509v3.o ../src/tls/asn1.o ../src/tls/x509v3.o \
        ../src/crypto/crypto_$(CONFIG_CRYPTO).o \
        ../src/crypto/md5.o ../src/crypto/sha1.o ../src/crypto/aes.o \
        ../src/crypto/rc4.o ../src/crypto/des.o ../src/crypto/aes_wrap.o \
+       ../src/crypto/sha256.o \
        ../src/tls/bignum.o ../src/tls/rsa.o
 test_x509v3: $(OBJSx)
        $(LDO) $(LDFLAGS) -o test_x509v3 $(OBJSx)