projects
/
mech_eap.orig
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More work on SAML code
[mech_eap.orig]
/
gssapiP_eap.h
diff --git
a/gssapiP_eap.h
b/gssapiP_eap.h
index
0c19b91
..
35cc154
100644
(file)
--- a/
gssapiP_eap.h
+++ b/
gssapiP_eap.h
@@
-33,6
+33,8
@@
#ifndef _GSSAPIP_EAP_H_
#define _GSSAPIP_EAP_H_ 1
#ifndef _GSSAPIP_EAP_H_
#define _GSSAPIP_EAP_H_ 1
+#define BUILTIN_EAP 1
+
#include <assert.h>
#include <string.h>
#include <errno.h>
#include <assert.h>
#include <string.h>
#include <errno.h>
@@
-46,34
+48,35
@@
#include "gssapi_eap.h"
#include "util.h"
#include "gssapi_eap.h"
#include "util.h"
+/* Kerberos includes */
+#include <krb5.h>
+
/* EAP includes */
/* EAP includes */
+#ifndef __cplusplus
#include <common.h>
#include <eap_peer/eap.h>
#include <common.h>
#include <eap_peer/eap.h>
-#include <eap_peer/eap_i.h>
#include <eap_peer/eap_config.h>
#include <crypto/tls.h> /* XXX testing implementation only */
#include <wpabuf.h>
#include <eap_peer/eap_config.h>
#include <crypto/tls.h> /* XXX testing implementation only */
#include <wpabuf.h>
-
-/* Kerberos includes */
-#include <krb5.h>
+#endif
#define NAME_FLAG_NAI 0x00000001
#define NAME_FLAG_SERVICE 0x00000002
#define NAME_FLAG_NAI 0x00000001
#define NAME_FLAG_SERVICE 0x00000002
-#define NAME_FLAG_
SAML 0x00000010
-#define NAME_FLAG_
RADIUS 0x00000020
+#define NAME_FLAG_
RADIUS_ATTRIBUTES 0x00000004
+#define NAME_FLAG_
SAML_ATTRIBUTES 0x00000008
-#define NAME_HAS_ATTRIBUTES(name) ((name)->flags & \
- (NAME_FLAG_SAML | NAME_FLAG_RADIUS))
+#define NAME_HAS_ATTRIBUTES(name) \
+ (((name)->flags & (NAME_FLAG_RADIUS_ATTRIBUTES | \
+ NAME_FLAG_SAML_ATTRIBUTES)) != 0)
-struct eap_gss_saml_assertion;
-struct eap_gss_avp_list;
+struct gss_eap_saml_attr_ctx;
struct gss_name_struct {
GSSEAP_MUTEX mutex; /* mutex protecting attributes */
OM_uint32 flags;
krb5_principal krbPrincipal; /* this is immutable */
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
gss_eap_radius_attr_ctx *radiusCtx
;
+ struct
gss_eap_saml_attr_ctx *samlCtx
;
};
#define CRED_FLAG_INITIATE 0x00000001
};
#define CRED_FLAG_INITIATE 0x00000001
@@
-94,10
+97,12
@@
struct gss_cred_id_struct {
#define CTX_IS_INITIATOR(ctx) (((ctx)->flags & CTX_FLAG_INITIATOR) != 0)
#define CTX_IS_INITIATOR(ctx) (((ctx)->flags & CTX_FLAG_INITIATOR) != 0)
-enum
eap_gss
_state {
+enum
gss_eap
_state {
EAP_STATE_AUTHENTICATE = 0,
EAP_STATE_AUTHENTICATE = 0,
+#if 0
EAP_STATE_KEY_TRANSPORT,
EAP_STATE_SECURE_ASSOCIATION,
EAP_STATE_KEY_TRANSPORT,
EAP_STATE_SECURE_ASSOCIATION,
+#endif
EAP_STATE_GSS_CHANNEL_BINDINGS,
EAP_STATE_ESTABLISHED
};
EAP_STATE_GSS_CHANNEL_BINDINGS,
EAP_STATE_ESTABLISHED
};
@@
-115,38
+120,43
@@
enum eap_gss_state {
#define CTX_FLAG_EAP_ALT_ACCEPT 0x00800000
#define CTX_FLAG_EAP_ALT_REJECT 0x01000000
#define CTX_FLAG_EAP_ALT_ACCEPT 0x00800000
#define CTX_FLAG_EAP_ALT_REJECT 0x01000000
-struct
eap_gss
_initiator_ctx {
+struct
gss_eap
_initiator_ctx {
unsigned int idleWhile;
unsigned int idleWhile;
+#ifndef __cplusplus
struct eap_peer_config eapPeerConfig;
struct eap_sm *eap;
struct wpabuf reqData;
struct eap_peer_config eapPeerConfig;
struct eap_sm *eap;
struct wpabuf reqData;
+#endif
};
};
-struct eap_gss_acceptor_ctx {
+struct gss_eap_acceptor_ctx {
+#if defined(BUILTIN_EAP) && !defined(__cplusplus)
struct eap_eapol_interface *eapPolInterface;
void *tlsContext;
struct eap_sm *eap;
struct eap_eapol_interface *eapPolInterface;
void *tlsContext;
struct eap_sm *eap;
+#endif
};
struct gss_ctx_id_struct {
GSSEAP_MUTEX mutex;
};
struct gss_ctx_id_struct {
GSSEAP_MUTEX mutex;
- enum
eap_gss
_state state;
+ enum
gss_eap
_state state;
OM_uint32 flags;
OM_uint32 gssFlags;
gss_OID mechanismUsed;
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;
krb5_enctype encryptionType;
krb5_keyblock rfc3961Key;
gss_name_t initiatorName;
gss_name_t acceptorName;
time_t expiryTime;
+ uint64_t sendSeq, recvSeq;
+ void *seqState;
union {
union {
- struct
eap_gss
_initiator_ctx initiator;
+ struct
gss_eap
_initiator_ctx initiator;
#define initiatorCtx ctxU.initiator
#define initiatorCtx ctxU.initiator
- struct
eap_gss
_acceptor_ctx acceptor;
+ struct
gss_eap
_acceptor_ctx acceptor;
#define acceptorCtx ctxU.acceptor
} ctxU;
#define acceptorCtx ctxU.acceptor
} ctxU;
- uint64_t sendSeq, recvSeq;
- void *seqState;
};
#define TOK_FLAG_SENDER_IS_ACCEPTOR 0x01
};
#define TOK_FLAG_SENDER_IS_ACCEPTOR 0x01
@@
-157,6
+167,7
@@
struct gss_ctx_id_struct {
#define KEY_USAGE_ACCEPTOR_SIGN 23
#define KEY_USAGE_INITIATOR_SEAL 24
#define KEY_USAGE_INITIATOR_SIGN 25
#define KEY_USAGE_ACCEPTOR_SIGN 23
#define KEY_USAGE_INITIATOR_SEAL 24
#define KEY_USAGE_INITIATOR_SIGN 25
+#define KEY_USAGE_CHANNEL_BINDINGS 64
/* wrap_iov.c */
OM_uint32
/* wrap_iov.c */
OM_uint32
@@
-177,5
+188,4
@@
gssEapUnwrapOrVerifyMIC(OM_uint32 *minor_status,
int iov_count,
enum gss_eap_token_type toktype);
int iov_count,
enum gss_eap_token_type toktype);
-
#endif /* _GSSAPIP_EAP_H_ */
#endif /* _GSSAPIP_EAP_H_ */