more TLV cleanups

[mech_eap.orig] / accept_sec_context.c

diff --git a/accept_sec_context.c b/accept_sec_context.c
index 8b6acf0..5b3d53f 100644 (file)
--- a/accept_sec_context.c
+++ b/accept_sec_context.c
@@ -179,8 +179,9 @@ eapGssSmAcceptIdentity(OM_uint32 *minor,
 
     wpabuf_free(reqData);
 
+    GSSEAP_SM_TRANSITION_NEXT(ctx);
+
     *minor = 0;
-    *smFlags |= SM_FLAG_TRANSITION;
 
     return GSS_S_CONTINUE_NEEDED;
 }
@@ -538,7 +539,7 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor,
         if (GSS_ERROR(major))
             goto cleanup;
 
-        *smFlags |= SM_FLAG_TRANSITION;
+        GSSEAP_SM_TRANSITION_NEXT(ctx);
     }
 
     major = GSS_S_CONTINUE_NEEDED;
@@ -595,24 +596,6 @@ eapGssSmAcceptGssChannelBindings(OM_uint32 *minor,
     return major;
 }
 
-static OM_uint32
-eapGssSmAcceptCompleteInitiatorExts(OM_uint32 *minor,
-                                    gss_cred_id_t cred,
-                                    gss_ctx_id_t ctx,
-                                    gss_name_t target __attribute__((__unused__)),
-                                    gss_OID mech __attribute__((__unused__)),
-                                    OM_uint32 reqFlags __attribute__((__unused__)),
-                                    OM_uint32 timeReq __attribute__((__unused__)),
-                                    gss_channel_bindings_t chanBindings __attribute__((__unused__)),
-                                    gss_buffer_t inputToken,
-                                    gss_buffer_t outputToken,
-                                    OM_uint32 *smFlags)
-{
-    *minor = 0;
-    *smFlags |= SM_FLAG_TRANSITION | SM_FLAG_STOP_EVAL;
-    return GSS_S_CONTINUE_NEEDED;
-}
-
 #ifdef GSSEAP_ENABLE_REAUTH
 static OM_uint32
 eapGssSmAcceptReauthCreds(OM_uint32 *minor,
@@ -642,20 +625,43 @@ eapGssSmAcceptReauthCreds(OM_uint32 *minor,
 #endif
 
 static OM_uint32
+eapGssSmAcceptCompleteInitiatorExts(OM_uint32 *minor,
+                                    gss_cred_id_t cred,
+                                    gss_ctx_id_t ctx,
+                                    gss_name_t target,
+                                    gss_OID mech,
+                                    OM_uint32 reqFlags,
+                                    OM_uint32 timeReq,
+                                    gss_channel_bindings_t chanBindings,
+                                    gss_buffer_t inputToken,
+                                    gss_buffer_t outputToken,
+                                    OM_uint32 *smFlags)
+{
+    GSSEAP_SM_TRANSITION_NEXT(ctx);
+
+    *minor = 0;
+
+    return GSS_S_CONTINUE_NEEDED;
+}
+
+static OM_uint32
 eapGssSmAcceptCompleteAcceptorExts(OM_uint32 *minor,
                                    gss_cred_id_t cred,
                                    gss_ctx_id_t ctx,
-                                   gss_name_t target __attribute__((__unused__)),
-                                   gss_OID mech __attribute__((__unused__)),
-                                   OM_uint32 reqFlags __attribute__((__unused__)),
-                                   OM_uint32 timeReq __attribute__((__unused__)),
-                                   gss_channel_bindings_t chanBindings __attribute__((__unused__)),
+                                   gss_name_t target,
+                                   gss_OID mech,
+                                   OM_uint32 reqFlags,
+                                   OM_uint32 timeReq,
+                                   gss_channel_bindings_t chanBindings,
                                    gss_buffer_t inputToken,
                                    gss_buffer_t outputToken,
                                    OM_uint32 *smFlags)
 {
+    GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_ESTABLISHED);
+
     *minor = 0;
-    *smFlags |= SM_FLAG_TRANSITION | SM_FLAG_STOP_EVAL;
+    *smFlags |= SM_FLAG_FORCE_SEND_TOKEN;
+
     return GSS_S_COMPLETE;
 }
 
@@ -665,8 +671,7 @@ static struct gss_eap_sm eapGssAcceptorSm[] = {
         ITOK_TYPE_REAUTH_REQ,
         ITOK_TYPE_REAUTH_RESP,
         GSSEAP_STATE_INITIAL,
-        0, /* critical */
-        0, /* required */
+        0,
         eapGssSmAcceptGssReauth,
     },
 #endif
@@ -674,32 +679,28 @@ static struct gss_eap_sm eapGssAcceptorSm[] = {
         ITOK_TYPE_NONE,
         ITOK_TYPE_EAP_REQ,
         GSSEAP_STATE_INITIAL,
-        1, /* critical */
-        1, /* required */
+        SM_ITOK_FLAG_CRITICAL | SM_ITOK_FLAG_REQUIRED,
         eapGssSmAcceptIdentity,
     },
     {
         ITOK_TYPE_EAP_RESP,
         ITOK_TYPE_EAP_REQ,
         GSSEAP_STATE_AUTHENTICATE,
-        1, /* critical */
-        1, /* required */
+        SM_ITOK_FLAG_CRITICAL | SM_ITOK_FLAG_REQUIRED,
         eapGssSmAcceptAuthenticate
     },
     {
         ITOK_TYPE_GSS_CHANNEL_BINDINGS,
         ITOK_TYPE_NONE,
         GSSEAP_STATE_INITIATOR_EXTS,
-        1, /* critical */
-        1, /* required */
+        SM_ITOK_FLAG_CRITICAL | SM_ITOK_FLAG_REQUIRED,
         eapGssSmAcceptGssChannelBindings,
     },
     {
         ITOK_TYPE_NONE,
         ITOK_TYPE_NONE,
         GSSEAP_STATE_INITIATOR_EXTS,
-        1, /* critical */
-        1, /* required */
+        0,
         eapGssSmAcceptCompleteInitiatorExts,
     },
 #ifdef GSSEAP_ENABLE_REAUTH
@@ -707,8 +708,7 @@ static struct gss_eap_sm eapGssAcceptorSm[] = {
         ITOK_TYPE_NONE,
         ITOK_TYPE_REAUTH_CREDS,
         GSSEAP_STATE_ACCEPTOR_EXTS,
-        0, /* critical */
-        0, /* required */
+        0,
         eapGssSmAcceptReauthCreds,
     },
 #endif
@@ -716,8 +716,7 @@ static struct gss_eap_sm eapGssAcceptorSm[] = {
         ITOK_TYPE_NONE,
         ITOK_TYPE_NONE,
         GSSEAP_STATE_ACCEPTOR_EXTS,
-        1, /* critical */
-        1, /* required */
+        0,
         eapGssSmAcceptCompleteAcceptorExts
     },
 };
@@ -901,8 +900,7 @@ eapGssSmAcceptGssReauth(OM_uint32 *minor,
         major = acceptReadyKrb(minor, ctx, cred,
                                krbInitiator, mech, timeRec);
         if (major == GSS_S_COMPLETE) {
-            ctx->state = GSSEAP_STATE_ACCEPTOR_EXTS;
-            *smFlags |= SM_FLAG_TRANSITION | SM_FLAG_STOP_EVAL;
+            GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_ESTABLISHED);
         }
     }