From: Dan Breslau <dbreslau@painless-security.com>
Date: Wed, 2 Aug 2017 02:00:19 +0000 (+0000)
Subject: Fixes for building on Centos 7
X-Git-Tag: moonshot-1.0.6-centos6~2
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=commitdiff_plain;h=07a9c3dbfa720f449674bba6f137b6895992c902

Fixes for building on Centos 7
---

diff --git a/libeap/Makefile.am b/libeap/Makefile.am
index 2fab89c..38d285c 100755
--- a/libeap/Makefile.am
+++ b/libeap/Makefile.am
@@ -103,6 +103,7 @@ UTILS_SRCS = src/utils/base64.c \
 	src/utils/common.c \
 	src/utils/eloop.c \
 	src/utils/eloop.h \
+	src/utils/ext_password.h \
 	src/utils/ip_addr.c \
 	src/utils/radiotap.c \
 	src/utils/trace.c \
@@ -121,6 +122,7 @@ UTILS_SRCS = src/utils/base64.c \
 	src/utils/list.h \
 	src/utils/os.h \
 	src/utils/pcsc_funcs.h \
+	src/utils/platform.h \
 	src/utils/radiotap.h \
 	src/utils/radiotap_iter.h \
 	src/utils/state_machine.h \
@@ -154,8 +156,10 @@ CRYPTO_SRCS = \
     src/crypto/random.h \
     src/crypto/sha1.h \
     src/crypto/sha256.h \
+    src/crypto/sha384.h \
 	src/crypto/sha256-tlsprf.c \
-    src/crypto/tls.h
+    src/crypto/tls.h \
+    src/crypto/tls_openssl.h
 
 
 #TLS_SRCS = \
diff --git a/mech_eap/Makefile.am b/mech_eap/Makefile.am
index 02dd9f2..57b7b3a 100644
--- a/mech_eap/Makefile.am
+++ b/mech_eap/Makefile.am
@@ -119,6 +119,7 @@ mech_eap_la_SOURCES =    			\
 	wrap_iov.c				\
 	wrap_iov_length.c			\
 	wrap_size_limit.c \
+	gssapi_headerfix.h \
 	gssapiP_eap.h \
 	util_attr.h \
 	util_base64.h \
diff --git a/mech_eap/init_sec_context.c b/mech_eap/init_sec_context.c
index 7a2fb46..89faf49 100644
--- a/mech_eap/init_sec_context.c
+++ b/mech_eap/init_sec_context.c
@@ -762,7 +762,7 @@ eapGssSmInitGssReauth(OM_uint32 *minor,
      * context credential does not currently have the reauth creds.
      */
     if (GSSEAP_SM_STATE(ctx) == GSSEAP_STATE_INITIAL) {
-        if (!gssEapCanReauthP(cred, target, timeReq))
+      if (!gssEapCanReauthP(cred, (gss_name_t) target, timeReq))
             return GSS_S_CONTINUE_NEEDED;
 
         ctx->flags |= CTX_FLAG_KRB_REAUTH;
@@ -774,7 +774,7 @@ eapGssSmInitGssReauth(OM_uint32 *minor,
 
     GSSEAP_ASSERT(cred != GSS_C_NO_CREDENTIAL);
 
-    major = gssEapMechToGlueName(minor, target, &mechTarget);
+    major = gssEapMechToGlueName(minor, (gss_name_t) target, &mechTarget);
     if (GSS_ERROR(major))
         goto cleanup;