Merge branch 'master' into tlv-mic

diff --cc mech_eap/accept_sec_context.c
index 081cca8,cc8702d..17d1020
--- 1/mech_eap/accept_sec_context.c
--- 2/mech_eap/accept_sec_context.c
+++ b/mech_eap/accept_sec_context.c
@@@ -1083,25 -970,11 +1083,25 @@@ eapGssSmAcceptGssReauth(OM_uint32 *mino
  
      ctx->flags |= CTX_FLAG_KRB_REAUTH;
  
 +    /*
 +     * To avoid an additional round trip, we use GSS channel bindings
 +     * to integrity protect the rest of the initiator exchange. This
 +     * does have the disadvantage of making it impossible for the
 +     * acceptor to ignore application channel bindings, behaviour
 +     * which differs from normal Kerberos and GSS-EAP itself.
 +     */
 +    major = gssEapMakeTokenChannelBindings(minor, ctx,
 +                                           userChanBindings,
 +                                           inputToken,
 +                                           &wireChanBindings);
 +    if (GSS_ERROR(major))
 +        return major;
 +
      major = gssAcceptSecContext(minor,
                                  &ctx->reauthCtx,
-                                 cred->krbCred,
+                                 cred->reauthCred,
                                  inputToken,
 -                                chanBindings,
 +                                &wireChanBindings,
                                  &krbInitiator,
                                  &mech,
                                  outputToken,

diff --cc mech_eap/gssapiP_eap.h
Simple merge

diff --cc mech_eap/init_sec_context.c
Simple merge