Remove obsolete comment about wpa_supplicant header files

[libeap.git] / eap_example / Makefile

diff --git a/eap_example/Makefile b/eap_example/Makefile
index 2abe171..ba65bb5 100644 (file)
--- a/eap_example/Makefile
+++ b/eap_example/Makefile
@@ -13,17 +13,12 @@ endif
 CONFIG_TLS=openssl
 #CONFIG_TLS=internal
 #CONFIG_INTERNAL_LIBTOMMATH=y
+#CONFIG_TLS=gnutls
 
 
 CFLAGS += -I.
 CFLAGS += -I../src
-CFLAGS += -I../src/crypto
 CFLAGS += -I../src/utils
-CFLAGS += -I../src/common
-
-# at least for now, need to include config_ssid.h and config_blob.h from
-# wpa_supplicant directory
-CFLAGS += -I../wpa_supplicant
 
 
 OBJS_both += ../src/utils/common.o
@@ -31,20 +26,27 @@ OBJS_both += ../src/utils/os_unix.o
 OBJS_both += ../src/utils/wpa_debug.o
 OBJS_both += ../src/utils/base64.o
 OBJS_both += ../src/utils/wpabuf.o
-OBJS_both += ../src/crypto/md5.o
 OBJS_both += ../src/crypto/rc4.o
-OBJS_both += ../src/crypto/md4.o
+OBJS_both += ../src/crypto/md4-internal.o
 OBJS_both += ../src/crypto/sha1.o
-OBJS_both += ../src/crypto/aes_wrap.o
+OBJS_both += ../src/crypto/sha1-tlsprf.o
+OBJS_both += ../src/crypto/aes-cbc.o
+OBJS_both += ../src/crypto/aes-ctr.o
+OBJS_both += ../src/crypto/aes-eax.o
+OBJS_both += ../src/crypto/aes-encblock.o
+OBJS_both += ../src/crypto/aes-omac1.o
+OBJS_both += ../src/crypto/aes-unwrap.o
+OBJS_both += ../src/crypto/aes-wrap.o
 OBJS_both += ../src/crypto/ms_funcs.o
 
 ifeq ($(CONFIG_TLS), internal)
 OBJS_both += ../src/crypto/sha1-internal.o
 OBJS_both += ../src/crypto/des-internal.o
-OBJS_both += ../src/crypto/aes-internal.o
+OBJS_both += ../src/crypto/aes-internal.o ../src/crypto/aes-internal-dec.o ../src/crypto/aes-internal-enc.o
 endif
 SHA256OBJS = ../src/crypto/sha256.o
 
+MD5OBJS = ../src/crypto/md5.o
 
 OBJS_both += ../src/eap_common/eap_peap_common.o
 OBJS_both += ../src/eap_common/eap_psk_common.o
@@ -83,8 +85,8 @@ CFLAGS += -DEAP_PSK
 CFLAGS += -DEAP_PAX
 CFLAGS += -DEAP_SAKE
 CFLAGS += -DEAP_GPSK -DEAP_GPSK_SHA256
-CFLAGS += -DEAP_TLS_FUNCS
 
+CFLAGS += -DEAP_SERVER_IDENTITY
 CFLAGS += -DEAP_SERVER_TLS
 CFLAGS += -DEAP_SERVER_PEAP
 CFLAGS += -DEAP_SERVER_TTLS
@@ -99,13 +101,19 @@ CFLAGS += -DEAP_SERVER_GPSK -DEAP_SERVER_GPSK_SHA256
 CFLAGS += -DIEEE8021X_EAPOL
 
 ifeq ($(CONFIG_TLS), openssl)
-CFLAGS += -DEAP_TLS_OPENSSL
 OBJS_both += ../src/crypto/tls_openssl.o
 OBJS_both += ../src/crypto/crypto_openssl.o
 LIBS += -lssl -lcrypto
 CONFIG_INTERNAL_SHA256=y
 endif
 
+ifeq ($(CONFIG_TLS), gnutls)
+OBJS_both += ../src/crypto/tls_gnutls.o
+OBJS_both += ../src/crypto/crypto_gnutls.o
+LIBS += -lgnutls -lgcrypt
+CONFIG_INTERNAL_SHA256=y
+endif
+
 ifeq ($(CONFIG_TLS), internal)
 OBJS_both += ../src/crypto/tls_internal.o
 OBJS_both += ../src/tls/tlsv1_common.o ../src/tls/tlsv1_record.o
@@ -125,8 +133,7 @@ CFLAGS += -DCONFIG_TLS_INTERNAL
 CFLAGS += -DCONFIG_CRYPTO_INTERNAL
 CFLAGS += -DCONFIG_INTERNAL_X509
 CONFIG_INTERNAL_SHA256=y
-CFLAGS += -DINTERNAL_MD5
-CFLAGS += -DINTERNAL_MD4
+MD5OBJS += ../src/crypto/md5-internal.o
 ifdef CONFIG_INTERNAL_LIBTOMMATH
 CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
 else
@@ -139,7 +146,7 @@ ifdef CONFIG_INTERNAL_SHA256
 SHA256OBJS += ../src/crypto/sha256-internal.o
 endif
 
-OBJS_both += $(SHA256OBJS)
+OBJS_both += $(SHA256OBJS) $(MD5OBJS)
 
 
 # Optional components to add EAP server support
@@ -164,6 +171,17 @@ ifndef LDO
 LDO=$(CC)
 endif
 
+Q=@
+E=echo
+ifeq ($(V), 1)
+Q=
+E=true
+endif
+
+%.o: %.c
+       $(Q)$(CC) -c -o $@ $(CFLAGS) $<
+       @$(E) "  CC " $<
+
 
 OBJS_lib=$(OBJS_both) $(OBJS_peer) $(OBJS_server)