#include <gssapi/gssapi.h>
#include <gssapi/gssapi_ext.h>
#include "gssapi_eap.h"
-#include "util.h"
/* Kerberos includes */
#include <krb5.h>
/* EAP includes */
+#ifndef __cplusplus
#include <common.h>
#include <eap_peer/eap.h>
#include <eap_peer/eap_config.h>
-#include <crypto/tls.h> /* XXX testing implementation only */
+#include <crypto/tls.h>
#include <wpabuf.h>
+#endif
+
+#include <freeradius-client.h>
+#include <freeradius/radius.h>
+#include "util.h"
+
+/* These name flags are informative and not actually used by anything yet */
#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_FLAG_COMPOSITE 0x00000004
-struct eap_gss_saml_attr_ctx;
-struct eap_gss_radius_attr_ctx;
+struct gss_eap_saml_attr_ctx;
+struct gss_eap_attr_ctx;
struct gss_name_struct {
- GSSEAP_MUTEX mutex; /* mutex protecting attributes */
+ GSSEAP_MUTEX mutex; /* mutex protects attrCtx */
OM_uint32 flags;
krb5_principal krbPrincipal; /* this is immutable */
- struct eap_gss_saml_attr_ctx *samlCtx;
- struct eap_gss_radius_attr_ctx *radiusCtx;
+ struct gss_eap_attr_ctx *attrCtx;
};
-#define CRED_FLAG_INITIATE 0x00000001
-#define CRED_FLAG_ACCEPT 0x00000002
-#define CRED_FLAG_DEFAULT_IDENTITY 0x00000004
-#define CRED_FLAG_PASSWORD 0x00000008
+#define CRED_FLAG_INITIATE 0x00010000
+#define CRED_FLAG_ACCEPT 0x00020000
+#define CRED_FLAG_DEFAULT_IDENTITY 0x00040000
+#define CRED_FLAG_PASSWORD 0x00080000
+#define CRED_FLAG_PUBLIC_MASK 0x0000FFFF
struct gss_cred_id_struct {
GSSEAP_MUTEX mutex;
gss_buffer_desc password;
gss_OID_set mechanisms;
time_t expiryTime;
+ char *radiusConfigFile;
+ krb5_ccache krbCredCache;
+ gss_cred_id_t krbCred;
};
#define CTX_FLAG_INITIATOR 0x00000001
#define CTX_IS_INITIATOR(ctx) (((ctx)->flags & CTX_FLAG_INITIATOR) != 0)
-enum eap_gss_state {
- EAP_STATE_AUTHENTICATE = 0,
-#if 0
- EAP_STATE_KEY_TRANSPORT,
- EAP_STATE_SECURE_ASSOCIATION,
-#endif
+enum gss_eap_state {
+ EAP_STATE_IDENTITY = 0,
+ EAP_STATE_AUTHENTICATE,
EAP_STATE_GSS_CHANNEL_BINDINGS,
+ EAP_STATE_FAST_REAUTH,
EAP_STATE_ESTABLISHED
};
#define CTX_FLAG_EAP_PORT_ENABLED 0x00400000
#define CTX_FLAG_EAP_ALT_ACCEPT 0x00800000
#define CTX_FLAG_EAP_ALT_REJECT 0x01000000
+#define CTX_FLAG_EAP_MASK 0xFFFF0000
-struct eap_gss_initiator_ctx {
+struct gss_eap_initiator_ctx {
unsigned int idleWhile;
+#ifndef __cplusplus
struct eap_peer_config eapPeerConfig;
struct eap_sm *eap;
struct wpabuf reqData;
+#endif
};
-struct eap_gss_acceptor_ctx {
- struct eap_eapol_interface *eapPolInterface;
- void *tlsContext;
- struct eap_sm *eap;
+struct gss_eap_acceptor_ctx {
+ rc_handle *radHandle;
+ int lastStatus;
+ VALUE_PAIR *avps;
+ gss_buffer_desc state;
};
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;
uint64_t sendSeq, recvSeq;
void *seqState;
union {
- struct eap_gss_initiator_ctx initiator;
+ struct gss_eap_initiator_ctx initiator;
#define initiatorCtx ctxU.initiator
- struct eap_gss_acceptor_ctx acceptor;
+ struct gss_eap_acceptor_ctx acceptor;
#define acceptorCtx ctxU.acceptor
} ctxU;
};
int iov_count,
enum gss_eap_token_type toktype);
+OM_uint32
+gssEapWrapIovLength(OM_uint32 *minor,
+ gss_ctx_id_t ctx,
+ int conf_req_flag,
+ gss_qop_t qop_req,
+ int *conf_state,
+ gss_iov_buffer_desc *iov,
+ int iov_count);
+
#endif /* _GSSAPIP_EAP_H_ */