Merge branch 'master' into tlv-mic

diff --cc moonshot/mech_eap/accept_sec_context.c
Simple merge

diff --cc moonshot/mech_eap/init_sec_context.c
Simple merge

diff --cc moonshot/mech_eap/mech_eap.exports
index 767caeb,14ece92..7b4f0ea
--- 1/moonshot/mech_eap/mech_eap.exports
--- 2/moonshot/mech_eap/mech_eap.exports
+++ b/moonshot/mech_eap/mech_eap.exports
@@@ -1,8 -1,8 +1,9 @@@
  gss_accept_sec_context
  gss_acquire_cred
+ gss_acquire_cred_ext
  gss_add_cred
  gss_add_cred_with_password
 +gss_authorize_localname
  gss_canonicalize_name
  gss_compare_name
  gss_context_time

diff --cc moonshot/mech_eap/util.h
index e5376a6,883eabf..c5d5762
--- 1/moonshot/mech_eap/util.h
--- 2/moonshot/mech_eap/util.h
+++ b/moonshot/mech_eap/util.h
@@@ -203,28 -187,27 +203,30 @@@ OM_uint32 gssEapAllocContext(OM_uint32 
  OM_uint32 gssEapReleaseContext(OM_uint32 *minor, gss_ctx_id_t *pCtx);
  
  OM_uint32
 -gssEapMakeToken(OM_uint32 *minor,
 -                gss_ctx_id_t ctx,
 -                const gss_buffer_t innerToken,
 -                enum gss_eap_token_type tokenType,
 -                gss_buffer_t outputToken);
 +gssEapContextTime(OM_uint32 *minor,
 +                  gss_ctx_id_t context_handle,
 +                  OM_uint32 *time_rec);
  
  OM_uint32
 -gssEapVerifyToken(OM_uint32 *minor,
 -                  gss_ctx_id_t ctx,
 -                  const gss_buffer_t inputToken,
 -                  enum gss_eap_token_type *tokenType,
 -                  gss_buffer_t innerInputToken);
 +gssEapGetConversationMIC(OM_uint32 *minor,
 +                         gss_ctx_id_t ctx,
 +                         gss_buffer_t convMIC);
  
  OM_uint32
 -gssEapContextTime(OM_uint32 *minor,
 -                  gss_ctx_id_t context_handle,
 -                  OM_uint32 *time_rec);
 +gssEapVerifyConversationMIC(OM_uint32 *minor,
 +                            gss_ctx_id_t ctx,
 +                            const gss_buffer_t convMIC);
 +
 +OM_uint32
 +gssEapMakeTokenChannelBindings(OM_uint32 *minor,
 +                               gss_ctx_id_t ctx,
 +                               gss_channel_bindings_t userBindings,
 +                               gss_buffer_t inputToken,
 +                               gss_channel_bindings_t wireBindings);
  
  /* util_cred.c */
+ extern const gss_OID_desc gssEapPasswordCredType;
+ 
  OM_uint32 gssEapAllocCred(OM_uint32 *minor, gss_cred_id_t *pCred);
  OM_uint32 gssEapReleaseCred(OM_uint32 *minor, gss_cred_id_t *pCred);