TOK_TYPE_EXPORT_NAME = 0x0401, /* RFC 2743 exported name */
TOK_TYPE_EXPORT_NAME_COMPOSITE = 0x0402, /* exported composite name */
TOK_TYPE_DELETE_CONTEXT = 0x0405, /* RFC 2743 delete context */
- TOK_TYPE_ESTABLISH_CONTEXT = 0x0601, /* establish context */
+ TOK_TYPE_INITIATOR_CONTEXT = 0x0601, /* initiator-sent context token */
+ TOK_TYPE_ACCEPTOR_CONTEXT = 0x0602, /* acceptor-sent context token */
};
/* inner token types and flags */
GSSEAP_STATE_AUTHENTICATE = 0x02, /* exchange EAP messages */
GSSEAP_STATE_INITIATOR_EXTS = 0x04, /* initiator extensions */
GSSEAP_STATE_ACCEPTOR_EXTS = 0x08, /* acceptor extensions */
+#ifdef GSSEAP_ENABLE_REAUTH
GSSEAP_STATE_REAUTHENTICATE = 0x10, /* GSS reauthentication messages */
+#endif
GSSEAP_STATE_ESTABLISHED = 0x20, /* context established */
GSSEAP_STATE_ALL = 0x3F
};
void gssEapSmTransition(gss_ctx_id_t ctx, enum gss_eap_state state);
#define GSSEAP_SM_TRANSITION(ctx, state) gssEapSmTransition((ctx), (state))
#else
-#define GSSEAP_SM_TRANSITION(ctx, state) do { (ctx)->state = (state); } while (0)
+#define GSSEAP_SM_TRANSITION(ctx, newstate) do { (ctx)->state = (newstate); } while (0)
#endif
#define GSSEAP_SM_TRANSITION_NEXT(ctx) GSSEAP_SM_TRANSITION((ctx), GSSEAP_STATE_NEXT(GSSEAP_SM_STATE((ctx))))
};
/* state machine flags, set by handler */
-#define SM_FLAG_FORCE_SEND_TOKEN 0x00000001 /* send token even if empty */
-#define SM_FLAG_STOP_EVAL 0x00000002 /* no more handlers for this state */
-#define SM_FLAG_RESTART 0x00000004 /* restart state machine */
-#define SM_FLAG_OUTPUT_TOKEN_CRITICAL 0x00000008 /* output token is critical */
+#define SM_FLAG_FORCE_SEND_TOKEN 0x00000001 /* send token even if no inner tokens */
+#define SM_FLAG_OUTPUT_TOKEN_CRITICAL 0x00000002 /* output token is critical */
/* state machine flags, set by state machine */
-#define SM_FLAG_INPUT_TOKEN_CRITICAL 0x40000000 /* input token was critical */
+#define SM_FLAG_INPUT_TOKEN_CRITICAL 0x10000000 /* input token was critical */
#define SM_ITOK_FLAG_REQUIRED 0x00000001 /* received tokens must be present */