Remove src/crypto from default include path

[libeap.git] / eap_example / Makefile

diff --git a/eap_example/Makefile b/eap_example/Makefile
index 5c11a07..28feb8f 100644 (file)
--- a/eap_example/Makefile
+++ b/eap_example/Makefile
@@ -13,13 +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
@@ -31,16 +30,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/sha1.o ../src/crypto/sha1-internal.o
-OBJS_both += ../src/crypto/des.o
-OBJS_both += ../src/crypto/aes_wrap.o
-OBJS_both += ../src/crypto/aes.o
+OBJS_both += ../src/crypto/md4-internal.o
+OBJS_both += ../src/crypto/sha1.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
-OBJS_both += ../src/crypto/sha256.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 ../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
@@ -99,7 +109,15 @@ CFLAGS += -DEAP_TLS_OPENSSL
 OBJS_both += ../src/crypto/tls_openssl.o
 OBJS_both += ../src/crypto/crypto_openssl.o
 LIBS += -lssl -lcrypto
-CFLAGS += -DINTERNAL_SHA256
+CONFIG_INTERNAL_SHA256=y
+endif
+
+ifeq ($(CONFIG_TLS), gnutls)
+CFLAGS += -DEAP_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)
@@ -120,11 +138,8 @@ CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
 CFLAGS += -DCONFIG_TLS_INTERNAL
 CFLAGS += -DCONFIG_CRYPTO_INTERNAL
 CFLAGS += -DCONFIG_INTERNAL_X509
-CFLAGS += -DINTERNAL_AES
-CFLAGS += -DINTERNAL_SHA256
-CFLAGS += -DINTERNAL_MD5
-CFLAGS += -DINTERNAL_MD4
-CFLAGS += -DINTERNAL_DES
+CONFIG_INTERNAL_SHA256=y
+MD5OBJS += ../src/crypto/md5-internal.o
 ifdef CONFIG_INTERNAL_LIBTOMMATH
 CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
 else
@@ -133,6 +148,12 @@ endif
 endif
 
 
+ifdef CONFIG_INTERNAL_SHA256
+SHA256OBJS += ../src/crypto/sha256-internal.o
+endif
+
+OBJS_both += $(SHA256OBJS) $(MD5OBJS)
+
 
 # Optional components to add EAP server support
 OBJS_server += ../src/eap_server/eap_tls.o