make reauth support conditionaly compilable

[mech_eap.git] / export_sec_context.c

diff --git a/export_sec_context.c b/export_sec_context.c
index 7f57fc9..f0d0c75 100644 (file)
--- a/export_sec_context.c
+++ b/export_sec_context.c
@@ -37,13 +37,8 @@ gssEapExportPartialContext(OM_uint32 *minor,
                            gss_ctx_id_t ctx,
                            gss_buffer_t token)
 {
-    token->length = 0;
-    token->value = NULL;
-
-    /*
-     * The format of this token awaits definition by libradsec.
-     */
-    return GSS_S_COMPLETE;
+    /* XXX we also need to serialise the current server name */
+    return duplicateBuffer(minor, &ctx->acceptorCtx.state, token);
 }
 
 static OM_uint32
@@ -53,19 +48,12 @@ gssEapExportSecContext(OM_uint32 *minor,
 {
     OM_uint32 major, tmpMinor;
     size_t length;
-    gss_buffer_desc initiatorName, acceptorName;
-    gss_buffer_desc partialCtx, key;
+    gss_buffer_desc initiatorName = GSS_C_EMPTY_BUFFER;
+    gss_buffer_desc acceptorName = GSS_C_EMPTY_BUFFER;
+    gss_buffer_desc partialCtx = GSS_C_EMPTY_BUFFER;
+    gss_buffer_desc key;
     unsigned char *p;
 
-    initiatorName.length = 0;
-    initiatorName.value = NULL;
-
-    acceptorName.length = 0;
-    acceptorName.value = NULL;
-
-    partialCtx.length = 0;
-    partialCtx.value = NULL;
-
     if ((CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx)) ||
         ctx->mechanismUsed == GSS_C_NO_OID)
         return GSS_S_NO_CONTEXT;
@@ -74,12 +62,16 @@ gssEapExportSecContext(OM_uint32 *minor,
     key.value  = KRB_KEY_DATA(&ctx->rfc3961Key);
 
     if (ctx->initiatorName != GSS_C_NO_NAME) {
-        major = gssEapExportName(minor, ctx->initiatorName, &initiatorName, TRUE);
+        major = gssEapExportNameInternal(minor, ctx->initiatorName,
+                                         &initiatorName,
+                                         EXPORT_NAME_FLAG_COMPOSITE);
         if (GSS_ERROR(major))
             goto cleanup;
     }
     if (ctx->acceptorName != GSS_C_NO_NAME) {
-        major = gssEapExportName(minor, ctx->acceptorName, &acceptorName, TRUE);
+        major = gssEapExportNameInternal(minor, ctx->acceptorName,
+                                         &acceptorName,
+                                         EXPORT_NAME_FLAG_COMPOSITE);
         if (GSS_ERROR(major))
             goto cleanup;
     }
@@ -89,6 +81,8 @@ gssEapExportSecContext(OM_uint32 *minor,
      * contexts.
      */
     if (!CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx)) {
+        assert((ctx->flags & CTX_FLAG_KRB_REAUTH_GSS) == 0);
+
         major = gssEapExportPartialContext(minor, ctx, &partialCtx);
         if (GSS_ERROR(major))
             goto cleanup;
@@ -96,7 +90,7 @@ gssEapExportSecContext(OM_uint32 *minor,
 
     length  = 16;                               /* version, state, flags, etc */
     length += 4 + ctx->mechanismUsed->length;   /* mechanismUsed */
-    length += 8 + key.length;                   /* rfc3961Key.value */
+    length += 12 + key.length;                  /* rfc3961Key.value */
     length += 4 + initiatorName.length;         /* initiatorName.value */
     length += 4 + acceptorName.length;          /* acceptorName.value */
     length += 24 + sequenceSize(ctx->seqState); /* seqState */
@@ -120,8 +114,9 @@ gssEapExportSecContext(OM_uint32 *minor,
     store_uint32_be(ctx->gssFlags,         &p[12]);
     p = store_oid(ctx->mechanismUsed,      &p[16]);
 
-    store_uint32_be(ctx->encryptionType,   &p[0]);
-    p = store_buffer(&key,                 &p[4], FALSE);
+    store_uint32_be(ctx->checksumType,     &p[0]);
+    store_uint32_be(ctx->encryptionType,   &p[4]);
+    p = store_buffer(&key,                 &p[8], FALSE);
 
     p = store_buffer(&initiatorName,       p, FALSE);
     p = store_buffer(&acceptorName,        p, FALSE);
@@ -130,7 +125,10 @@ gssEapExportSecContext(OM_uint32 *minor,
     store_uint64_be(ctx->sendSeq,          &p[8]);
     store_uint64_be(ctx->recvSeq,          &p[16]);
     p += 24;
-    sequenceExternalize(ctx->seqState,     &p, &length);
+
+    major = sequenceExternalize(minor, ctx->seqState, &p, &length);
+    if (GSS_ERROR(major))
+        goto cleanup;
 
     if (partialCtx.value != NULL)
         p = store_buffer(&partialCtx, p, FALSE);
@@ -158,6 +156,9 @@ gss_export_sec_context(OM_uint32 *minor,
     OM_uint32 major, tmpMinor;
     gss_ctx_id_t ctx = *context_handle;
 
+    interprocess_token->length = 0;
+    interprocess_token->value = NULL;
+
     if (ctx == GSS_C_NO_CONTEXT)
         return GSS_S_NO_CONTEXT;