fix some build errors

[mech_eap.git] / gssapiP_eap.h

diff --git a/gssapiP_eap.h b/gssapiP_eap.h
index 1427272..2369f47 100644 (file)
--- a/gssapiP_eap.h
+++ b/gssapiP_eap.h
@@ -36,6 +36,8 @@
 #include <assert.h>
 #include <string.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
 #include <time.h>
 
 /* GSS includes */
@@ -45,11 +47,10 @@
 #include "util.h"
 
 /* EAP includes */
-#define IEEE8021X_EAPOL 1
-
 #include <common.h>
 #include <eap_peer/eap.h>
 #include <eap_peer/eap_config.h>
+#include <crypto/tls.h>                     /* XXX testing implementation only */
 #include <wpabuf.h>
 
 /* Kerberos includes */
@@ -114,23 +115,20 @@ enum eap_gss_state {
 #define CTX_FLAG_EAP_ALT_REJECT             0x01000000
 
 struct eap_gss_initiator_ctx {
-    struct wpabuf *eapReqData;
     unsigned int idleWhile;
-    struct eap_peer_config eapConfig;
+    struct eap_peer_config eapPeerConfig;
+    struct eap_config eapConfig;
     struct eap_sm *eap;
+    struct wpabuf reqData;
 };
 
-/* Acceptor context flags */
 struct eap_gss_acceptor_ctx {
+    struct eap_eapol_interface *eapPolInterface;
+    void *tlsContext;
+    struct eap_sm *eap;
+    struct eap_config eapConfig; /* XXX */
 };
 
-typedef OM_uint32 (*eap_gss_acceptor_sm)(OM_uint32 *,
-                                         gss_ctx_id_t,
-                                         gss_cred_id_t,
-                                         gss_buffer_t,
-                                         gss_channel_bindings_t,
-                                         gss_buffer_t);
-
 struct gss_ctx_id_struct {
     GSSEAP_MUTEX mutex;
     enum eap_gss_state state;
@@ -138,7 +136,6 @@ struct gss_ctx_id_struct {
     OM_uint32 gssFlags;
     gss_OID mechanismUsed;
     krb5_enctype encryptionType;
-    krb5_cksumtype checksumType;
     krb5_keyblock rfc3961Key;
     gss_name_t initiatorName;
     gss_name_t acceptorName;