more cleanup on TLV

diff --git a/accept_sec_context.c b/accept_sec_context.c
index ea7c50f..725ce69 100644 (file)
--- a/accept_sec_context.c
+++ b/accept_sec_context.c
@@ -624,28 +624,44 @@ eapGssSmAcceptReauthCreds(OM_uint32 *minor,
 #endif
 
 static OM_uint32
-eapGssSmAcceptCompleteExts(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)
+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)
 {
     *minor = 0;
 
-    if (ctx->state == GSSEAP_STATE_INITIATOR_EXTS) {
-        *smFlags |= SM_FLAG_TRANSITION | SM_FLAG_STOP_EVAL;
-        return GSS_S_CONTINUE_NEEDED;
-    } else {
-        ctx->state = GSSEAP_STATE_ESTABLISHED;
-        *smFlags |= SM_FLAG_STOP_EVAL;
-        return GSS_S_COMPLETE;
-    }
+    *smFlags |= SM_FLAG_TRANSITION | SM_FLAG_STOP_EVAL;
+
+    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,
+                                   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)
+{
+    *minor = 0;
+
+    ctx->state = GSSEAP_STATE_ESTABLISHED;
+    *smFlags |= SM_FLAG_STOP_EVAL;
+
+    return GSS_S_COMPLETE;
 }
 
 static struct gss_eap_sm eapGssAcceptorSm[] = {
@@ -684,7 +700,7 @@ static struct gss_eap_sm eapGssAcceptorSm[] = {
         ITOK_TYPE_NONE,
         GSSEAP_STATE_INITIATOR_EXTS,
         0,
-        eapGssSmAcceptCompleteExts,
+        eapGssSmAcceptCompleteInitiatorExts,
     },
 #ifdef GSSEAP_ENABLE_REAUTH
     {
@@ -700,7 +716,7 @@ static struct gss_eap_sm eapGssAcceptorSm[] = {
         ITOK_TYPE_NONE,
         GSSEAP_STATE_ACCEPTOR_EXTS,
         0,
-        eapGssSmAcceptCompleteExts
+        eapGssSmAcceptCompleteAcceptorExts
     },
 };
 

diff --git a/init_sec_context.c b/init_sec_context.c
index c565625..fea1ea7 100644 (file)
--- a/init_sec_context.c
+++ b/init_sec_context.c
@@ -706,28 +706,44 @@ eapGssSmInitReauthCreds(OM_uint32 *minor,
 #endif /* GSSEAP_ENABLE_REAUTH */
 
 static OM_uint32
-eapGssSmInitCompleteExts(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)
+eapGssSmInitCompleteInitiatorExts(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)
 {
     *minor = 0;
 
-    if (ctx->state == GSSEAP_STATE_INITIATOR_EXTS) {
-        *smFlags |= SM_FLAG_TRANSITION | SM_FLAG_STOP_EVAL;
-        return GSS_S_CONTINUE_NEEDED;
-    } else {
-        ctx->state = GSSEAP_STATE_ESTABLISHED;
-        *smFlags |= SM_FLAG_STOP_EVAL;
-        return GSS_S_COMPLETE;
-    }
+    *smFlags |= SM_FLAG_TRANSITION | SM_FLAG_STOP_EVAL;
+
+    return GSS_S_CONTINUE_NEEDED;
+}
+
+static OM_uint32
+eapGssSmInitCompleteAcceptorExts(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)
+{
+    *minor = 0;
+
+    ctx->state = GSSEAP_STATE_ESTABLISHED;
+    *smFlags |= SM_FLAG_STOP_EVAL;
+
+    return GSS_S_COMPLETE;
 }
 
 static struct gss_eap_sm eapGssInitiatorSm[] = {
@@ -782,7 +798,7 @@ static struct gss_eap_sm eapGssInitiatorSm[] = {
         ITOK_TYPE_NONE,
         GSSEAP_STATE_INITIATOR_EXTS,
         0,
-        eapGssSmInitCompleteExts
+        eapGssSmInitCompleteInitiatorExts
     },
 #ifdef GSSEAP_ENABLE_REAUTH
     {
@@ -799,7 +815,7 @@ static struct gss_eap_sm eapGssInitiatorSm[] = {
         ITOK_TYPE_NONE,
         GSSEAP_STATE_ACCEPTOR_EXTS,
         0,
-        eapGssSmInitCompleteExts
+        eapGssSmInitCompleteAcceptorExts
     }
 };