From a9bf34aa6f6cf8d8ab975989ae5103798d7e3e75 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Tue, 26 Apr 2011 14:20:10 -0400 Subject: [PATCH] Rearrange moonshot to have libeap as a subproject Pull in libeap and build against a libtool convenience library for it. --- libeap | 1 - moonshot/.gitignore | 8 ++++++++ moonshot/Makefile.am | 3 +++ {mech_eap => moonshot}/acinclude.m4 | 0 {mech_eap => moonshot}/configure.ac | 6 +++--- moonshot/libeap | 1 + {mech_eap => moonshot/mech_eap}/.gitignore | 0 {mech_eap => moonshot/mech_eap}/AUTHORS | 0 {mech_eap => moonshot/mech_eap}/COPYING | 0 {mech_eap => moonshot/mech_eap}/LICENSE | 0 {mech_eap => moonshot/mech_eap}/Makefile.am | 12 ++++++++---- {mech_eap => moonshot/mech_eap}/NEWS | 0 {mech_eap => moonshot/mech_eap}/NOTES | 0 {mech_eap => moonshot/mech_eap}/README | 0 {mech_eap => moonshot/mech_eap}/TODO | 0 {mech_eap => moonshot/mech_eap}/accept_sec_context.c | 0 {mech_eap => moonshot/mech_eap}/acquire_cred.c | 0 {mech_eap => moonshot/mech_eap}/acquire_cred_with_password.c | 0 {mech_eap => moonshot/mech_eap}/add_cred.c | 0 {mech_eap => moonshot/mech_eap}/add_cred_with_password.c | 0 {mech_eap => moonshot/mech_eap}/authdata_plugin.h | 0 {mech_eap => moonshot/mech_eap}/autogen.sh | 0 {mech_eap => moonshot/mech_eap}/canonicalize_name.c | 0 {mech_eap => moonshot/mech_eap}/compare_name.c | 0 {mech_eap => moonshot/mech_eap}/config.guess | 0 {mech_eap => moonshot/mech_eap}/config.sub | 0 {mech_eap => moonshot/mech_eap}/context_time.c | 0 {mech_eap => moonshot/mech_eap}/delete_name_attribute.c | 0 {mech_eap => moonshot/mech_eap}/delete_sec_context.c | 0 {mech_eap => moonshot/mech_eap}/dictionary.ukerna | 0 {mech_eap => moonshot/mech_eap}/display_name.c | 0 {mech_eap => moonshot/mech_eap}/display_name_ext.c | 0 {mech_eap => moonshot/mech_eap}/display_status.c | 0 {mech_eap => moonshot/mech_eap}/duplicate_name.c | 0 {mech_eap => moonshot/mech_eap}/eap_mech.c | 0 {mech_eap => moonshot/mech_eap}/export_name.c | 0 {mech_eap => moonshot/mech_eap}/export_name_composite.c | 0 {mech_eap => moonshot/mech_eap}/export_sec_context.c | 0 {mech_eap => moonshot/mech_eap}/get_mic.c | 0 {mech_eap => moonshot/mech_eap}/get_name_attribute.c | 0 {mech_eap => moonshot/mech_eap}/gssapiP_eap.h | 0 {mech_eap => moonshot/mech_eap}/gssapi_eap.h | 0 {mech_eap => moonshot/mech_eap}/gsseap_err.et | 0 {mech_eap => moonshot/mech_eap}/import_name.c | 0 {mech_eap => moonshot/mech_eap}/import_sec_context.c | 0 {mech_eap => moonshot/mech_eap}/indicate_mechs.c | 0 {mech_eap => moonshot/mech_eap}/init_sec_context.c | 0 {mech_eap => moonshot/mech_eap}/inquire_attrs_for_mech.c | 0 {mech_eap => moonshot/mech_eap}/inquire_context.c | 0 {mech_eap => moonshot/mech_eap}/inquire_cred.c | 0 {mech_eap => moonshot/mech_eap}/inquire_cred_by_oid.c | 0 {mech_eap => moonshot/mech_eap}/inquire_mech_for_saslname.c | 0 {mech_eap => moonshot/mech_eap}/inquire_mechs_for_name.c | 0 {mech_eap => moonshot/mech_eap}/inquire_name.c | 0 {mech_eap => moonshot/mech_eap}/inquire_names_for_mech.c | 0 {mech_eap => moonshot/mech_eap}/inquire_saslname_for_mech.c | 0 {mech_eap => moonshot/mech_eap}/inquire_sec_context_by_oid.c | 0 {mech_eap => moonshot/mech_eap}/install-sh | 0 {mech_eap => moonshot/mech_eap}/map_name_to_any.c | 0 {mech_eap => moonshot/mech_eap}/mech | 0 {mech_eap => moonshot/mech_eap}/mech_eap.exports | 0 {mech_eap => moonshot/mech_eap}/mech_invoke.c | 0 {mech_eap => moonshot/mech_eap}/process_context_token.c | 0 {mech_eap => moonshot/mech_eap}/pseudo_random.c | 0 {mech_eap => moonshot/mech_eap}/radius_ad.exports | 0 {mech_eap => moonshot/mech_eap}/radsec.conf | 0 {mech_eap => moonshot/mech_eap}/radsec_err.et | 0 {mech_eap => moonshot/mech_eap}/release_any_name_mapping.c | 0 {mech_eap => moonshot/mech_eap}/release_cred.c | 0 {mech_eap => moonshot/mech_eap}/release_name.c | 0 {mech_eap => moonshot/mech_eap}/release_oid.c | 0 {mech_eap => moonshot/mech_eap}/set_cred_option.c | 0 {mech_eap => moonshot/mech_eap}/set_name_attribute.c | 0 {mech_eap => moonshot/mech_eap}/set_sec_context_option.c | 0 {mech_eap => moonshot/mech_eap}/store_cred.c | 0 {mech_eap => moonshot/mech_eap}/unwrap.c | 0 {mech_eap => moonshot/mech_eap}/unwrap_iov.c | 0 {mech_eap => moonshot/mech_eap}/userok.c | 0 {mech_eap => moonshot/mech_eap}/util.h | 0 {mech_eap => moonshot/mech_eap}/util_adshim.c | 0 {mech_eap => moonshot/mech_eap}/util_attr.cpp | 0 {mech_eap => moonshot/mech_eap}/util_attr.h | 0 {mech_eap => moonshot/mech_eap}/util_base64.c | 0 {mech_eap => moonshot/mech_eap}/util_base64.h | 0 {mech_eap => moonshot/mech_eap}/util_buffer.c | 0 {mech_eap => moonshot/mech_eap}/util_cksum.c | 0 {mech_eap => moonshot/mech_eap}/util_context.c | 0 {mech_eap => moonshot/mech_eap}/util_cred.c | 0 {mech_eap => moonshot/mech_eap}/util_crypt.c | 0 {mech_eap => moonshot/mech_eap}/util_json.cpp | 0 {mech_eap => moonshot/mech_eap}/util_json.h | 0 {mech_eap => moonshot/mech_eap}/util_krb.c | 0 {mech_eap => moonshot/mech_eap}/util_lucid.c | 0 {mech_eap => moonshot/mech_eap}/util_mech.c | 0 {mech_eap => moonshot/mech_eap}/util_name.c | 0 {mech_eap => moonshot/mech_eap}/util_oid.c | 0 {mech_eap => moonshot/mech_eap}/util_ordering.c | 0 {mech_eap => moonshot/mech_eap}/util_radius.cpp | 0 {mech_eap => moonshot/mech_eap}/util_radius.h | 0 {mech_eap => moonshot/mech_eap}/util_reauth.c | 0 {mech_eap => moonshot/mech_eap}/util_reauth.h | 0 {mech_eap => moonshot/mech_eap}/util_saml.cpp | 0 {mech_eap => moonshot/mech_eap}/util_saml.h | 0 {mech_eap => moonshot/mech_eap}/util_shib.cpp | 0 {mech_eap => moonshot/mech_eap}/util_shib.h | 0 {mech_eap => moonshot/mech_eap}/util_sm.c | 0 {mech_eap => moonshot/mech_eap}/util_token.c | 0 {mech_eap => moonshot/mech_eap}/verify_mic.c | 0 {mech_eap => moonshot/mech_eap}/wrap.c | 0 {mech_eap => moonshot/mech_eap}/wrap_iov.c | 0 {mech_eap => moonshot/mech_eap}/wrap_iov_length.c | 0 {mech_eap => moonshot/mech_eap}/wrap_size_limit.c | 0 112 files changed, 23 insertions(+), 8 deletions(-) delete mode 160000 libeap create mode 100644 moonshot/.gitignore create mode 100644 moonshot/Makefile.am rename {mech_eap => moonshot}/acinclude.m4 (100%) rename {mech_eap => moonshot}/configure.ac (92%) create mode 160000 moonshot/libeap rename {mech_eap => moonshot/mech_eap}/.gitignore (100%) rename {mech_eap => moonshot/mech_eap}/AUTHORS (100%) rename {mech_eap => moonshot/mech_eap}/COPYING (100%) rename {mech_eap => moonshot/mech_eap}/LICENSE (100%) rename {mech_eap => moonshot/mech_eap}/Makefile.am (89%) rename {mech_eap => moonshot/mech_eap}/NEWS (100%) rename {mech_eap => moonshot/mech_eap}/NOTES (100%) rename {mech_eap => moonshot/mech_eap}/README (100%) rename {mech_eap => moonshot/mech_eap}/TODO (100%) rename {mech_eap => moonshot/mech_eap}/accept_sec_context.c (100%) rename {mech_eap => moonshot/mech_eap}/acquire_cred.c (100%) rename {mech_eap => moonshot/mech_eap}/acquire_cred_with_password.c (100%) rename {mech_eap => moonshot/mech_eap}/add_cred.c (100%) rename {mech_eap => moonshot/mech_eap}/add_cred_with_password.c (100%) rename {mech_eap => moonshot/mech_eap}/authdata_plugin.h (100%) rename {mech_eap => moonshot/mech_eap}/autogen.sh (100%) rename {mech_eap => moonshot/mech_eap}/canonicalize_name.c (100%) rename {mech_eap => moonshot/mech_eap}/compare_name.c (100%) rename {mech_eap => moonshot/mech_eap}/config.guess (100%) rename {mech_eap => moonshot/mech_eap}/config.sub (100%) rename {mech_eap => moonshot/mech_eap}/context_time.c (100%) rename {mech_eap => moonshot/mech_eap}/delete_name_attribute.c (100%) rename {mech_eap => moonshot/mech_eap}/delete_sec_context.c (100%) rename {mech_eap => moonshot/mech_eap}/dictionary.ukerna (100%) rename {mech_eap => moonshot/mech_eap}/display_name.c (100%) rename {mech_eap => moonshot/mech_eap}/display_name_ext.c (100%) rename {mech_eap => moonshot/mech_eap}/display_status.c (100%) rename {mech_eap => moonshot/mech_eap}/duplicate_name.c (100%) rename {mech_eap => moonshot/mech_eap}/eap_mech.c (100%) rename {mech_eap => moonshot/mech_eap}/export_name.c (100%) rename {mech_eap => moonshot/mech_eap}/export_name_composite.c (100%) rename {mech_eap => moonshot/mech_eap}/export_sec_context.c (100%) rename {mech_eap => moonshot/mech_eap}/get_mic.c (100%) rename {mech_eap => moonshot/mech_eap}/get_name_attribute.c (100%) rename {mech_eap => moonshot/mech_eap}/gssapiP_eap.h (100%) rename {mech_eap => moonshot/mech_eap}/gssapi_eap.h (100%) rename {mech_eap => moonshot/mech_eap}/gsseap_err.et (100%) rename {mech_eap => moonshot/mech_eap}/import_name.c (100%) rename {mech_eap => moonshot/mech_eap}/import_sec_context.c (100%) rename {mech_eap => moonshot/mech_eap}/indicate_mechs.c (100%) rename {mech_eap => moonshot/mech_eap}/init_sec_context.c (100%) rename {mech_eap => moonshot/mech_eap}/inquire_attrs_for_mech.c (100%) rename {mech_eap => moonshot/mech_eap}/inquire_context.c (100%) rename {mech_eap => moonshot/mech_eap}/inquire_cred.c (100%) rename {mech_eap => moonshot/mech_eap}/inquire_cred_by_oid.c (100%) rename {mech_eap => moonshot/mech_eap}/inquire_mech_for_saslname.c (100%) rename {mech_eap => moonshot/mech_eap}/inquire_mechs_for_name.c (100%) rename {mech_eap => moonshot/mech_eap}/inquire_name.c (100%) rename {mech_eap => moonshot/mech_eap}/inquire_names_for_mech.c (100%) rename {mech_eap => moonshot/mech_eap}/inquire_saslname_for_mech.c (100%) rename {mech_eap => moonshot/mech_eap}/inquire_sec_context_by_oid.c (100%) rename {mech_eap => moonshot/mech_eap}/install-sh (100%) rename {mech_eap => moonshot/mech_eap}/map_name_to_any.c (100%) rename {mech_eap => moonshot/mech_eap}/mech (100%) rename {mech_eap => moonshot/mech_eap}/mech_eap.exports (100%) rename {mech_eap => moonshot/mech_eap}/mech_invoke.c (100%) rename {mech_eap => moonshot/mech_eap}/process_context_token.c (100%) rename {mech_eap => moonshot/mech_eap}/pseudo_random.c (100%) rename {mech_eap => moonshot/mech_eap}/radius_ad.exports (100%) rename {mech_eap => moonshot/mech_eap}/radsec.conf (100%) rename {mech_eap => moonshot/mech_eap}/radsec_err.et (100%) rename {mech_eap => moonshot/mech_eap}/release_any_name_mapping.c (100%) rename {mech_eap => moonshot/mech_eap}/release_cred.c (100%) rename {mech_eap => moonshot/mech_eap}/release_name.c (100%) rename {mech_eap => moonshot/mech_eap}/release_oid.c (100%) rename {mech_eap => moonshot/mech_eap}/set_cred_option.c (100%) rename {mech_eap => moonshot/mech_eap}/set_name_attribute.c (100%) rename {mech_eap => moonshot/mech_eap}/set_sec_context_option.c (100%) rename {mech_eap => moonshot/mech_eap}/store_cred.c (100%) rename {mech_eap => moonshot/mech_eap}/unwrap.c (100%) rename {mech_eap => moonshot/mech_eap}/unwrap_iov.c (100%) rename {mech_eap => moonshot/mech_eap}/userok.c (100%) rename {mech_eap => moonshot/mech_eap}/util.h (100%) rename {mech_eap => moonshot/mech_eap}/util_adshim.c (100%) rename {mech_eap => moonshot/mech_eap}/util_attr.cpp (100%) rename {mech_eap => moonshot/mech_eap}/util_attr.h (100%) rename {mech_eap => moonshot/mech_eap}/util_base64.c (100%) rename {mech_eap => moonshot/mech_eap}/util_base64.h (100%) rename {mech_eap => moonshot/mech_eap}/util_buffer.c (100%) rename {mech_eap => moonshot/mech_eap}/util_cksum.c (100%) rename {mech_eap => moonshot/mech_eap}/util_context.c (100%) rename {mech_eap => moonshot/mech_eap}/util_cred.c (100%) rename {mech_eap => moonshot/mech_eap}/util_crypt.c (100%) rename {mech_eap => moonshot/mech_eap}/util_json.cpp (100%) rename {mech_eap => moonshot/mech_eap}/util_json.h (100%) rename {mech_eap => moonshot/mech_eap}/util_krb.c (100%) rename {mech_eap => moonshot/mech_eap}/util_lucid.c (100%) rename {mech_eap => moonshot/mech_eap}/util_mech.c (100%) rename {mech_eap => moonshot/mech_eap}/util_name.c (100%) rename {mech_eap => moonshot/mech_eap}/util_oid.c (100%) rename {mech_eap => moonshot/mech_eap}/util_ordering.c (100%) rename {mech_eap => moonshot/mech_eap}/util_radius.cpp (100%) rename {mech_eap => moonshot/mech_eap}/util_radius.h (100%) rename {mech_eap => moonshot/mech_eap}/util_reauth.c (100%) rename {mech_eap => moonshot/mech_eap}/util_reauth.h (100%) rename {mech_eap => moonshot/mech_eap}/util_saml.cpp (100%) rename {mech_eap => moonshot/mech_eap}/util_saml.h (100%) rename {mech_eap => moonshot/mech_eap}/util_shib.cpp (100%) rename {mech_eap => moonshot/mech_eap}/util_shib.h (100%) rename {mech_eap => moonshot/mech_eap}/util_sm.c (100%) rename {mech_eap => moonshot/mech_eap}/util_token.c (100%) rename {mech_eap => moonshot/mech_eap}/verify_mic.c (100%) rename {mech_eap => moonshot/mech_eap}/wrap.c (100%) rename {mech_eap => moonshot/mech_eap}/wrap_iov.c (100%) rename {mech_eap => moonshot/mech_eap}/wrap_iov_length.c (100%) rename {mech_eap => moonshot/mech_eap}/wrap_size_limit.c (100%) diff --git a/libeap b/libeap deleted file mode 160000 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 index 0000000..6ada720 --- /dev/null +++ b/moonshot/.gitignore @@ -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 index 0000000..2fa303c --- /dev/null +++ b/moonshot/Makefile.am @@ -0,0 +1,3 @@ +AUTOMAKE_OPTIONS = foreign + +SUBDIRS = libeap mech_eap diff --git a/mech_eap/acinclude.m4 b/moonshot/acinclude.m4 similarity index 100% rename from mech_eap/acinclude.m4 rename to moonshot/acinclude.m4 diff --git a/mech_eap/configure.ac b/moonshot/configure.ac similarity index 92% rename from mech_eap/configure.ac rename to moonshot/configure.ac index a7e6942..4bbffd5 100644 --- a/mech_eap/configure.ac +++ b/moonshot/configure.ac @@ -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 index 0000000..13e043b --- /dev/null +++ b/moonshot/libeap @@ -0,0 +1 @@ +Subproject commit 13e043b06fb487b4a312e93b08388eaa280a278a diff --git a/mech_eap/.gitignore b/moonshot/mech_eap/.gitignore similarity index 100% rename from mech_eap/.gitignore rename to moonshot/mech_eap/.gitignore diff --git a/mech_eap/AUTHORS b/moonshot/mech_eap/AUTHORS similarity index 100% rename from mech_eap/AUTHORS rename to moonshot/mech_eap/AUTHORS diff --git a/mech_eap/COPYING b/moonshot/mech_eap/COPYING similarity index 100% rename from mech_eap/COPYING rename to moonshot/mech_eap/COPYING diff --git a/mech_eap/LICENSE b/moonshot/mech_eap/LICENSE similarity index 100% rename from mech_eap/LICENSE rename to moonshot/mech_eap/LICENSE diff --git a/mech_eap/Makefile.am b/moonshot/mech_eap/Makefile.am similarity index 89% rename from mech_eap/Makefile.am rename to moonshot/mech_eap/Makefile.am index 3bf752d..51f2d84 100644 --- a/mech_eap/Makefile.am +++ b/moonshot/mech_eap/Makefile.am @@ -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] + diff --git a/mech_eap/NEWS b/moonshot/mech_eap/NEWS similarity index 100% rename from mech_eap/NEWS rename to moonshot/mech_eap/NEWS diff --git a/mech_eap/NOTES b/moonshot/mech_eap/NOTES similarity index 100% rename from mech_eap/NOTES rename to moonshot/mech_eap/NOTES diff --git a/mech_eap/README b/moonshot/mech_eap/README similarity index 100% rename from mech_eap/README rename to moonshot/mech_eap/README diff --git a/mech_eap/TODO b/moonshot/mech_eap/TODO similarity index 100% rename from mech_eap/TODO rename to moonshot/mech_eap/TODO diff --git a/mech_eap/accept_sec_context.c b/moonshot/mech_eap/accept_sec_context.c similarity index 100% rename from mech_eap/accept_sec_context.c rename to moonshot/mech_eap/accept_sec_context.c diff --git a/mech_eap/acquire_cred.c b/moonshot/mech_eap/acquire_cred.c similarity index 100% rename from mech_eap/acquire_cred.c rename to moonshot/mech_eap/acquire_cred.c diff --git a/mech_eap/acquire_cred_with_password.c b/moonshot/mech_eap/acquire_cred_with_password.c similarity index 100% rename from mech_eap/acquire_cred_with_password.c rename to moonshot/mech_eap/acquire_cred_with_password.c diff --git a/mech_eap/add_cred.c b/moonshot/mech_eap/add_cred.c similarity index 100% rename from mech_eap/add_cred.c rename to moonshot/mech_eap/add_cred.c diff --git a/mech_eap/add_cred_with_password.c b/moonshot/mech_eap/add_cred_with_password.c similarity index 100% rename from mech_eap/add_cred_with_password.c rename to moonshot/mech_eap/add_cred_with_password.c diff --git a/mech_eap/authdata_plugin.h b/moonshot/mech_eap/authdata_plugin.h similarity index 100% rename from mech_eap/authdata_plugin.h rename to moonshot/mech_eap/authdata_plugin.h diff --git a/mech_eap/autogen.sh b/moonshot/mech_eap/autogen.sh similarity index 100% rename from mech_eap/autogen.sh rename to moonshot/mech_eap/autogen.sh diff --git a/mech_eap/canonicalize_name.c b/moonshot/mech_eap/canonicalize_name.c similarity index 100% rename from mech_eap/canonicalize_name.c rename to moonshot/mech_eap/canonicalize_name.c diff --git a/mech_eap/compare_name.c b/moonshot/mech_eap/compare_name.c similarity index 100% rename from mech_eap/compare_name.c rename to moonshot/mech_eap/compare_name.c diff --git a/mech_eap/config.guess b/moonshot/mech_eap/config.guess similarity index 100% rename from mech_eap/config.guess rename to moonshot/mech_eap/config.guess diff --git a/mech_eap/config.sub b/moonshot/mech_eap/config.sub similarity index 100% rename from mech_eap/config.sub rename to moonshot/mech_eap/config.sub diff --git a/mech_eap/context_time.c b/moonshot/mech_eap/context_time.c similarity index 100% rename from mech_eap/context_time.c rename to moonshot/mech_eap/context_time.c diff --git a/mech_eap/delete_name_attribute.c b/moonshot/mech_eap/delete_name_attribute.c similarity index 100% rename from mech_eap/delete_name_attribute.c rename to moonshot/mech_eap/delete_name_attribute.c diff --git a/mech_eap/delete_sec_context.c b/moonshot/mech_eap/delete_sec_context.c similarity index 100% rename from mech_eap/delete_sec_context.c rename to moonshot/mech_eap/delete_sec_context.c diff --git a/mech_eap/dictionary.ukerna b/moonshot/mech_eap/dictionary.ukerna similarity index 100% rename from mech_eap/dictionary.ukerna rename to moonshot/mech_eap/dictionary.ukerna diff --git a/mech_eap/display_name.c b/moonshot/mech_eap/display_name.c similarity index 100% rename from mech_eap/display_name.c rename to moonshot/mech_eap/display_name.c diff --git a/mech_eap/display_name_ext.c b/moonshot/mech_eap/display_name_ext.c similarity index 100% rename from mech_eap/display_name_ext.c rename to moonshot/mech_eap/display_name_ext.c diff --git a/mech_eap/display_status.c b/moonshot/mech_eap/display_status.c similarity index 100% rename from mech_eap/display_status.c rename to moonshot/mech_eap/display_status.c diff --git a/mech_eap/duplicate_name.c b/moonshot/mech_eap/duplicate_name.c similarity index 100% rename from mech_eap/duplicate_name.c rename to moonshot/mech_eap/duplicate_name.c diff --git a/mech_eap/eap_mech.c b/moonshot/mech_eap/eap_mech.c similarity index 100% rename from mech_eap/eap_mech.c rename to moonshot/mech_eap/eap_mech.c diff --git a/mech_eap/export_name.c b/moonshot/mech_eap/export_name.c similarity index 100% rename from mech_eap/export_name.c rename to moonshot/mech_eap/export_name.c diff --git a/mech_eap/export_name_composite.c b/moonshot/mech_eap/export_name_composite.c similarity index 100% rename from mech_eap/export_name_composite.c rename to moonshot/mech_eap/export_name_composite.c diff --git a/mech_eap/export_sec_context.c b/moonshot/mech_eap/export_sec_context.c similarity index 100% rename from mech_eap/export_sec_context.c rename to moonshot/mech_eap/export_sec_context.c diff --git a/mech_eap/get_mic.c b/moonshot/mech_eap/get_mic.c similarity index 100% rename from mech_eap/get_mic.c rename to moonshot/mech_eap/get_mic.c diff --git a/mech_eap/get_name_attribute.c b/moonshot/mech_eap/get_name_attribute.c similarity index 100% rename from mech_eap/get_name_attribute.c rename to moonshot/mech_eap/get_name_attribute.c diff --git a/mech_eap/gssapiP_eap.h b/moonshot/mech_eap/gssapiP_eap.h similarity index 100% rename from mech_eap/gssapiP_eap.h rename to moonshot/mech_eap/gssapiP_eap.h diff --git a/mech_eap/gssapi_eap.h b/moonshot/mech_eap/gssapi_eap.h similarity index 100% rename from mech_eap/gssapi_eap.h rename to moonshot/mech_eap/gssapi_eap.h diff --git a/mech_eap/gsseap_err.et b/moonshot/mech_eap/gsseap_err.et similarity index 100% rename from mech_eap/gsseap_err.et rename to moonshot/mech_eap/gsseap_err.et diff --git a/mech_eap/import_name.c b/moonshot/mech_eap/import_name.c similarity index 100% rename from mech_eap/import_name.c rename to moonshot/mech_eap/import_name.c diff --git a/mech_eap/import_sec_context.c b/moonshot/mech_eap/import_sec_context.c similarity index 100% rename from mech_eap/import_sec_context.c rename to moonshot/mech_eap/import_sec_context.c diff --git a/mech_eap/indicate_mechs.c b/moonshot/mech_eap/indicate_mechs.c similarity index 100% rename from mech_eap/indicate_mechs.c rename to moonshot/mech_eap/indicate_mechs.c diff --git a/mech_eap/init_sec_context.c b/moonshot/mech_eap/init_sec_context.c similarity index 100% rename from mech_eap/init_sec_context.c rename to moonshot/mech_eap/init_sec_context.c diff --git a/mech_eap/inquire_attrs_for_mech.c b/moonshot/mech_eap/inquire_attrs_for_mech.c similarity index 100% rename from mech_eap/inquire_attrs_for_mech.c rename to moonshot/mech_eap/inquire_attrs_for_mech.c diff --git a/mech_eap/inquire_context.c b/moonshot/mech_eap/inquire_context.c similarity index 100% rename from mech_eap/inquire_context.c rename to moonshot/mech_eap/inquire_context.c diff --git a/mech_eap/inquire_cred.c b/moonshot/mech_eap/inquire_cred.c similarity index 100% rename from mech_eap/inquire_cred.c rename to moonshot/mech_eap/inquire_cred.c diff --git a/mech_eap/inquire_cred_by_oid.c b/moonshot/mech_eap/inquire_cred_by_oid.c similarity index 100% rename from mech_eap/inquire_cred_by_oid.c rename to moonshot/mech_eap/inquire_cred_by_oid.c diff --git a/mech_eap/inquire_mech_for_saslname.c b/moonshot/mech_eap/inquire_mech_for_saslname.c similarity index 100% rename from mech_eap/inquire_mech_for_saslname.c rename to moonshot/mech_eap/inquire_mech_for_saslname.c diff --git a/mech_eap/inquire_mechs_for_name.c b/moonshot/mech_eap/inquire_mechs_for_name.c similarity index 100% rename from mech_eap/inquire_mechs_for_name.c rename to moonshot/mech_eap/inquire_mechs_for_name.c diff --git a/mech_eap/inquire_name.c b/moonshot/mech_eap/inquire_name.c similarity index 100% rename from mech_eap/inquire_name.c rename to moonshot/mech_eap/inquire_name.c diff --git a/mech_eap/inquire_names_for_mech.c b/moonshot/mech_eap/inquire_names_for_mech.c similarity index 100% rename from mech_eap/inquire_names_for_mech.c rename to moonshot/mech_eap/inquire_names_for_mech.c diff --git a/mech_eap/inquire_saslname_for_mech.c b/moonshot/mech_eap/inquire_saslname_for_mech.c similarity index 100% rename from mech_eap/inquire_saslname_for_mech.c rename to moonshot/mech_eap/inquire_saslname_for_mech.c diff --git a/mech_eap/inquire_sec_context_by_oid.c b/moonshot/mech_eap/inquire_sec_context_by_oid.c similarity index 100% rename from mech_eap/inquire_sec_context_by_oid.c rename to moonshot/mech_eap/inquire_sec_context_by_oid.c diff --git a/mech_eap/install-sh b/moonshot/mech_eap/install-sh similarity index 100% rename from mech_eap/install-sh rename to moonshot/mech_eap/install-sh diff --git a/mech_eap/map_name_to_any.c b/moonshot/mech_eap/map_name_to_any.c similarity index 100% rename from mech_eap/map_name_to_any.c rename to moonshot/mech_eap/map_name_to_any.c diff --git a/mech_eap/mech b/moonshot/mech_eap/mech similarity index 100% rename from mech_eap/mech rename to moonshot/mech_eap/mech diff --git a/mech_eap/mech_eap.exports b/moonshot/mech_eap/mech_eap.exports similarity index 100% rename from mech_eap/mech_eap.exports rename to moonshot/mech_eap/mech_eap.exports diff --git a/mech_eap/mech_invoke.c b/moonshot/mech_eap/mech_invoke.c similarity index 100% rename from mech_eap/mech_invoke.c rename to moonshot/mech_eap/mech_invoke.c diff --git a/mech_eap/process_context_token.c b/moonshot/mech_eap/process_context_token.c similarity index 100% rename from mech_eap/process_context_token.c rename to moonshot/mech_eap/process_context_token.c diff --git a/mech_eap/pseudo_random.c b/moonshot/mech_eap/pseudo_random.c similarity index 100% rename from mech_eap/pseudo_random.c rename to moonshot/mech_eap/pseudo_random.c diff --git a/mech_eap/radius_ad.exports b/moonshot/mech_eap/radius_ad.exports similarity index 100% rename from mech_eap/radius_ad.exports rename to moonshot/mech_eap/radius_ad.exports diff --git a/mech_eap/radsec.conf b/moonshot/mech_eap/radsec.conf similarity index 100% rename from mech_eap/radsec.conf rename to moonshot/mech_eap/radsec.conf diff --git a/mech_eap/radsec_err.et b/moonshot/mech_eap/radsec_err.et similarity index 100% rename from mech_eap/radsec_err.et rename to moonshot/mech_eap/radsec_err.et diff --git a/mech_eap/release_any_name_mapping.c b/moonshot/mech_eap/release_any_name_mapping.c similarity index 100% rename from mech_eap/release_any_name_mapping.c rename to moonshot/mech_eap/release_any_name_mapping.c diff --git a/mech_eap/release_cred.c b/moonshot/mech_eap/release_cred.c similarity index 100% rename from mech_eap/release_cred.c rename to moonshot/mech_eap/release_cred.c diff --git a/mech_eap/release_name.c b/moonshot/mech_eap/release_name.c similarity index 100% rename from mech_eap/release_name.c rename to moonshot/mech_eap/release_name.c diff --git a/mech_eap/release_oid.c b/moonshot/mech_eap/release_oid.c similarity index 100% rename from mech_eap/release_oid.c rename to moonshot/mech_eap/release_oid.c diff --git a/mech_eap/set_cred_option.c b/moonshot/mech_eap/set_cred_option.c similarity index 100% rename from mech_eap/set_cred_option.c rename to moonshot/mech_eap/set_cred_option.c diff --git a/mech_eap/set_name_attribute.c b/moonshot/mech_eap/set_name_attribute.c similarity index 100% rename from mech_eap/set_name_attribute.c rename to moonshot/mech_eap/set_name_attribute.c diff --git a/mech_eap/set_sec_context_option.c b/moonshot/mech_eap/set_sec_context_option.c similarity index 100% rename from mech_eap/set_sec_context_option.c rename to moonshot/mech_eap/set_sec_context_option.c diff --git a/mech_eap/store_cred.c b/moonshot/mech_eap/store_cred.c similarity index 100% rename from mech_eap/store_cred.c rename to moonshot/mech_eap/store_cred.c diff --git a/mech_eap/unwrap.c b/moonshot/mech_eap/unwrap.c similarity index 100% rename from mech_eap/unwrap.c rename to moonshot/mech_eap/unwrap.c diff --git a/mech_eap/unwrap_iov.c b/moonshot/mech_eap/unwrap_iov.c similarity index 100% rename from mech_eap/unwrap_iov.c rename to moonshot/mech_eap/unwrap_iov.c diff --git a/mech_eap/userok.c b/moonshot/mech_eap/userok.c similarity index 100% rename from mech_eap/userok.c rename to moonshot/mech_eap/userok.c diff --git a/mech_eap/util.h b/moonshot/mech_eap/util.h similarity index 100% rename from mech_eap/util.h rename to moonshot/mech_eap/util.h diff --git a/mech_eap/util_adshim.c b/moonshot/mech_eap/util_adshim.c similarity index 100% rename from mech_eap/util_adshim.c rename to moonshot/mech_eap/util_adshim.c diff --git a/mech_eap/util_attr.cpp b/moonshot/mech_eap/util_attr.cpp similarity index 100% rename from mech_eap/util_attr.cpp rename to moonshot/mech_eap/util_attr.cpp diff --git a/mech_eap/util_attr.h b/moonshot/mech_eap/util_attr.h similarity index 100% rename from mech_eap/util_attr.h rename to moonshot/mech_eap/util_attr.h diff --git a/mech_eap/util_base64.c b/moonshot/mech_eap/util_base64.c similarity index 100% rename from mech_eap/util_base64.c rename to moonshot/mech_eap/util_base64.c diff --git a/mech_eap/util_base64.h b/moonshot/mech_eap/util_base64.h similarity index 100% rename from mech_eap/util_base64.h rename to moonshot/mech_eap/util_base64.h diff --git a/mech_eap/util_buffer.c b/moonshot/mech_eap/util_buffer.c similarity index 100% rename from mech_eap/util_buffer.c rename to moonshot/mech_eap/util_buffer.c diff --git a/mech_eap/util_cksum.c b/moonshot/mech_eap/util_cksum.c similarity index 100% rename from mech_eap/util_cksum.c rename to moonshot/mech_eap/util_cksum.c diff --git a/mech_eap/util_context.c b/moonshot/mech_eap/util_context.c similarity index 100% rename from mech_eap/util_context.c rename to moonshot/mech_eap/util_context.c diff --git a/mech_eap/util_cred.c b/moonshot/mech_eap/util_cred.c similarity index 100% rename from mech_eap/util_cred.c rename to moonshot/mech_eap/util_cred.c diff --git a/mech_eap/util_crypt.c b/moonshot/mech_eap/util_crypt.c similarity index 100% rename from mech_eap/util_crypt.c rename to moonshot/mech_eap/util_crypt.c diff --git a/mech_eap/util_json.cpp b/moonshot/mech_eap/util_json.cpp similarity index 100% rename from mech_eap/util_json.cpp rename to moonshot/mech_eap/util_json.cpp diff --git a/mech_eap/util_json.h b/moonshot/mech_eap/util_json.h similarity index 100% rename from mech_eap/util_json.h rename to moonshot/mech_eap/util_json.h diff --git a/mech_eap/util_krb.c b/moonshot/mech_eap/util_krb.c similarity index 100% rename from mech_eap/util_krb.c rename to moonshot/mech_eap/util_krb.c diff --git a/mech_eap/util_lucid.c b/moonshot/mech_eap/util_lucid.c similarity index 100% rename from mech_eap/util_lucid.c rename to moonshot/mech_eap/util_lucid.c diff --git a/mech_eap/util_mech.c b/moonshot/mech_eap/util_mech.c similarity index 100% rename from mech_eap/util_mech.c rename to moonshot/mech_eap/util_mech.c diff --git a/mech_eap/util_name.c b/moonshot/mech_eap/util_name.c similarity index 100% rename from mech_eap/util_name.c rename to moonshot/mech_eap/util_name.c diff --git a/mech_eap/util_oid.c b/moonshot/mech_eap/util_oid.c similarity index 100% rename from mech_eap/util_oid.c rename to moonshot/mech_eap/util_oid.c diff --git a/mech_eap/util_ordering.c b/moonshot/mech_eap/util_ordering.c similarity index 100% rename from mech_eap/util_ordering.c rename to moonshot/mech_eap/util_ordering.c diff --git a/mech_eap/util_radius.cpp b/moonshot/mech_eap/util_radius.cpp similarity index 100% rename from mech_eap/util_radius.cpp rename to moonshot/mech_eap/util_radius.cpp diff --git a/mech_eap/util_radius.h b/moonshot/mech_eap/util_radius.h similarity index 100% rename from mech_eap/util_radius.h rename to moonshot/mech_eap/util_radius.h diff --git a/mech_eap/util_reauth.c b/moonshot/mech_eap/util_reauth.c similarity index 100% rename from mech_eap/util_reauth.c rename to moonshot/mech_eap/util_reauth.c diff --git a/mech_eap/util_reauth.h b/moonshot/mech_eap/util_reauth.h similarity index 100% rename from mech_eap/util_reauth.h rename to moonshot/mech_eap/util_reauth.h diff --git a/mech_eap/util_saml.cpp b/moonshot/mech_eap/util_saml.cpp similarity index 100% rename from mech_eap/util_saml.cpp rename to moonshot/mech_eap/util_saml.cpp diff --git a/mech_eap/util_saml.h b/moonshot/mech_eap/util_saml.h similarity index 100% rename from mech_eap/util_saml.h rename to moonshot/mech_eap/util_saml.h diff --git a/mech_eap/util_shib.cpp b/moonshot/mech_eap/util_shib.cpp similarity index 100% rename from mech_eap/util_shib.cpp rename to moonshot/mech_eap/util_shib.cpp diff --git a/mech_eap/util_shib.h b/moonshot/mech_eap/util_shib.h similarity index 100% rename from mech_eap/util_shib.h rename to moonshot/mech_eap/util_shib.h diff --git a/mech_eap/util_sm.c b/moonshot/mech_eap/util_sm.c similarity index 100% rename from mech_eap/util_sm.c rename to moonshot/mech_eap/util_sm.c diff --git a/mech_eap/util_token.c b/moonshot/mech_eap/util_token.c similarity index 100% rename from mech_eap/util_token.c rename to moonshot/mech_eap/util_token.c diff --git a/mech_eap/verify_mic.c b/moonshot/mech_eap/verify_mic.c similarity index 100% rename from mech_eap/verify_mic.c rename to moonshot/mech_eap/verify_mic.c diff --git a/mech_eap/wrap.c b/moonshot/mech_eap/wrap.c similarity index 100% rename from mech_eap/wrap.c rename to moonshot/mech_eap/wrap.c diff --git a/mech_eap/wrap_iov.c b/moonshot/mech_eap/wrap_iov.c similarity index 100% rename from mech_eap/wrap_iov.c rename to moonshot/mech_eap/wrap_iov.c diff --git a/mech_eap/wrap_iov_length.c b/moonshot/mech_eap/wrap_iov_length.c similarity index 100% rename from mech_eap/wrap_iov_length.c rename to moonshot/mech_eap/wrap_iov_length.c diff --git a/mech_eap/wrap_size_limit.c b/moonshot/mech_eap/wrap_size_limit.c similarity index 100% rename from mech_eap/wrap_size_limit.c rename to moonshot/mech_eap/wrap_size_limit.c -- 2.1.4