From: Luke Howard <lukeh@padl.com>
Date: Thu, 21 Apr 2011 18:22:45 +0000 (+0200)
Subject: Merge branch 'master' into tlv-mic
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=bc115ffb6fea5399341faa59ad92a7e1cc722e8f;hp=aecb56c6daec43ff20d2e5b170c53c3b3e7b9d10

Merge branch 'master' into tlv-mic

Conflicts:
	mech_eap/accept_sec_context.c
---

diff --git a/mech_eap/accept_sec_context.c b/mech_eap/accept_sec_context.c
index e73958e..081cca8 100644
--- a/mech_eap/accept_sec_context.c
+++ b/mech_eap/accept_sec_context.c
@@ -1098,7 +1098,7 @@ eapGssSmAcceptGssReauth(OM_uint32 *minor,
         return major;
 
     major = gssAcceptSecContext(minor,
-                                &ctx->kerberosCtx,
+                                &ctx->reauthCtx,
                                 cred->krbCred,
                                 inputToken,
                                 &wireChanBindings,
@@ -1119,7 +1119,7 @@ eapGssSmAcceptGssReauth(OM_uint32 *minor,
     } else if (GSS_ERROR(major) &&
         (*smFlags & SM_FLAG_INPUT_TOKEN_CRITICAL) == 0) {
         /* Fall back to EAP */
-        gssDeleteSecContext(&tmpMinor, &ctx->kerberosCtx, GSS_C_NO_BUFFER);
+        gssDeleteSecContext(&tmpMinor, &ctx->reauthCtx, GSS_C_NO_BUFFER);
         ctx->flags &= ~(CTX_FLAG_KRB_REAUTH);
         GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_INITIAL);
     } else {
diff --git a/mech_eap/gssapiP_eap.h b/mech_eap/gssapiP_eap.h
index 7cf31cf..83c1577 100644
--- a/mech_eap/gssapiP_eap.h
+++ b/mech_eap/gssapiP_eap.h
@@ -202,8 +202,8 @@ struct gss_ctx_id_struct
         struct gss_eap_acceptor_ctx  acceptor;
         #define acceptorCtx          ctxU.acceptor
 #ifdef GSSEAP_ENABLE_REAUTH
-        gss_ctx_id_t                 kerberos;
-        #define kerberosCtx          ctxU.kerberos
+        gss_ctx_id_t                 reauth;
+        #define reauthCtx            ctxU.reauth
 #endif
     } ctxU;
     gss_buffer_desc conversation;
diff --git a/mech_eap/init_sec_context.c b/mech_eap/init_sec_context.c
index 801dd90..886a98d 100644
--- a/mech_eap/init_sec_context.c
+++ b/mech_eap/init_sec_context.c
@@ -486,7 +486,7 @@ eapGssSmInitGssReauth(OM_uint32 *minor,
 
     major = gssInitSecContext(minor,
                               cred->krbCred,
-                              &ctx->kerberosCtx,
+                              &ctx->reauthCtx,
                               mechTarget,
                               (gss_OID)gss_mech_krb5,
                               reqFlags | GSS_C_MUTUAL_FLAG,
@@ -659,7 +659,7 @@ eapGssSmInitIdentity(OM_uint32 *minor,
         OM_uint32 tmpMinor;
 
         /* server didn't support reauthentication, sent EAP request */
-        gssDeleteSecContext(&tmpMinor, &ctx->kerberosCtx, GSS_C_NO_BUFFER);
+        gssDeleteSecContext(&tmpMinor, &ctx->reauthCtx, GSS_C_NO_BUFFER);
         ctx->flags &= ~(CTX_FLAG_KRB_REAUTH);
         GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_INITIAL);
     } else
diff --git a/mech_eap/util_context.c b/mech_eap/util_context.c
index ed6edac..148afed 100644
--- a/mech_eap/util_context.c
+++ b/mech_eap/util_context.c
@@ -115,7 +115,7 @@ gssEapReleaseContext(OM_uint32 *minor,
 
 #ifdef GSSEAP_ENABLE_REAUTH
     if (ctx->flags & CTX_FLAG_KRB_REAUTH) {
-        gssDeleteSecContext(&tmpMinor, &ctx->kerberosCtx, GSS_C_NO_BUFFER);
+        gssDeleteSecContext(&tmpMinor, &ctx->reauthCtx, GSS_C_NO_BUFFER);
     } else
 #endif
     if (CTX_IS_INITIATOR(ctx)) {
diff --git a/mech_eap/util_reauth.c b/mech_eap/util_reauth.c
index 465bb16..6c66570 100644
--- a/mech_eap/util_reauth.c
+++ b/mech_eap/util_reauth.c
@@ -739,7 +739,7 @@ gssEapGlueToMechName(OM_uint32 *minor,
 
     major = defrostAttrContext(minor,
 #ifdef HAVE_HEIMDAL_VERSION
-                               ctx->kerberosCtx,
+                               ctx->reauthCtx,
 #else
                                glueName,
 #endif
@@ -815,11 +815,11 @@ gssEapReauthComplete(OM_uint32 *minor,
     /* Get the raw subsession key and encryption type */
 #ifdef HAVE_HEIMDAL_VERSION
 #define KRB_GSS_SUBKEY_COUNT    1 /* encoded session key */
-    major = gssInquireSecContextByOid(minor, ctx->kerberosCtx,
+    major = gssInquireSecContextByOid(minor, ctx->reauthCtx,
                                       GSS_KRB5_GET_SUBKEY_X, &keyData);
 #else
 #define KRB_GSS_SUBKEY_COUNT    2 /* raw session key, enctype OID */
-    major = gssInquireSecContextByOid(minor, ctx->kerberosCtx,
+    major = gssInquireSecContextByOid(minor, ctx->reauthCtx,
                                       GSS_C_INQ_SSPI_SESSION_KEY, &keyData);
 #endif
     if (GSS_ERROR(major))