Rearrange moonshot to have libeap as a subproject
authorSam Hartman <hartmans@painless-security.com>
Tue, 26 Apr 2011 18:20:10 +0000 (14:20 -0400)
committerSam Hartman <hartmans@painless-security.com>
Tue, 26 Apr 2011 18:20:10 +0000 (14:20 -0400)
Pull in libeap and build against a libtool convenience library for it.

112 files changed:
libeap [deleted submodule]
moonshot/.gitignore [new file with mode: 0644]
moonshot/Makefile.am [new file with mode: 0644]
moonshot/acinclude.m4 [moved from mech_eap/acinclude.m4 with 100% similarity]
moonshot/configure.ac [moved from mech_eap/configure.ac with 92% similarity]
moonshot/libeap [new submodule]
moonshot/mech_eap/.gitignore [moved from mech_eap/.gitignore with 100% similarity]
moonshot/mech_eap/AUTHORS [moved from mech_eap/AUTHORS with 100% similarity]
moonshot/mech_eap/COPYING [moved from mech_eap/COPYING with 100% similarity]
moonshot/mech_eap/LICENSE [moved from mech_eap/LICENSE with 100% similarity]
moonshot/mech_eap/Makefile.am [moved from mech_eap/Makefile.am with 89% similarity]
moonshot/mech_eap/NEWS [moved from mech_eap/NEWS with 100% similarity]
moonshot/mech_eap/NOTES [moved from mech_eap/NOTES with 100% similarity]
moonshot/mech_eap/README [moved from mech_eap/README with 100% similarity]
moonshot/mech_eap/TODO [moved from mech_eap/TODO with 100% similarity]
moonshot/mech_eap/accept_sec_context.c [moved from mech_eap/accept_sec_context.c with 100% similarity]
moonshot/mech_eap/acquire_cred.c [moved from mech_eap/acquire_cred.c with 100% similarity]
moonshot/mech_eap/acquire_cred_with_password.c [moved from mech_eap/acquire_cred_with_password.c with 100% similarity]
moonshot/mech_eap/add_cred.c [moved from mech_eap/add_cred.c with 100% similarity]
moonshot/mech_eap/add_cred_with_password.c [moved from mech_eap/add_cred_with_password.c with 100% similarity]
moonshot/mech_eap/authdata_plugin.h [moved from mech_eap/authdata_plugin.h with 100% similarity]
moonshot/mech_eap/autogen.sh [moved from mech_eap/autogen.sh with 100% similarity]
moonshot/mech_eap/canonicalize_name.c [moved from mech_eap/canonicalize_name.c with 100% similarity]
moonshot/mech_eap/compare_name.c [moved from mech_eap/compare_name.c with 100% similarity]
moonshot/mech_eap/config.guess [moved from mech_eap/config.guess with 100% similarity]
moonshot/mech_eap/config.sub [moved from mech_eap/config.sub with 100% similarity]
moonshot/mech_eap/context_time.c [moved from mech_eap/context_time.c with 100% similarity]
moonshot/mech_eap/delete_name_attribute.c [moved from mech_eap/delete_name_attribute.c with 100% similarity]
moonshot/mech_eap/delete_sec_context.c [moved from mech_eap/delete_sec_context.c with 100% similarity]
moonshot/mech_eap/dictionary.ukerna [moved from mech_eap/dictionary.ukerna with 100% similarity]
moonshot/mech_eap/display_name.c [moved from mech_eap/display_name.c with 100% similarity]
moonshot/mech_eap/display_name_ext.c [moved from mech_eap/display_name_ext.c with 100% similarity]
moonshot/mech_eap/display_status.c [moved from mech_eap/display_status.c with 100% similarity]
moonshot/mech_eap/duplicate_name.c [moved from mech_eap/duplicate_name.c with 100% similarity]
moonshot/mech_eap/eap_mech.c [moved from mech_eap/eap_mech.c with 100% similarity]
moonshot/mech_eap/export_name.c [moved from mech_eap/export_name.c with 100% similarity]
moonshot/mech_eap/export_name_composite.c [moved from mech_eap/export_name_composite.c with 100% similarity]
moonshot/mech_eap/export_sec_context.c [moved from mech_eap/export_sec_context.c with 100% similarity]
moonshot/mech_eap/get_mic.c [moved from mech_eap/get_mic.c with 100% similarity]
moonshot/mech_eap/get_name_attribute.c [moved from mech_eap/get_name_attribute.c with 100% similarity]
moonshot/mech_eap/gssapiP_eap.h [moved from mech_eap/gssapiP_eap.h with 100% similarity]
moonshot/mech_eap/gssapi_eap.h [moved from mech_eap/gssapi_eap.h with 100% similarity]
moonshot/mech_eap/gsseap_err.et [moved from mech_eap/gsseap_err.et with 100% similarity]
moonshot/mech_eap/import_name.c [moved from mech_eap/import_name.c with 100% similarity]
moonshot/mech_eap/import_sec_context.c [moved from mech_eap/import_sec_context.c with 100% similarity]
moonshot/mech_eap/indicate_mechs.c [moved from mech_eap/indicate_mechs.c with 100% similarity]
moonshot/mech_eap/init_sec_context.c [moved from mech_eap/init_sec_context.c with 100% similarity]
moonshot/mech_eap/inquire_attrs_for_mech.c [moved from mech_eap/inquire_attrs_for_mech.c with 100% similarity]
moonshot/mech_eap/inquire_context.c [moved from mech_eap/inquire_context.c with 100% similarity]
moonshot/mech_eap/inquire_cred.c [moved from mech_eap/inquire_cred.c with 100% similarity]
moonshot/mech_eap/inquire_cred_by_oid.c [moved from mech_eap/inquire_cred_by_oid.c with 100% similarity]
moonshot/mech_eap/inquire_mech_for_saslname.c [moved from mech_eap/inquire_mech_for_saslname.c with 100% similarity]
moonshot/mech_eap/inquire_mechs_for_name.c [moved from mech_eap/inquire_mechs_for_name.c with 100% similarity]
moonshot/mech_eap/inquire_name.c [moved from mech_eap/inquire_name.c with 100% similarity]
moonshot/mech_eap/inquire_names_for_mech.c [moved from mech_eap/inquire_names_for_mech.c with 100% similarity]
moonshot/mech_eap/inquire_saslname_for_mech.c [moved from mech_eap/inquire_saslname_for_mech.c with 100% similarity]
moonshot/mech_eap/inquire_sec_context_by_oid.c [moved from mech_eap/inquire_sec_context_by_oid.c with 100% similarity]
moonshot/mech_eap/install-sh [moved from mech_eap/install-sh with 100% similarity]
moonshot/mech_eap/map_name_to_any.c [moved from mech_eap/map_name_to_any.c with 100% similarity]
moonshot/mech_eap/mech [moved from mech_eap/mech with 100% similarity]
moonshot/mech_eap/mech_eap.exports [moved from mech_eap/mech_eap.exports with 100% similarity]
moonshot/mech_eap/mech_invoke.c [moved from mech_eap/mech_invoke.c with 100% similarity]
moonshot/mech_eap/process_context_token.c [moved from mech_eap/process_context_token.c with 100% similarity]
moonshot/mech_eap/pseudo_random.c [moved from mech_eap/pseudo_random.c with 100% similarity]
moonshot/mech_eap/radius_ad.exports [moved from mech_eap/radius_ad.exports with 100% similarity]
moonshot/mech_eap/radsec.conf [moved from mech_eap/radsec.conf with 100% similarity]
moonshot/mech_eap/radsec_err.et [moved from mech_eap/radsec_err.et with 100% similarity]
moonshot/mech_eap/release_any_name_mapping.c [moved from mech_eap/release_any_name_mapping.c with 100% similarity]
moonshot/mech_eap/release_cred.c [moved from mech_eap/release_cred.c with 100% similarity]
moonshot/mech_eap/release_name.c [moved from mech_eap/release_name.c with 100% similarity]
moonshot/mech_eap/release_oid.c [moved from mech_eap/release_oid.c with 100% similarity]
moonshot/mech_eap/set_cred_option.c [moved from mech_eap/set_cred_option.c with 100% similarity]
moonshot/mech_eap/set_name_attribute.c [moved from mech_eap/set_name_attribute.c with 100% similarity]
moonshot/mech_eap/set_sec_context_option.c [moved from mech_eap/set_sec_context_option.c with 100% similarity]
moonshot/mech_eap/store_cred.c [moved from mech_eap/store_cred.c with 100% similarity]
moonshot/mech_eap/unwrap.c [moved from mech_eap/unwrap.c with 100% similarity]
moonshot/mech_eap/unwrap_iov.c [moved from mech_eap/unwrap_iov.c with 100% similarity]
moonshot/mech_eap/userok.c [moved from mech_eap/userok.c with 100% similarity]
moonshot/mech_eap/util.h [moved from mech_eap/util.h with 100% similarity]
moonshot/mech_eap/util_adshim.c [moved from mech_eap/util_adshim.c with 100% similarity]
moonshot/mech_eap/util_attr.cpp [moved from mech_eap/util_attr.cpp with 100% similarity]
moonshot/mech_eap/util_attr.h [moved from mech_eap/util_attr.h with 100% similarity]
moonshot/mech_eap/util_base64.c [moved from mech_eap/util_base64.c with 100% similarity]
moonshot/mech_eap/util_base64.h [moved from mech_eap/util_base64.h with 100% similarity]
moonshot/mech_eap/util_buffer.c [moved from mech_eap/util_buffer.c with 100% similarity]
moonshot/mech_eap/util_cksum.c [moved from mech_eap/util_cksum.c with 100% similarity]
moonshot/mech_eap/util_context.c [moved from mech_eap/util_context.c with 100% similarity]
moonshot/mech_eap/util_cred.c [moved from mech_eap/util_cred.c with 100% similarity]
moonshot/mech_eap/util_crypt.c [moved from mech_eap/util_crypt.c with 100% similarity]
moonshot/mech_eap/util_json.cpp [moved from mech_eap/util_json.cpp with 100% similarity]
moonshot/mech_eap/util_json.h [moved from mech_eap/util_json.h with 100% similarity]
moonshot/mech_eap/util_krb.c [moved from mech_eap/util_krb.c with 100% similarity]
moonshot/mech_eap/util_lucid.c [moved from mech_eap/util_lucid.c with 100% similarity]
moonshot/mech_eap/util_mech.c [moved from mech_eap/util_mech.c with 100% similarity]
moonshot/mech_eap/util_name.c [moved from mech_eap/util_name.c with 100% similarity]
moonshot/mech_eap/util_oid.c [moved from mech_eap/util_oid.c with 100% similarity]
moonshot/mech_eap/util_ordering.c [moved from mech_eap/util_ordering.c with 100% similarity]
moonshot/mech_eap/util_radius.cpp [moved from mech_eap/util_radius.cpp with 100% similarity]
moonshot/mech_eap/util_radius.h [moved from mech_eap/util_radius.h with 100% similarity]
moonshot/mech_eap/util_reauth.c [moved from mech_eap/util_reauth.c with 100% similarity]
moonshot/mech_eap/util_reauth.h [moved from mech_eap/util_reauth.h with 100% similarity]
moonshot/mech_eap/util_saml.cpp [moved from mech_eap/util_saml.cpp with 100% similarity]
moonshot/mech_eap/util_saml.h [moved from mech_eap/util_saml.h with 100% similarity]
moonshot/mech_eap/util_shib.cpp [moved from mech_eap/util_shib.cpp with 100% similarity]
moonshot/mech_eap/util_shib.h [moved from mech_eap/util_shib.h with 100% similarity]
moonshot/mech_eap/util_sm.c [moved from mech_eap/util_sm.c with 100% similarity]
moonshot/mech_eap/util_token.c [moved from mech_eap/util_token.c with 100% similarity]
moonshot/mech_eap/verify_mic.c [moved from mech_eap/verify_mic.c with 100% similarity]
moonshot/mech_eap/wrap.c [moved from mech_eap/wrap.c with 100% similarity]
moonshot/mech_eap/wrap_iov.c [moved from mech_eap/wrap_iov.c with 100% similarity]
moonshot/mech_eap/wrap_iov_length.c [moved from mech_eap/wrap_iov_length.c with 100% similarity]
moonshot/mech_eap/wrap_size_limit.c [moved from mech_eap/wrap_size_limit.c with 100% similarity]

diff --git a/libeap b/libeap
deleted file mode 160000 (submodule)
index e586e8f..0000000
--- a/libeap
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e586e8f88968dae297e9f013f67518d21b1f12e0
diff --git a/moonshot/.gitignore b/moonshot/.gitignore
new file mode 100644 (file)
index 0000000..6ada720
--- /dev/null
@@ -0,0 +1,8 @@
+Makefile.in
+aclocal.m4
+autom4te.cache
+configure
+config.*
+ltmain.sh
+libtool
+depcomp
diff --git a/moonshot/Makefile.am b/moonshot/Makefile.am
new file mode 100644 (file)
index 0000000..2fa303c
--- /dev/null
@@ -0,0 +1,3 @@
+AUTOMAKE_OPTIONS = foreign
+
+SUBDIRS = libeap mech_eap
similarity index 100%
rename from mech_eap/acinclude.m4
rename to moonshot/acinclude.m4
similarity index 92%
rename from mech_eap/configure.ac
rename to moonshot/configure.ac
index a7e6942..4bbffd5 100644 (file)
@@ -1,7 +1,7 @@
 AC_PREREQ([2.61])
 AC_INIT([mech_eap], [0.1], [bugs@project-moonshot.org])
 dnl AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([silent-rules])
 LT_PREREQ([2.2])
 LT_INIT([dlopen disable-static])
 
@@ -47,10 +47,10 @@ AM_CONDITIONAL(GSSEAP_ENABLE_REAUTH, test "x$reauth" != "xno")
 AC_SUBST(TARGET_CFLAGS)
 AC_SUBST(TARGET_LDFLAGS)
 AX_CHECK_KRB5
-AX_CHECK_EAP
+dnl AX_CHECK_EAP
 AX_CHECK_SHIBSP
 AX_CHECK_SHIBRESOLVER
 AX_CHECK_RADSEC
 AX_CHECK_JANSSON
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile libeap/Makefile mech_eap/Makefile])
 AC_OUTPUT
diff --git a/moonshot/libeap b/moonshot/libeap
new file mode 160000 (submodule)
index 0000000..13e043b
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 13e043b06fb487b4a312e93b08388eaa280a278a
similarity index 100%
rename from mech_eap/AUTHORS
rename to moonshot/mech_eap/AUTHORS
similarity index 100%
rename from mech_eap/COPYING
rename to moonshot/mech_eap/COPYING
similarity index 100%
rename from mech_eap/LICENSE
rename to moonshot/mech_eap/LICENSE
similarity index 89%
rename from mech_eap/Makefile.am
rename to moonshot/mech_eap/Makefile.am
index 3bf752d..51f2d84 100644 (file)
@@ -3,19 +3,22 @@ AUTOMAKE_OPTIONS = foreign
 gssincludedir = $(includedir)/gssapi
 gssinclude_HEADERS = gssapi_eap.h
 
+EAP_CFLAGS = -I$(srcdir)/../libeap/src -I$(srcdir)/../libeap/src/common -I$(srcdir)/../libeap/src/eap_common  \
+    -I$(srcdir)/../libeap/src/utils -DIEEE8021X_EAPOL
+
 gssdir = $(libdir)/gss
 gss_LTLIBRARIES = mech_eap.la
 
 mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\"
 mech_eap_la_CFLAGS   = -Werror -Wall -Wunused-parameter \
-                       @KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@
+                       @KRB5_CFLAGS@  @RADSEC_CFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
 mech_eap_la_CXXFLAGS = -Werror -Wall -Wunused-parameter \
-                       @KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ \
-                       @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ @TARGET_CFLAGS@
+                       @KRB5_CFLAGS@  @RADSEC_CFLAGS@ \
+                       @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
 mech_eap_la_LDFLAGS  = -avoid-version -module \
                        -export-symbols mech_eap.exports -no-undefined \
                        @EAP_LDFLAGS@ @RADSEC_LDFLAGS@ @TARGET_LDFLAGS@
-mech_eap_la_LIBADD   = @KRB5_LIBS@ @EAP_LIBS@ @RADSEC_LIBS@ \
+mech_eap_la_LIBADD   = @KRB5_LIBS@ ../libeap/libeap.la @RADSEC_LIBS@ \
                       @SHIBRESOLVER_LIBS@ @SHIBSP_LIBS@ @JANSSON_LIBS@
 
 mech_eap_la_SOURCES =                          \
@@ -124,3 +127,4 @@ radsec_err.c: radsec_err.h
 
 clean-generic:
        rm -f gsseap_err.[ch] radsec_err.[ch]
+
similarity index 100%
rename from mech_eap/NEWS
rename to moonshot/mech_eap/NEWS
similarity index 100%
rename from mech_eap/NOTES
rename to moonshot/mech_eap/NOTES
similarity index 100%
rename from mech_eap/README
rename to moonshot/mech_eap/README
similarity index 100%
rename from mech_eap/TODO
rename to moonshot/mech_eap/TODO
similarity index 100%
rename from mech_eap/mech
rename to moonshot/mech_eap/mech
similarity index 100%
rename from mech_eap/unwrap.c
rename to moonshot/mech_eap/unwrap.c
similarity index 100%
rename from mech_eap/userok.c
rename to moonshot/mech_eap/userok.c
similarity index 100%
rename from mech_eap/util.h
rename to moonshot/mech_eap/util.h
similarity index 100%
rename from mech_eap/wrap.c
rename to moonshot/mech_eap/wrap.c