libeap is now C++ clean, remove workaround

[moonshot.git] / mech_eap / gssapiP_eap.h

diff --git a/mech_eap/gssapiP_eap.h b/mech_eap/gssapiP_eap.h
index 290da74..0d1dd4d 100644 (file)
--- a/mech_eap/gssapiP_eap.h
+++ b/mech_eap/gssapiP_eap.h
@@ -44,13 +44,16 @@
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <time.h>
 #include <sys/param.h>
 
 /* GSS headers */
 #include <gssapi/gssapi.h>
 #include <gssapi/gssapi_krb5.h>
-#ifndef HAVE_HEIMDAL_VERSION
+#ifdef HAVE_HEIMDAL_VERSION
+typedef struct gss_any *gss_any_t;
+#else
 #include <gssapi/gssapi_ext.h>
 #endif
 #include "gssapi_eap.h"
@@ -104,6 +107,7 @@ struct gss_name_struct
 {
     GSSEAP_MUTEX mutex; /* mutex protects attrCtx */
     OM_uint32 flags;
+    gss_OID mechanismUsed; /* this is immutable */
     krb5_principal krbPrincipal; /* this is immutable */
     struct gss_eap_attr_ctx *attrCtx;
 };
@@ -137,44 +141,10 @@ struct gss_cred_id_struct
 
 #define CTX_FLAG_INITIATOR                  0x00000001
 #define CTX_FLAG_KRB_REAUTH                 0x00000002
+#define CTX_FLAG_KRB_REAUTH_SUPPORTED       0x00000004
 
 #define CTX_IS_INITIATOR(ctx)               (((ctx)->flags & CTX_FLAG_INITIATOR) != 0)
 
-enum gss_eap_state {
-    GSSEAP_STATE_INITIAL        = 0x01,     /* initial state */
-    GSSEAP_STATE_AUTHENTICATE   = 0x02,     /* exchange EAP messages */
-    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)
-
-/* state machine entry */
-struct gss_eap_sm {
-    OM_uint32 inputTokenType;
-    OM_uint32 outputTokenType;
-    enum gss_eap_state validStates;
-    int critical;
-    int required;
-    OM_uint32 (*processToken)(OM_uint32 *,
-                              gss_cred_id_t,
-                              gss_ctx_id_t,
-                              gss_name_t,
-                              gss_OID,
-                              OM_uint32,
-                              OM_uint32,
-                              gss_channel_bindings_t,
-                              gss_buffer_t,
-                              gss_buffer_t,
-                              OM_uint32 *);
-};
-
-#define SM_FLAG_TRANSITION                  0x00000001
-#define SM_FLAG_FORCE_SEND_TOKEN            0x00000002
-#define SM_FLAG_STOP_EVAL                   0x00000004
-
 #define CTX_IS_ESTABLISHED(ctx)             ((ctx)->state == GSSEAP_STATE_ESTABLISHED)
 
 /* Initiator context flags */
@@ -191,11 +161,9 @@ struct gss_eap_sm {
 
 struct gss_eap_initiator_ctx {
     unsigned int idleWhile;
-#ifndef __cplusplus
     struct eap_peer_config eapPeerConfig;
     struct eap_sm *eap;
     struct wpabuf reqData;
-#endif
 };
 
 struct gss_eap_acceptor_ctx {
@@ -232,10 +200,11 @@ struct gss_ctx_id_struct
         struct gss_eap_acceptor_ctx  acceptor;
         #define acceptorCtx          ctxU.acceptor
 #ifdef GSSEAP_ENABLE_REAUTH
-        gss_ctx_id_t                 kerberos;
-        #define kerberosCtx          ctxU.kerberos
+        gss_ctx_id_t                 reauth;
+        #define reauthCtx            ctxU.reauth
 #endif
     } ctxU;
+    gss_buffer_desc conversation;
 };
 
 #define TOK_FLAG_SENDER_IS_ACCEPTOR         0x01
@@ -293,6 +262,13 @@ gssEapSaveStatusInfo(OM_uint32 minor, const char *format, ...);
 #define IS_WIRE_ERROR(err)              ((err) > GSSEAP_RESERVED && \
                                          (err) <= GSSEAP_RADIUS_PROT_FAILURE)
 
+/* export_sec_context.c */
+OM_uint32
+gssEapExportSecContext(OM_uint32 *minor,
+                       gss_ctx_id_t ctx,
+                       gss_buffer_t token);
+
+
 #ifdef __cplusplus
 }
 #endif