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

diff --git a/.gitignore b/.gitignore
index c4992b5..57a94cd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ m4
 !m4/minuso.m4
 build-aux
 !build-aux/compile
+mech_eap.spec
+mech_eap*tar*

diff --git a/Makefile.am b/Makefile.am
index b4ca11c..0165219 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = libeap mech_eap
+EXTRA_DIST = mech_eap.spec

diff --git a/acinclude.m4 b/acinclude.m4
index ea542db..a626e8a 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -25,16 +25,18 @@ for dir in $check_krb5_dir $prefix /usr /usr/local ; do
         KRB5_CFLAGS=-I"$check_krb5_dir/include";
         KRB5_LIBS="-L$check_krb5_dir/lib/ -lkrb5_32 -lgssapi32";
         COMPILE_ET="$check_krb5_dir/bin/compile_et";
+       AC_MSG_RESULT([yes])
      else
         KRB5_CFLAGS=`$dir/bin/krb5-config gssapi --cflags`;
-        KRB5_LIBS=`$dir/bin/krb5-config gssapi --libs`;
-        COMPILE_ET="$dir/bin/compile_et";
+        KRB5_LIBS=`$dir/bin/krb5-config gssapi --libs`
+AC_MSG_RESULT([yes])
+        AC_PATH_PROG(COMPILE_ET, [compile_et], [compile_et], [$dir/bin$PATH_SEPARATOr])
      fi
      break;
    fi
 done
-AC_MSG_RESULT($found_krb5)
 if test x_$found_krb5 != x_yes; then
+   AC_MSG_RESULT($found_krb5)
    AC_MSG_ERROR([
 ----------------------------------------------------------------------
   Cannot find GSS-API/Kerberos libraries.

diff --git a/configure.ac b/configure.ac
index 039ab50..4297345 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,6 @@ AC_CONFIG_AUX_DIR([build-aux])
 
 dnl AM_INIT_AUTOMAKE([silent-rules])
 AC_USE_SYSTEM_EXTENSIONS
-AC_GNU_SOURCE
 AM_INIT_AUTOMAKE
 AM_PROG_CC_C_O
 AM_MAINTAINER_MODE()
@@ -88,5 +87,6 @@ if test "x$acceptor" = "xyes" ; then
 fi
 
 AX_CHECK_LIBMOONSHOT
-AC_CONFIG_FILES([Makefile libeap/Makefile mech_eap/Makefile])
+AC_CONFIG_FILES([Makefile libeap/Makefile mech_eap/Makefile
+                         mech_eap.spec])
 AC_OUTPUT

diff --git a/libeap/Makefile.am b/libeap/Makefile.am
index b735ec8..163e4ff 100644 (file)
--- a/libeap/Makefile.am
+++ b/libeap/Makefile.am
@@ -1,13 +1,41 @@
 AUTOMAKE_OPTIONS = foreign
 
 AM_CPPFLAGS = -I$(srcdir)/src -I$(srcdir)/eap_example -I$(srcdir)/src/utils 
+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/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
@@ -25,7 +53,17 @@ SOURCES_peer += src/eap_peer/eap_gpsk.c
 SOURCES_peer += src/eap_peer/eap.c
 SOURCES_peer += src/eap_common/eap_common.c
 SOURCES_peer += src/eap_peer/eap_methods.c
-SOURCES_peer += src/eap_peer/eap_tls_common.c
+SOURCES_peer += src/eap_peer/eap_tls_common.c \
+       src/eap_peer/eap_config.h \
+       src/eap_peer/eap_fast_pac.h \
+       src/eap_peer/eap.h \
+       src/eap_peer/eap_i.h \
+       src/eap_peer/eap_methods.h \
+       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
@@ -66,7 +104,24 @@ UTILS_SRCS = src/utils/base64.c \
        src/utils/uuid.c \
        src/utils/wpa_debug.c \
        src/utils/wpabuf.c \
-       src/utils/os_unix.c
+       src/utils/os_unix.c \
+       src/utils/base64.h \
+       src/utils/build_config.h \
+       src/utils/common.h \
+       src/utils/eloop.h \
+       src/utils/includes.h \
+       src/utils/ip_addr.h \
+       src/utils/list.h \
+       src/utils/os.h \
+       src/utils/pcsc_funcs.h \
+       src/utils/radiotap.h \
+       src/utils/radiotap_iter.h \
+       src/utils/state_machine.h \
+       src/utils/trace.h \
+       src/utils/uuid.h \
+       src/utils/wpabuf.h \
+       src/utils/wpa_debug.h
+
 
 CRYPTO_SRCS = \
     src/crypto/aes-cbc.c \
@@ -101,7 +156,23 @@ CRYPTO_SRCS = \
     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/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
+
 
 TLS_SRCS = \
     src/tls/asn1.c \
@@ -119,7 +190,21 @@ TLS_SRCS = \
     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)
 

diff --git a/mech_eap.spec.in b/mech_eap.spec.in
new file mode 100644 (file)
index 0000000..f6b329f
--- /dev/null
+++ b/mech_eap.spec.in
@@ -0,0 +1,48 @@
+Name:          moonshot-gss-eap
+Version:       @VERSION@
+Release:       1%{?dist}
+Summary:       Moonshot GSS-API Mechanism
+
+Group:         Security Tools
+License:       BSD
+URL:           http://www.project-moonshot.org/
+Source0:       mech_eap-%{version}.tar.gz
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires:  krb5-libs >= 1.9.1
+BuildRequires:  moonshot-ui-devel
+Requires:      moonshot-ui
+
+%description
+Project Moonshot provides federated access management.
+
+
+%prep
+%setup -q -n mech_eap-%{version}
+
+
+%build
+%configure --disable-acceptor --with-libmoonshot=%{_prefix} --with-krb5=%{_prefix}
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc mech_eap/README
+%{_libdir}/gss/mech_eap.so
+%exclude %{_libdir}/gss/mech_eap.la
+%{_includedir}/gssapi/*.h
+
+
+
+
+%changelog

diff --git a/mech_eap/Makefile.am b/mech_eap/Makefile.am
index ba6e8dd..5f78a77 100644 (file)
--- a/mech_eap/Makefile.am
+++ b/mech_eap/Makefile.am
@@ -1,5 +1,8 @@
 AUTOMAKE_OPTIONS = foreign
 
+EXTRA_DIST = gsseap_err.et radsec_err.et \
+       mech_eap.exports mech_eap-noacceptor.exports 
+
 gssincludedir = $(includedir)/gssapi
 gssinclude_HEADERS = gssapi_eap.h
 
@@ -26,11 +29,12 @@ OS_LIBS =
 mech_eap_la_CFLAGS   = -Werror -Wall -Wunused-parameter
 mech_eap_la_CXXFLAGS = -Werror -Wall -Wunused-parameter
 endif
+mech_eap_la_DEPENDENCIES = $(GSSEAP_EXPORTS)
 
 mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\"
-mech_eap_la_CFLAGS   = -Werror -Wall -Wunused-parameter \
+mech_eap_la_CFLAGS   += \
                        @KRB5_CFLAGS@  @RADSEC_CFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
-mech_eap_la_CXXFLAGS = -Werror -Wall -Wunused-parameter \
+mech_eap_la_CXXFLAGS += \
                        @KRB5_CFLAGS@  @RADSEC_CFLAGS@ \
                        @OPENSAML_CXXFLAGS@ @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ \
                        @TARGET_CFLAGS@ $(EAP_CFLAGS)
@@ -73,7 +77,6 @@ mech_eap_la_SOURCES =                         \
        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            \
@@ -107,7 +110,17 @@ mech_eap_la_SOURCES =                      \
        wrap.c                                  \
        wrap_iov.c                              \
        wrap_iov_length.c                       \
-       wrap_size_limit.c
+       wrap_size_limit.c \
+       gssapiP_eap.h \
+       util_attr.h \
+       util_base64.h \
+       util.h \
+       util_json.h \
+       util_radius.h \
+       util_reauth.h \
+       util_saml.h \
+       util_shib.h
+
 
 if GSSEAP_ENABLE_ACCEPTOR
 
@@ -116,6 +129,7 @@ mech_eap_la_SOURCES +=                              \
        delete_name_attribute.c                 \
        export_name_composite.c                 \
        get_name_attribute.c                    \
+       inquire_name.c                          \
        map_name_to_any.c                       \
        release_any_name_mapping.c              \
        set_name_attribute.c                    \
@@ -134,7 +148,7 @@ endif
 
 endif
 
-BUILT_SOURCES = gsseap_err.c radsec_err.c
+BUILT_SOURCES = gsseap_err.c radsec_err.c gsseap_err.h radsec_err.h
 
 if GSSEAP_ENABLE_REAUTH
 mech_eap_la_SOURCES += util_reauth.c
@@ -148,7 +162,7 @@ radius_ad_la_CFLAGS  = -Werror -Wall -Wunused-parameter \
 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
+radius_ad_la_SOURCES = util_adshim.c authdata_plugin.h
 endif
 endif
 

diff --git a/mech_eap/eap_mech.c b/mech_eap/eap_mech.c
index 4821a9c..96e00c2 100644 (file)
--- a/mech_eap/eap_mech.c
+++ b/mech_eap/eap_mech.c
@@ -196,9 +196,9 @@ gssEapInitiatorInit(OM_uint32 *minor)
 void
 gssEapFinalize(void)
 {
+#ifdef GSSEAP_ENABLE_ACCEPTOR
     OM_uint32 minor;
 
-#ifdef GSSEAP_ENABLE_ACCEPTOR
     gssEapAttrProvidersFinalize(&minor);
 #endif
     eap_peer_unregister_methods();