Add some OID manipulation functions

[mech_eap.git] / gssapiP_eap.h

diff --git a/gssapiP_eap.h b/gssapiP_eap.h
index b6e4b04..9bb77d3 100644 (file)
--- a/gssapiP_eap.h
+++ b/gssapiP_eap.h
@@ -53,7 +53,6 @@
 
 /* Kerberos includes */
 #include <krb5.h>
-#include "util.h"
 
 struct gss_name_struct {
     OM_uint32 flags;
@@ -118,7 +117,7 @@ struct gss_ctx_id_struct {
     gss_OID mechanismUsed;
     krb5_enctype encryptionType;
     krb5_cksumtype checksumType;
-    krb5_keyblock *encryptionKey;
+    krb5_keyblock *rfc3961Key;
     gss_name_t initiatorName;
     gss_name_t acceptorName;
     time_t expiryTime;
@@ -142,9 +141,13 @@ struct gss_ctx_id_struct {
 #define KEY_USAGE_INITIATOR_SIGN            515
 
 enum gss_eap_token_type {
-    TOK_TYPE_MIC     = 0x0404,
-    TOK_TYPE_WRAP    = 0x0504,
-    TOK_TYPE_DELETE  = 0x0405
+    TOK_TYPE_EAP_RESP  = 0x0601,
+    TOK_TYPE_EAP_REQ   = 0x0602,
+    TOK_TYPE_GSS_CB    = 0x0603,
+    TOK_TYPE_MIC       = 0x0404,
+    TOK_TYPE_WRAP      = 0x0504,
+    TOK_TYPE_DELETE    = 0x0405,
+    TOK_TYPE_NONE      = 0xFFFF
 };
 
 /* wrap_iov.c */
@@ -167,4 +170,6 @@ gssEapUnwrapOrVerifyMIC(OM_uint32 *minor_status,
                         enum gss_eap_token_type toktype);
 
 
+#include "util.h"
+
 #endif /* _GSSAPIP_EAP_H_ */