Updated through tag hostap_2_5 from git://w1.fi/hostap.git

[mech_eap.git] / libeap / Makefile.am

diff --git a/libeap/Makefile.am b/libeap/Makefile.am
index 8cc9fb5..890a9ea 100644 (file)
--- a/libeap/Makefile.am
+++ b/libeap/Makefile.am
@@ -11,7 +11,8 @@ noinst_HEADERS = \
        src/common/wpa_common.h \
        src/common/wpa_ctrl.h
 
-EXTRA_DIST = src/tls/libtommath.c
+EXTRA_DIST = src/tls/libtommath.c \
+       wpa_supplicant/README
 
 SOURCES_BOTH = src/eap_common/eap_peap_common.c
 SOURCES_BOTH += src/eap_common/eap_psk_common.c
@@ -62,40 +63,43 @@ SOURCES_peer += src/eap_peer/eap_tls_common.c \
        src/eap_peer/eap_tls_common.h \
        src/eap_peer/ikev2.h \
        src/eap_peer/mschapv2.h \
-       src/eap_peer/tncc.h
-
-CFLAGS += -DEAP_TLS
-CFLAGS += -DEAP_PEAP
-CFLAGS += -DEAP_TTLS
-CFLAGS += -DEAP_MD5
-CFLAGS += -DEAP_MSCHAPv2
-CFLAGS += -DEAP_GTC
-CFLAGS += -DEAP_OTP
-CFLAGS += -DEAP_LEAP
-CFLAGS += -DEAP_PSK
-CFLAGS += -DEAP_PAX
-CFLAGS += -DEAP_SAKE
-CFLAGS += -DEAP_GPSK -DEAP_GPSK_SHA256
-
-CFLAGS += -DEAP_SERVER_IDENTITY
-CFLAGS += -DEAP_SERVER_TLS
-CFLAGS += -DEAP_SERVER_PEAP
-CFLAGS += -DEAP_SERVER_TTLS
-CFLAGS += -DEAP_SERVER_MD5
-CFLAGS += -DEAP_SERVER_MSCHAPV2
-CFLAGS += -DEAP_SERVER_GTC
-CFLAGS += -DEAP_SERVER_PSK
-CFLAGS += -DEAP_SERVER_PAX
-CFLAGS += -DEAP_SERVER_SAKE
-CFLAGS += -DEAP_SERVER_GPSK -DEAP_SERVER_GPSK_SHA256
-
-CFLAGS += -DIEEE8021X_EAPOL
-CFLAGS += -DCONFIG_IPV6
-
-CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
-CFLAGS += -DCONFIG_INTERNAL_SHA1
-CFLAGS += -DEAP_TLS_OPENSSL
-CFLAGS += -DPKCS12_FUNCS
+       src/eap_peer/tncc.h \
+       src/radius/radius.h
+
+
+AM_CFLAGS = -DEAP_TLS
+AM_CFLAGS += -DEAP_PEAP
+AM_CFLAGS += -DEAP_TTLS
+AM_CFLAGS += -DEAP_MD5
+AM_CFLAGS += -DEAP_MSCHAPv2
+AM_CFLAGS += -DEAP_GTC
+AM_CFLAGS += -DEAP_OTP
+AM_CFLAGS += -DEAP_LEAP
+AM_CFLAGS += -DEAP_PSK
+AM_CFLAGS += -DEAP_PAX
+AM_CFLAGS += -DEAP_SAKE
+AM_CFLAGS += -DEAP_GPSK -DEAP_GPSK_SHA256
+
+AM_CFLAGS += -DEAP_SERVER_IDENTITY
+AM_CFLAGS += -DEAP_SERVER_TLS
+AM_CFLAGS += -DEAP_SERVER_PEAP
+AM_CFLAGS += -DEAP_SERVER_TTLS
+AM_CFLAGS += -DEAP_SERVER_MD5
+AM_CFLAGS += -DEAP_SERVER_MSCHAPV2
+AM_CFLAGS += -DEAP_SERVER_GTC
+AM_CFLAGS += -DEAP_SERVER_PSK
+AM_CFLAGS += -DEAP_SERVER_PAX
+AM_CFLAGS += -DEAP_SERVER_SAKE
+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_SHA256
 
 UTILS_SRCS = src/utils/base64.c \
        src/utils/common.c \
@@ -106,6 +110,8 @@ UTILS_SRCS = src/utils/base64.c \
        src/utils/wpa_debug.c \
        src/utils/wpabuf.c \
        src/utils/os_unix.c \
+       src/utils/radius_utils.c \
+src/utils/radius_utils.h \
        src/utils/base64.h \
        src/utils/build_config.h \
        src/utils/common.h \
@@ -126,34 +132,49 @@ UTILS_SRCS = src/utils/base64.c \
 
 CRYPTO_SRCS = \
     src/crypto/aes-cbc.c \
+    src/crypto/aes-ccm.c \
     src/crypto/aes-ctr.c \
     src/crypto/aes-eax.c \
     src/crypto/aes-encblock.c \
+    src/crypto/aes-gcm.c \
+    src/crypto/aes-internal.c \
+    src/crypto/aes-internal-dec.c \
+    src/crypto/aes-internal-enc.c \
     src/crypto/aes-omac1.c \
+    src/crypto/aes-siv.c \
+    src/crypto/aes-siv.h \
     src/crypto/aes-unwrap.c \
     src/crypto/aes-wrap.c \
+    src/crypto/aes.h \
+    src/crypto/aes_i.h \
+    src/crypto/aes_wrap.h \
+    src/crypto/crypto.h \
+    src/crypto/des-internal.c \
+    src/crypto/dh_group5.h \
+    src/crypto/dh_groups.h \
+    src/crypto/md4-internal.c \
     src/crypto/md5.c \
-    src/crypto/md5-non-fips.c \
+    src/crypto/md5-internal.c \
+    src/crypto/md5.h \
     src/crypto/milenage.c \
+    src/crypto/milenage.h \
     src/crypto/ms_funcs.c \
+    src/crypto/ms_funcs.h \
+    src/crypto/rc4.c \
     src/crypto/sha1.c \
+    src/crypto/sha1-internal.c \
     src/crypto/sha1-pbkdf2.c \
+    src/crypto/sha1-prf.c \
     src/crypto/sha1-tlsprf.c \
     src/crypto/sha1-tprf.c \
+    src/crypto/sha256-prf.c \
+    src/crypto/sha256-tlsprf.c \
     src/crypto/sha256.c \
-    src/crypto/crypto_openssl.c \
-    src/crypto/tls_openssl.c \
-    src/crypto/aes.h \
-    src/crypto/aes_i.h \
-    src/crypto/aes_wrap.h \
-    src/crypto/crypto.h \
-    src/crypto/md5.h \
-    src/crypto/milenage.h \
-    src/crypto/ms_funcs.h \
-    src/crypto/sha1.h \
     src/crypto/sha256.h \
+    src/crypto/sha256_i.h \
     src/crypto/tls.h
 
+
 TLS_SRCS = \
     src/tls/asn1.c \
     src/tls/bignum.c \