cleanup, refactor TLV code

[mech_eap.git] / gssapiP_eap.h

diff --git a/gssapiP_eap.h b/gssapiP_eap.h
index bcfdf03..71e697c 100644 (file)
--- a/gssapiP_eap.h
+++ b/gssapiP_eap.h
@@ -143,9 +143,10 @@ struct gss_cred_id_struct
 enum gss_eap_state {
     GSSEAP_STATE_INITIAL        = 0x01,     /* initial state */
     GSSEAP_STATE_AUTHENTICATE   = 0x02,     /* exchange EAP messages */
-    GSSEAP_STATE_NEGO_EXT       = 0x04,     /* negotiate extensions */
-    GSSEAP_STATE_ESTABLISHED    = 0x08,     /* context established */
-    GSSEAP_STATE_ALL            = 0x0F
+    GSSEAP_STATE_INITIATOR_EXTS = 0x04,     /* initiator extensions */
+    GSSEAP_STATE_ACCEPTOR_EXTS  = 0x08,     /* acceptor extensions */
+    GSSEAP_STATE_ESTABLISHED    = 0x10,     /* context established */
+    GSSEAP_STATE_ALL            = 0x1F
 };
 
 #define GSSEAP_STATE_NEXT(s)    ((s) << 1)
@@ -155,8 +156,7 @@ struct gss_eap_sm {
     OM_uint32 inputTokenType;
     OM_uint32 outputTokenType;
     enum gss_eap_state validStates;
-    int critical;
-    int required;
+    OM_uint32 itokFlags;
     OM_uint32 (*processToken)(OM_uint32 *,
                               gss_cred_id_t,
                               gss_ctx_id_t,
@@ -166,9 +166,17 @@ struct gss_eap_sm {
                               OM_uint32,
                               gss_channel_bindings_t,
                               gss_buffer_t,
-                              gss_buffer_t);
+                              gss_buffer_t,
+                              OM_uint32 *);
 };
 
+#define SM_FLAG_TRANSITION                  0x00000001  /* transition to next state */
+#define SM_FLAG_FORCE_SEND_TOKEN            0x00000002  /* send token even if empty */
+#define SM_FLAG_STOP_EVAL                   0x00000004  /* no more handlers for this state */
+
+#define SM_ITOK_FLAG_CRITICAL               0x00000001  /* sent tokens marked critical */
+#define SM_ITOK_FLAG_REQUIRED               0x00000002  /* received tokens must be present */
+
 #define CTX_IS_ESTABLISHED(ctx)             ((ctx)->state == GSSEAP_STATE_ESTABLISHED)
 
 /* Initiator context flags */