From: Luke Howard <lukeh@padl.com>
Date: Thu, 17 Nov 2011 08:32:47 +0000 (+1100)
Subject: Merge branch 'moonshot' of ssh://moonshot.suchdamage.org:822/srv/git/libeap into... 
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=libeap.git;a=commitdiff_plain;h=HEAD

Merge branch 'moonshot' of ssh://moonshot.suchdamage.org:822/srv/git/libeap into moonshot

Conflicts:
	Makefile.am
---

06ba9ae7494306585ea8115619e98266ae4dc26c
diff --cc Makefile.am
index b2e410f,163e4ff..8cc9fb5
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,13 -1,41 +1,41 @@@
  AUTOMAKE_OPTIONS = foreign
  
 -AM_CPPFLAGS = -I$(srcdir)/src -I$(srcdir)/eap_example -I$(srcdir)/src/utils 
 +AM_CPPFLAGS = -I$(srcdir)/src -I$(srcdir)/eap_example -I$(srcdir)/src/utils @OPENSSL_CFLAGS@
+ noinst_HEADERS = \
+ 	src/common/defs.h \
+ 	src/common/eapol_common.h \
+ 	src/common/ieee802_11_common.h \
+ 	src/common/ieee802_11_defs.h \
+ 	src/common/privsep_commands.h \
+ 	src/common/version.h \
+ 	src/common/wpa_common.h \
+ 	src/common/wpa_ctrl.h
+ 
+ EXTRA_DIST = src/tls/libtommath.c
  
  SOURCES_BOTH = src/eap_common/eap_peap_common.c
  SOURCES_BOTH += src/eap_common/eap_psk_common.c
  SOURCES_BOTH += src/eap_common/eap_pax_common.c
  SOURCES_BOTH += src/eap_common/eap_sake_common.c
  SOURCES_BOTH += src/eap_common/eap_gpsk_common.c
- SOURCES_BOTH += src/eap_common/chap.c
+ SOURCES_BOTH += src/eap_common/chap.c \
 -src/eap_common/chap.h \
++	src/eap_common/chap.h \
+ 	src/eap_common/eap_common.h \
+ 	src/eap_common/eap_defs.h \
+ 	src/eap_common/eap_fast_common.h \
+ 	src/eap_common/eap_gpsk_common.h \
+ 	src/eap_common/eap_ikev2_common.h \
+ 	src/eap_common/eap_pax_common.h \
+ 	src/eap_common/eap_peap_common.h \
+ 	src/eap_common/eap_psk_common.h \
+ 	src/eap_common/eap_pwd_common.h \
+ 	src/eap_common/eap_sake_common.h \
+ 	src/eap_common/eap_sim_common.h \
+ 	src/eap_common/eap_tlv_common.h \
+ 	src/eap_common/eap_ttls.h \
+ 	src/eap_common/eap_wsc_common.h \
+ 	src/eap_common/ikev2_common.h
+ 
  
  SOURCES_peer = src/eap_peer/eap_tls.c
  SOURCES_peer += src/eap_peer/eap_peap.c
@@@ -86,8 -150,29 +141,18 @@@ CRYPTO_SRCS = 
      src/crypto/sha1-tlsprf.c \
      src/crypto/sha1-tprf.c \
      src/crypto/sha256.c \
 -    src/crypto/sha256-internal.c \
 -    src/crypto/crypto_internal.c \
 -    src/crypto/crypto_internal-cipher.c \
 -    src/crypto/crypto_internal-modexp.c \
 -    src/crypto/crypto_internal-rsa.c \
 -    src/crypto/tls_internal.c \
 -    src/crypto/fips_prf_internal.c \
 -	src/crypto/aes.h \
 -	src/crypto/aes_i.h \
 -	src/crypto/aes_wrap.h \
 -	src/crypto/crypto.h \
 -	src/crypto/des_i.h \
 -	src/crypto/dh_group5.h \
 -	src/crypto/dh_groups.h \
 -	src/crypto/md5.h \
 -	src/crypto/md5_i.h \
 -	src/crypto/milenage.h \
 -	src/crypto/ms_funcs.h \
 -	src/crypto/sha1.h \
 -	src/crypto/sha1_i.h \
 -	src/crypto/sha256.h \
 -	src/crypto/tls.h
 -
 +    src/crypto/crypto_openssl.c \
-     src/crypto/tls_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/tls.h
  
  TLS_SRCS = \
      src/tls/asn1.c \
@@@ -105,8 -190,22 +170,22 @@@
      src/tls/tlsv1_server.c \
      src/tls/tlsv1_server_read.c \
      src/tls/tlsv1_server_write.c \
-     src/tls/x509v3.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) $(TLS_SRCS)
++    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)
  
  noinst_LTLIBRARIES = libeap.la