X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=gssapiP_eap.h;h=e02927c6cf6118e260e21af320ef7125ceed63f0;hb=c581903743f5bf281548368f49bc5d37d338a4ea;hp=5fb8383d9700d38520267753479456a79890780d;hpb=6ce212c9c7eeabe92a4a96922b97eb89737d5a64;p=mech_eap.orig

diff --git a/gssapiP_eap.h b/gssapiP_eap.h
index 5fb8383..e02927c 100644
--- a/gssapiP_eap.h
+++ b/gssapiP_eap.h
@@ -46,6 +46,9 @@
 #include "gssapi_eap.h"
 #include "util.h"
 
+/* Kerberos includes */
+#include <krb5.h>
+
 /* EAP includes */
 #include <common.h>
 #include <eap_peer/eap.h>
@@ -53,26 +56,18 @@
 #include <crypto/tls.h>                     /* XXX testing implementation only */
 #include <wpabuf.h>
 
-/* Kerberos includes */
-#include <krb5.h>
-
 #define NAME_FLAG_NAI                       0x00000001
 #define NAME_FLAG_SERVICE                   0x00000002
-#define NAME_FLAG_SAML                      0x00000010
-#define NAME_FLAG_RADIUS                    0x00000020
 
-#define NAME_HAS_ATTRIBUTES(name)           ((name)->flags & \
-                                             (NAME_FLAG_SAML | NAME_FLAG_RADIUS))
+#define NAME_HAS_ATTRIBUTES(name)           ((name)->samlCtx != NULL)
 
-struct eap_gss_saml_assertion;
-struct eap_gss_avp_list;
+struct eap_gss_saml_attr_ctx;
 
 struct gss_name_struct {
     GSSEAP_MUTEX mutex; /* mutex protecting attributes */
     OM_uint32 flags;
     krb5_principal krbPrincipal; /* this is immutable */
-    struct eap_gss_saml_assertion *assertion;
-    struct eap_gss_avp_list *avps;
+    struct eap_gss_saml_attr_ctx *samlCtx;
 };
 
 #define CRED_FLAG_INITIATE                  0x00000001
@@ -135,19 +130,20 @@ struct gss_ctx_id_struct {
     OM_uint32 flags;
     OM_uint32 gssFlags;
     gss_OID mechanismUsed;
+    krb5_cksumtype checksumType;
     krb5_enctype encryptionType;
     krb5_keyblock rfc3961Key;
     gss_name_t initiatorName;
     gss_name_t acceptorName;
     time_t expiryTime;
+    uint64_t sendSeq, recvSeq;
+    void *seqState;
     union {
         struct eap_gss_initiator_ctx initiator;
         #define initiatorCtx         ctxU.initiator
         struct eap_gss_acceptor_ctx  acceptor;
         #define acceptorCtx          ctxU.acceptor
     } ctxU;
-    uint64_t sendSeq, recvSeq;
-    void *seqState;
 };
 
 #define TOK_FLAG_SENDER_IS_ACCEPTOR         0x01
@@ -179,5 +175,4 @@ gssEapUnwrapOrVerifyMIC(OM_uint32 *minor_status,
                         int iov_count,
                         enum gss_eap_token_type toktype);
 
-
 #endif /* _GSSAPIP_EAP_H_ */