projects
/
mech_eap.orig
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some work on SAML
[mech_eap.orig]
/
gssapiP_eap.h
diff --git
a/gssapiP_eap.h
b/gssapiP_eap.h
index
3a2dd80
..
db39ccf
100644
(file)
--- a/
gssapiP_eap.h
+++ b/
gssapiP_eap.h
@@
-46,6
+46,9
@@
#include "gssapi_eap.h"
#include "util.h"
#include "gssapi_eap.h"
#include "util.h"
+/* Kerberos includes */
+#include <krb5.h>
+
/* EAP includes */
#include <common.h>
#include <eap_peer/eap.h>
/* EAP includes */
#include <common.h>
#include <eap_peer/eap.h>
@@
-53,9
+56,6
@@
#include <crypto/tls.h> /* XXX testing implementation only */
#include <wpabuf.h>
#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_NAI 0x00000001
#define NAME_FLAG_SERVICE 0x00000002
#define NAME_FLAG_SAML 0x00000010
@@
-64,15
+64,15
@@
#define NAME_HAS_ATTRIBUTES(name) ((name)->flags & \
(NAME_FLAG_SAML | NAME_FLAG_RADIUS))
#define NAME_HAS_ATTRIBUTES(name) ((name)->flags & \
(NAME_FLAG_SAML | NAME_FLAG_RADIUS))
-struct eap_gss_saml_a
ssertion
;
-struct eap_gss_
avp_list
;
+struct eap_gss_saml_a
ttr_ctx
;
+struct eap_gss_
radius_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_a
ssertion *assertion
;
- struct eap_gss_
avp_list *avps
;
+ struct eap_gss_saml_a
ttr_ctx *samlCtx
;
+ struct eap_gss_
radius_attr_ctx *radiusCtx
;
};
#define CRED_FLAG_INITIATE 0x00000001
};
#define CRED_FLAG_INITIATE 0x00000001