Fixes for building on Centos 7

[mech_eap.git] / libeap / Makefile.am

diff --git a/libeap/Makefile.am b/libeap/Makefile.am
index e37649e..38d285c 100755 (executable)
--- a/libeap/Makefile.am
+++ b/libeap/Makefile.am
@@ -95,17 +95,15 @@ AM_CFLAGS += -DEAP_SERVER_GPSK -DEAP_SERVER_GPSK_SHA256
 AM_CFLAGS += -DIEEE8021X_EAPOL
 AM_CFLAGS += -DCONFIG_IPV6
 AM_CFLAGS += -DCONFIG_DEBUG_FILE
-AM_CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
-AM_CFLAGS += -DCONFIG_INTERNAL_SHA1
 AM_CFLAGS += -DEAP_TLS_OPENSSL
 AM_CFLAGS += -DPKCS12_FUNCS
-#AM_CFLAGS += -DCONFIG_CRYPTO_INTERNAL
 AM_CFLAGS += -DCONFIG_SHA256
 
 UTILS_SRCS = src/utils/base64.c \
        src/utils/common.c \
        src/utils/eloop.c \
        src/utils/eloop.h \
+       src/utils/ext_password.h \
        src/utils/ip_addr.c \
        src/utils/radiotap.c \
        src/utils/trace.c \
@@ -124,6 +122,7 @@ UTILS_SRCS = src/utils/base64.c \
        src/utils/list.h \
        src/utils/os.h \
        src/utils/pcsc_funcs.h \
+       src/utils/platform.h \
        src/utils/radiotap.h \
        src/utils/radiotap_iter.h \
        src/utils/state_machine.h \
@@ -157,41 +156,43 @@ CRYPTO_SRCS = \
     src/crypto/random.h \
     src/crypto/sha1.h \
     src/crypto/sha256.h \
+    src/crypto/sha384.h \
        src/crypto/sha256-tlsprf.c \
-    src/crypto/tls.h
-
-
-TLS_SRCS = \
-    src/tls/asn1.c \
-    src/tls/bignum.c \
-    src/tls/pkcs1.c \
-    src/tls/pkcs5.c \
-    src/tls/pkcs8.c \
-    src/tls/rsa.c \
-    src/tls/tlsv1_client.c \
-    src/tls/tlsv1_client_read.c \
-    src/tls/tlsv1_client_write.c \
-    src/tls/tlsv1_common.c \
-    src/tls/tlsv1_cred.c \
-    src/tls/tlsv1_record.c \
-    src/tls/tlsv1_server.c \
-    src/tls/tlsv1_server_read.c \
-    src/tls/tlsv1_server_write.c \
-    src/tls/x509v3.c \
-    src/tls/asn1.h \
-    src/tls/bignum.h \
-    src/tls/pkcs1.h \
-    src/tls/pkcs5.h \
-    src/tls/pkcs8.h \
-    src/tls/rsa.h \
-    src/tls/tlsv1_client.h \
-    src/tls/tlsv1_client_i.h \
-    src/tls/tlsv1_common.h \
-    src/tls/tlsv1_cred.h \
-    src/tls/tlsv1_record.h \
-    src/tls/tlsv1_server.h \
-    src/tls/tlsv1_server_i.h \
-    src/tls/x509v3.h 
+    src/crypto/tls.h \
+    src/crypto/tls_openssl.h
+
+
+#TLS_SRCS = \
+#    src/tls/asn1.c \
+#    src/tls/bignum.c \
+#    src/tls/pkcs1.c \
+#    src/tls/pkcs5.c \
+#    src/tls/pkcs8.c \
+#    src/tls/rsa.c \
+#    src/tls/tlsv1_client.c \
+#    src/tls/tlsv1_client_read.c \
+#    src/tls/tlsv1_client_write.c \
+#    src/tls/tlsv1_common.c \
+#    src/tls/tlsv1_cred.c \
+#    src/tls/tlsv1_record.c \
+#    src/tls/tlsv1_server.c \
+#    src/tls/tlsv1_server_read.c \
+#    src/tls/tlsv1_server_write.c \
+#    src/tls/x509v3.c \
+#    src/tls/asn1.h \
+#    src/tls/bignum.h \
+#    src/tls/pkcs1.h \
+#    src/tls/pkcs5.h \
+#    src/tls/pkcs8.h \
+#    src/tls/rsa.h \
+#    src/tls/tlsv1_client.h \
+#    src/tls/tlsv1_client_i.h \
+#    src/tls/tlsv1_common.h \
+#    src/tls/tlsv1_cred.h \
+#    src/tls/tlsv1_record.h \
+#    src/tls/tlsv1_server.h \
+#    src/tls/tlsv1_server_i.h \
+#    src/tls/x509v3.h 
 
 libeap_la_SOURCES = $(SOURCES_BOTH) $(SOURCES_peer) $(UTILS_SRCS) $(CRYPTO_SRCS)