Rearrange moonshot to have libeap as a subproject

Pull in libeap and build against a libtool convenience library for it.

diff --git a/.gitignore b/.gitignore
index 06a3924..6ada720 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,32 +1,8 @@
-/aclocal.m4
-/autom4te.cache
-/compile
-/config.guess
-/config.log
-/config.status
-/config.sub
-/config.h
-/configure
-/config.h.in
-/depcomp
-
-/libtool
-/ltmain.sh
-/missing
-
-/gsseap_err.[ch]
-/radsec_err.[ch]
-
-.DS_Store
-
 Makefile.in
-Makefile
-
-*.la
-*.lo
-*~
-
-.deps
-.libs
-.a.out.dSYM
-.dSYM
+aclocal.m4
+autom4te.cache
+configure
+config.*
+ltmain.sh
+libtool
+depcomp

diff --git a/Makefile.am b/Makefile.am
index 3bf752d..2fa303c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,126 +1,3 @@
 AUTOMAKE_OPTIONS = foreign
 
-gssincludedir = $(includedir)/gssapi
-gssinclude_HEADERS = gssapi_eap.h
-
-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@
-mech_eap_la_CXXFLAGS = -Werror -Wall -Wunused-parameter \
-                       @KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ \
-                       @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ @TARGET_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@ \
-                      @SHIBRESOLVER_LIBS@ @SHIBSP_LIBS@ @JANSSON_LIBS@
-
-mech_eap_la_SOURCES =                          \
-       accept_sec_context.c                    \
-       acquire_cred.c                          \
-       acquire_cred_with_password.c            \
-       add_cred.c                              \
-       add_cred_with_password.c                \
-       canonicalize_name.c                     \
-       compare_name.c                          \
-       context_time.c                          \
-       delete_name_attribute.c                 \
-       delete_sec_context.c                    \
-       display_name.c                          \
-       display_name_ext.c                      \
-       display_status.c                        \
-       duplicate_name.c                        \
-       eap_mech.c                              \
-       export_name.c                           \
-       export_name_composite.c                 \
-       export_sec_context.c                    \
-       get_mic.c                               \
-       get_name_attribute.c                    \
-       gsseap_err.c                            \
-       import_name.c                           \
-       import_sec_context.c                    \
-       indicate_mechs.c                        \
-       init_sec_context.c                      \
-       inquire_attrs_for_mech.c                \
-       inquire_context.c                       \
-       inquire_cred.c                          \
-       inquire_cred_by_oid.c                   \
-       inquire_mech_for_saslname.c             \
-       inquire_mechs_for_name.c                \
-       inquire_name.c                          \
-       inquire_names_for_mech.c                \
-       inquire_saslname_for_mech.c             \
-       inquire_sec_context_by_oid.c            \
-       map_name_to_any.c                       \
-       process_context_token.c                 \
-       pseudo_random.c                         \
-       radsec_err.c                            \
-       release_any_name_mapping.c              \
-       release_cred.c                          \
-       release_name.c                          \
-       release_oid.c                           \
-       set_name_attribute.c                    \
-       set_cred_option.c                       \
-       set_sec_context_option.c                \
-       store_cred.c                            \
-       unwrap.c                                \
-       unwrap_iov.c                            \
-       userok.c                                \
-       util_attr.cpp                           \
-       util_base64.c                           \
-       util_buffer.c                           \
-       util_context.c                          \
-       util_cksum.c                            \
-       util_cred.c                             \
-       util_crypt.c                            \
-       util_json.cpp                           \
-       util_krb.c                              \
-       util_lucid.c                            \
-       util_mech.c                             \
-       util_name.c                             \
-       util_oid.c                              \
-       util_ordering.c                         \
-       util_radius.cpp                         \
-       util_saml.cpp                           \
-       util_shib.cpp                           \
-       util_sm.c                               \
-       util_token.c                            \
-       verify_mic.c                            \
-       wrap.c                                  \
-       wrap_iov.c                              \
-       wrap_iov_length.c                       \
-       wrap_size_limit.c
-
-BUILT_SOURCES = gsseap_err.c radsec_err.c
-
-if GSSEAP_ENABLE_REAUTH
-mech_eap_la_SOURCES += util_reauth.c
-
-
-
-if !HEIMDAL
-krb5pluginsdir = $(libdir)/krb5/plugins/authdata
-krb5plugins_LTLIBRARIES = radius_ad.la
-
-radius_ad_la_CFLAGS  = -Werror -Wall -Wunused-parameter \
-                       @KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@
-radius_ad_la_LDFLAGS = -avoid-version -module \
-                      -export-symbols radius_ad.exports -no-undefined
-radius_ad_la_LIBADD  = @KRB5_LIBS@
-radius_ad_la_SOURCES = util_adshim.c
-endif
-endif
-
-gsseap_err.h gsseap_err.c: gsseap_err.et
-       $(COMPILE_ET) $<
-
-radsec_err.h radsec_err.c: radsec_err.et
-       $(COMPILE_ET) $<
-
-radsec_err.c: radsec_err.h
-
-clean-generic:
-       rm -f gsseap_err.[ch] radsec_err.[ch]
+SUBDIRS = libeap mech_eap

diff --git a/configure.ac b/configure.ac
index a7e6942..4bbffd5 100644 (file)
--- a/configure.ac
+++ b/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/mech_eap/.gitignore b/mech_eap/.gitignore
new file mode 100644 (file)
index 0000000..06a3924
--- /dev/null
+++ b/mech_eap/.gitignore
@@ -0,0 +1,32 @@
+/aclocal.m4
+/autom4te.cache
+/compile
+/config.guess
+/config.log
+/config.status
+/config.sub
+/config.h
+/configure
+/config.h.in
+/depcomp
+
+/libtool
+/ltmain.sh
+/missing
+
+/gsseap_err.[ch]
+/radsec_err.[ch]
+
+.DS_Store
+
+Makefile.in
+Makefile
+
+*.la
+*.lo
+*~
+
+.deps
+.libs
+.a.out.dSYM
+.dSYM

diff --git a/AUTHORS b/mech_eap/AUTHORS
similarity index 100%
rename from AUTHORS
rename to mech_eap/AUTHORS

diff --git a/COPYING b/mech_eap/COPYING
similarity index 100%
rename from COPYING
rename to mech_eap/COPYING

diff --git a/LICENSE b/mech_eap/LICENSE
similarity index 100%
rename from LICENSE
rename to mech_eap/LICENSE

diff --git a/mech_eap/Makefile.am b/mech_eap/Makefile.am
new file mode 100644 (file)
index 0000000..51f2d84
--- /dev/null
+++ b/mech_eap/Makefile.am
@@ -0,0 +1,130 @@
+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@  @RADSEC_CFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
+mech_eap_la_CXXFLAGS = -Werror -Wall -Wunused-parameter \
+                       @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@ ../libeap/libeap.la @RADSEC_LIBS@ \
+                      @SHIBRESOLVER_LIBS@ @SHIBSP_LIBS@ @JANSSON_LIBS@
+
+mech_eap_la_SOURCES =                          \
+       accept_sec_context.c                    \
+       acquire_cred.c                          \
+       acquire_cred_with_password.c            \
+       add_cred.c                              \
+       add_cred_with_password.c                \
+       canonicalize_name.c                     \
+       compare_name.c                          \
+       context_time.c                          \
+       delete_name_attribute.c                 \
+       delete_sec_context.c                    \
+       display_name.c                          \
+       display_name_ext.c                      \
+       display_status.c                        \
+       duplicate_name.c                        \
+       eap_mech.c                              \
+       export_name.c                           \
+       export_name_composite.c                 \
+       export_sec_context.c                    \
+       get_mic.c                               \
+       get_name_attribute.c                    \
+       gsseap_err.c                            \
+       import_name.c                           \
+       import_sec_context.c                    \
+       indicate_mechs.c                        \
+       init_sec_context.c                      \
+       inquire_attrs_for_mech.c                \
+       inquire_context.c                       \
+       inquire_cred.c                          \
+       inquire_cred_by_oid.c                   \
+       inquire_mech_for_saslname.c             \
+       inquire_mechs_for_name.c                \
+       inquire_name.c                          \
+       inquire_names_for_mech.c                \
+       inquire_saslname_for_mech.c             \
+       inquire_sec_context_by_oid.c            \
+       map_name_to_any.c                       \
+       process_context_token.c                 \
+       pseudo_random.c                         \
+       radsec_err.c                            \
+       release_any_name_mapping.c              \
+       release_cred.c                          \
+       release_name.c                          \
+       release_oid.c                           \
+       set_name_attribute.c                    \
+       set_cred_option.c                       \
+       set_sec_context_option.c                \
+       store_cred.c                            \
+       unwrap.c                                \
+       unwrap_iov.c                            \
+       userok.c                                \
+       util_attr.cpp                           \
+       util_base64.c                           \
+       util_buffer.c                           \
+       util_context.c                          \
+       util_cksum.c                            \
+       util_cred.c                             \
+       util_crypt.c                            \
+       util_json.cpp                           \
+       util_krb.c                              \
+       util_lucid.c                            \
+       util_mech.c                             \
+       util_name.c                             \
+       util_oid.c                              \
+       util_ordering.c                         \
+       util_radius.cpp                         \
+       util_saml.cpp                           \
+       util_shib.cpp                           \
+       util_sm.c                               \
+       util_token.c                            \
+       verify_mic.c                            \
+       wrap.c                                  \
+       wrap_iov.c                              \
+       wrap_iov_length.c                       \
+       wrap_size_limit.c
+
+BUILT_SOURCES = gsseap_err.c radsec_err.c
+
+if GSSEAP_ENABLE_REAUTH
+mech_eap_la_SOURCES += util_reauth.c
+
+
+
+if !HEIMDAL
+krb5pluginsdir = $(libdir)/krb5/plugins/authdata
+krb5plugins_LTLIBRARIES = radius_ad.la
+
+radius_ad_la_CFLAGS  = -Werror -Wall -Wunused-parameter \
+                       @KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@
+radius_ad_la_LDFLAGS = -avoid-version -module \
+                      -export-symbols radius_ad.exports -no-undefined
+radius_ad_la_LIBADD  = @KRB5_LIBS@
+radius_ad_la_SOURCES = util_adshim.c
+endif
+endif
+
+gsseap_err.h gsseap_err.c: gsseap_err.et
+       $(COMPILE_ET) $<
+
+radsec_err.h radsec_err.c: radsec_err.et
+       $(COMPILE_ET) $<
+
+radsec_err.c: radsec_err.h
+
+clean-generic:
+       rm -f gsseap_err.[ch] radsec_err.[ch]
+

diff --git a/NEWS b/mech_eap/NEWS
similarity index 100%
rename from NEWS
rename to mech_eap/NEWS

diff --git a/NOTES b/mech_eap/NOTES
similarity index 100%
rename from NOTES
rename to mech_eap/NOTES

diff --git a/README b/mech_eap/README
similarity index 100%
rename from README
rename to mech_eap/README

diff --git a/TODO b/mech_eap/TODO
similarity index 100%
rename from TODO
rename to mech_eap/TODO

diff --git a/accept_sec_context.c b/mech_eap/accept_sec_context.c
similarity index 100%
rename from accept_sec_context.c
rename to mech_eap/accept_sec_context.c

diff --git a/acquire_cred.c b/mech_eap/acquire_cred.c
similarity index 100%
rename from acquire_cred.c
rename to mech_eap/acquire_cred.c

diff --git a/acquire_cred_with_password.c b/mech_eap/acquire_cred_with_password.c
similarity index 100%
rename from acquire_cred_with_password.c
rename to mech_eap/acquire_cred_with_password.c

diff --git a/add_cred.c b/mech_eap/add_cred.c
similarity index 100%
rename from add_cred.c
rename to mech_eap/add_cred.c

diff --git a/add_cred_with_password.c b/mech_eap/add_cred_with_password.c
similarity index 100%
rename from add_cred_with_password.c
rename to mech_eap/add_cred_with_password.c

diff --git a/authdata_plugin.h b/mech_eap/authdata_plugin.h
similarity index 100%
rename from authdata_plugin.h
rename to mech_eap/authdata_plugin.h

diff --git a/autogen.sh b/mech_eap/autogen.sh
similarity index 100%
rename from autogen.sh
rename to mech_eap/autogen.sh

diff --git a/canonicalize_name.c b/mech_eap/canonicalize_name.c
similarity index 100%
rename from canonicalize_name.c
rename to mech_eap/canonicalize_name.c

diff --git a/compare_name.c b/mech_eap/compare_name.c
similarity index 100%
rename from compare_name.c
rename to mech_eap/compare_name.c

diff --git a/config.guess b/mech_eap/config.guess
similarity index 100%
rename from config.guess
rename to mech_eap/config.guess

diff --git a/config.sub b/mech_eap/config.sub
similarity index 100%
rename from config.sub
rename to mech_eap/config.sub

diff --git a/context_time.c b/mech_eap/context_time.c
similarity index 100%
rename from context_time.c
rename to mech_eap/context_time.c

diff --git a/delete_name_attribute.c b/mech_eap/delete_name_attribute.c
similarity index 100%
rename from delete_name_attribute.c
rename to mech_eap/delete_name_attribute.c

diff --git a/delete_sec_context.c b/mech_eap/delete_sec_context.c
similarity index 100%
rename from delete_sec_context.c
rename to mech_eap/delete_sec_context.c

diff --git a/dictionary.ukerna b/mech_eap/dictionary.ukerna
similarity index 100%
rename from dictionary.ukerna
rename to mech_eap/dictionary.ukerna

diff --git a/display_name.c b/mech_eap/display_name.c
similarity index 100%
rename from display_name.c
rename to mech_eap/display_name.c

diff --git a/display_name_ext.c b/mech_eap/display_name_ext.c
similarity index 100%
rename from display_name_ext.c
rename to mech_eap/display_name_ext.c

diff --git a/display_status.c b/mech_eap/display_status.c
similarity index 100%
rename from display_status.c
rename to mech_eap/display_status.c

diff --git a/duplicate_name.c b/mech_eap/duplicate_name.c
similarity index 100%
rename from duplicate_name.c
rename to mech_eap/duplicate_name.c

diff --git a/eap_mech.c b/mech_eap/eap_mech.c
similarity index 100%
rename from eap_mech.c
rename to mech_eap/eap_mech.c

diff --git a/export_name.c b/mech_eap/export_name.c
similarity index 100%
rename from export_name.c
rename to mech_eap/export_name.c

diff --git a/export_name_composite.c b/mech_eap/export_name_composite.c
similarity index 100%
rename from export_name_composite.c
rename to mech_eap/export_name_composite.c

diff --git a/export_sec_context.c b/mech_eap/export_sec_context.c
similarity index 100%
rename from export_sec_context.c
rename to mech_eap/export_sec_context.c

diff --git a/get_mic.c b/mech_eap/get_mic.c
similarity index 100%
rename from get_mic.c
rename to mech_eap/get_mic.c

diff --git a/get_name_attribute.c b/mech_eap/get_name_attribute.c
similarity index 100%
rename from get_name_attribute.c
rename to mech_eap/get_name_attribute.c

diff --git a/gssapiP_eap.h b/mech_eap/gssapiP_eap.h
similarity index 100%
rename from gssapiP_eap.h
rename to mech_eap/gssapiP_eap.h

diff --git a/gssapi_eap.h b/mech_eap/gssapi_eap.h
similarity index 100%
rename from gssapi_eap.h
rename to mech_eap/gssapi_eap.h

diff --git a/gsseap_err.et b/mech_eap/gsseap_err.et
similarity index 100%
rename from gsseap_err.et
rename to mech_eap/gsseap_err.et

diff --git a/import_name.c b/mech_eap/import_name.c
similarity index 100%
rename from import_name.c
rename to mech_eap/import_name.c

diff --git a/import_sec_context.c b/mech_eap/import_sec_context.c
similarity index 100%
rename from import_sec_context.c
rename to mech_eap/import_sec_context.c

diff --git a/indicate_mechs.c b/mech_eap/indicate_mechs.c
similarity index 100%
rename from indicate_mechs.c
rename to mech_eap/indicate_mechs.c

diff --git a/init_sec_context.c b/mech_eap/init_sec_context.c
similarity index 100%
rename from init_sec_context.c
rename to mech_eap/init_sec_context.c

diff --git a/inquire_attrs_for_mech.c b/mech_eap/inquire_attrs_for_mech.c
similarity index 100%
rename from inquire_attrs_for_mech.c
rename to mech_eap/inquire_attrs_for_mech.c

diff --git a/inquire_context.c b/mech_eap/inquire_context.c
similarity index 100%
rename from inquire_context.c
rename to mech_eap/inquire_context.c

diff --git a/inquire_cred.c b/mech_eap/inquire_cred.c
similarity index 100%
rename from inquire_cred.c
rename to mech_eap/inquire_cred.c

diff --git a/inquire_cred_by_oid.c b/mech_eap/inquire_cred_by_oid.c
similarity index 100%
rename from inquire_cred_by_oid.c
rename to mech_eap/inquire_cred_by_oid.c

diff --git a/inquire_mech_for_saslname.c b/mech_eap/inquire_mech_for_saslname.c
similarity index 100%
rename from inquire_mech_for_saslname.c
rename to mech_eap/inquire_mech_for_saslname.c

diff --git a/inquire_mechs_for_name.c b/mech_eap/inquire_mechs_for_name.c
similarity index 100%
rename from inquire_mechs_for_name.c
rename to mech_eap/inquire_mechs_for_name.c

diff --git a/inquire_name.c b/mech_eap/inquire_name.c
similarity index 100%
rename from inquire_name.c
rename to mech_eap/inquire_name.c

diff --git a/inquire_names_for_mech.c b/mech_eap/inquire_names_for_mech.c
similarity index 100%
rename from inquire_names_for_mech.c
rename to mech_eap/inquire_names_for_mech.c

diff --git a/inquire_saslname_for_mech.c b/mech_eap/inquire_saslname_for_mech.c
similarity index 100%
rename from inquire_saslname_for_mech.c
rename to mech_eap/inquire_saslname_for_mech.c

diff --git a/inquire_sec_context_by_oid.c b/mech_eap/inquire_sec_context_by_oid.c
similarity index 100%
rename from inquire_sec_context_by_oid.c
rename to mech_eap/inquire_sec_context_by_oid.c

diff --git a/install-sh b/mech_eap/install-sh
similarity index 100%
rename from install-sh
rename to mech_eap/install-sh

diff --git a/map_name_to_any.c b/mech_eap/map_name_to_any.c
similarity index 100%
rename from map_name_to_any.c
rename to mech_eap/map_name_to_any.c

diff --git a/mech b/mech_eap/mech
similarity index 100%
rename from mech
rename to mech_eap/mech

diff --git a/mech_eap.exports b/mech_eap/mech_eap.exports
similarity index 100%
rename from mech_eap.exports
rename to mech_eap/mech_eap.exports

diff --git a/mech_invoke.c b/mech_eap/mech_invoke.c
similarity index 100%
rename from mech_invoke.c
rename to mech_eap/mech_invoke.c

diff --git a/process_context_token.c b/mech_eap/process_context_token.c
similarity index 100%
rename from process_context_token.c
rename to mech_eap/process_context_token.c

diff --git a/pseudo_random.c b/mech_eap/pseudo_random.c
similarity index 100%
rename from pseudo_random.c
rename to mech_eap/pseudo_random.c

diff --git a/radius_ad.exports b/mech_eap/radius_ad.exports
similarity index 100%
rename from radius_ad.exports
rename to mech_eap/radius_ad.exports

diff --git a/radsec.conf b/mech_eap/radsec.conf
similarity index 100%
rename from radsec.conf
rename to mech_eap/radsec.conf

diff --git a/radsec_err.et b/mech_eap/radsec_err.et
similarity index 100%
rename from radsec_err.et
rename to mech_eap/radsec_err.et

diff --git a/release_any_name_mapping.c b/mech_eap/release_any_name_mapping.c
similarity index 100%
rename from release_any_name_mapping.c
rename to mech_eap/release_any_name_mapping.c

diff --git a/release_cred.c b/mech_eap/release_cred.c
similarity index 100%
rename from release_cred.c
rename to mech_eap/release_cred.c

diff --git a/release_name.c b/mech_eap/release_name.c
similarity index 100%
rename from release_name.c
rename to mech_eap/release_name.c

diff --git a/release_oid.c b/mech_eap/release_oid.c
similarity index 100%
rename from release_oid.c
rename to mech_eap/release_oid.c

diff --git a/set_cred_option.c b/mech_eap/set_cred_option.c
similarity index 100%
rename from set_cred_option.c
rename to mech_eap/set_cred_option.c

diff --git a/set_name_attribute.c b/mech_eap/set_name_attribute.c
similarity index 100%
rename from set_name_attribute.c
rename to mech_eap/set_name_attribute.c

diff --git a/set_sec_context_option.c b/mech_eap/set_sec_context_option.c
similarity index 100%
rename from set_sec_context_option.c
rename to mech_eap/set_sec_context_option.c

diff --git a/store_cred.c b/mech_eap/store_cred.c
similarity index 100%
rename from store_cred.c
rename to mech_eap/store_cred.c

diff --git a/unwrap.c b/mech_eap/unwrap.c
similarity index 100%
rename from unwrap.c
rename to mech_eap/unwrap.c

diff --git a/unwrap_iov.c b/mech_eap/unwrap_iov.c
similarity index 100%
rename from unwrap_iov.c
rename to mech_eap/unwrap_iov.c

diff --git a/userok.c b/mech_eap/userok.c
similarity index 100%
rename from userok.c
rename to mech_eap/userok.c

diff --git a/util.h b/mech_eap/util.h
similarity index 100%
rename from util.h
rename to mech_eap/util.h

diff --git a/util_adshim.c b/mech_eap/util_adshim.c
similarity index 100%
rename from util_adshim.c
rename to mech_eap/util_adshim.c

diff --git a/util_attr.cpp b/mech_eap/util_attr.cpp
similarity index 100%
rename from util_attr.cpp
rename to mech_eap/util_attr.cpp

diff --git a/util_attr.h b/mech_eap/util_attr.h
similarity index 100%
rename from util_attr.h
rename to mech_eap/util_attr.h

diff --git a/util_base64.c b/mech_eap/util_base64.c
similarity index 100%
rename from util_base64.c
rename to mech_eap/util_base64.c

diff --git a/util_base64.h b/mech_eap/util_base64.h
similarity index 100%
rename from util_base64.h
rename to mech_eap/util_base64.h

diff --git a/util_buffer.c b/mech_eap/util_buffer.c
similarity index 100%
rename from util_buffer.c
rename to mech_eap/util_buffer.c

diff --git a/util_cksum.c b/mech_eap/util_cksum.c
similarity index 100%
rename from util_cksum.c
rename to mech_eap/util_cksum.c

diff --git a/util_context.c b/mech_eap/util_context.c
similarity index 100%
rename from util_context.c
rename to mech_eap/util_context.c

diff --git a/util_cred.c b/mech_eap/util_cred.c
similarity index 100%
rename from util_cred.c
rename to mech_eap/util_cred.c

diff --git a/util_crypt.c b/mech_eap/util_crypt.c
similarity index 100%
rename from util_crypt.c
rename to mech_eap/util_crypt.c

diff --git a/util_json.cpp b/mech_eap/util_json.cpp
similarity index 100%
rename from util_json.cpp
rename to mech_eap/util_json.cpp

diff --git a/util_json.h b/mech_eap/util_json.h
similarity index 100%
rename from util_json.h
rename to mech_eap/util_json.h

diff --git a/util_krb.c b/mech_eap/util_krb.c
similarity index 100%
rename from util_krb.c
rename to mech_eap/util_krb.c

diff --git a/util_lucid.c b/mech_eap/util_lucid.c
similarity index 100%
rename from util_lucid.c
rename to mech_eap/util_lucid.c

diff --git a/util_mech.c b/mech_eap/util_mech.c
similarity index 100%
rename from util_mech.c
rename to mech_eap/util_mech.c

diff --git a/util_name.c b/mech_eap/util_name.c
similarity index 100%
rename from util_name.c
rename to mech_eap/util_name.c

diff --git a/util_oid.c b/mech_eap/util_oid.c
similarity index 100%
rename from util_oid.c
rename to mech_eap/util_oid.c

diff --git a/util_ordering.c b/mech_eap/util_ordering.c
similarity index 100%
rename from util_ordering.c
rename to mech_eap/util_ordering.c

diff --git a/util_radius.cpp b/mech_eap/util_radius.cpp
similarity index 100%
rename from util_radius.cpp
rename to mech_eap/util_radius.cpp

diff --git a/util_radius.h b/mech_eap/util_radius.h
similarity index 100%
rename from util_radius.h
rename to mech_eap/util_radius.h

diff --git a/util_reauth.c b/mech_eap/util_reauth.c
similarity index 100%
rename from util_reauth.c
rename to mech_eap/util_reauth.c

diff --git a/util_reauth.h b/mech_eap/util_reauth.h
similarity index 100%
rename from util_reauth.h
rename to mech_eap/util_reauth.h

diff --git a/util_saml.cpp b/mech_eap/util_saml.cpp
similarity index 100%
rename from util_saml.cpp
rename to mech_eap/util_saml.cpp

diff --git a/util_saml.h b/mech_eap/util_saml.h
similarity index 100%
rename from util_saml.h
rename to mech_eap/util_saml.h

diff --git a/util_shib.cpp b/mech_eap/util_shib.cpp
similarity index 100%
rename from util_shib.cpp
rename to mech_eap/util_shib.cpp

diff --git a/util_shib.h b/mech_eap/util_shib.h
similarity index 100%
rename from util_shib.h
rename to mech_eap/util_shib.h

diff --git a/util_sm.c b/mech_eap/util_sm.c
similarity index 100%
rename from util_sm.c
rename to mech_eap/util_sm.c

diff --git a/util_token.c b/mech_eap/util_token.c
similarity index 100%
rename from util_token.c
rename to mech_eap/util_token.c

diff --git a/verify_mic.c b/mech_eap/verify_mic.c
similarity index 100%
rename from verify_mic.c
rename to mech_eap/verify_mic.c

diff --git a/wrap.c b/mech_eap/wrap.c
similarity index 100%
rename from wrap.c
rename to mech_eap/wrap.c

diff --git a/wrap_iov.c b/mech_eap/wrap_iov.c
similarity index 100%
rename from wrap_iov.c
rename to mech_eap/wrap_iov.c

diff --git a/wrap_iov_length.c b/mech_eap/wrap_iov_length.c
similarity index 100%
rename from wrap_iov_length.c
rename to mech_eap/wrap_iov_length.c

diff --git a/wrap_size_limit.c b/mech_eap/wrap_size_limit.c
similarity index 100%
rename from wrap_size_limit.c
rename to mech_eap/wrap_size_limit.c