#include "config.h"
+#ifdef HAVE_HEIMDAL_VERSION
+#define KRB5_DEPRECATED /* so we can use krb5_free_unparsed_name() */
+#endif
+
#include <assert.h>
#include <string.h>
#include <errno.h>
/* GSS headers */
#include <gssapi/gssapi.h>
#include <gssapi/gssapi_krb5.h>
+#ifndef HAVE_HEIMDAL_VERSION
#include <gssapi/gssapi_ext.h>
+#endif
#include "gssapi_eap.h"
/* Kerberos headers */
struct gss_eap_saml_attr_ctx;
struct gss_eap_attr_ctx;
-struct gss_name_struct {
+#ifdef HAVE_HEIMDAL_VERSION
+struct gss_name_t_desc_struct
+#else
+struct gss_name_struct
+#endif
+{
GSSEAP_MUTEX mutex; /* mutex protects attrCtx */
OM_uint32 flags;
krb5_principal krbPrincipal; /* this is immutable */
#define CRED_FLAG_DEFAULT_CCACHE 0x00100000
#define CRED_FLAG_PUBLIC_MASK 0x0000FFFF
-struct gss_cred_id_struct {
+#ifdef HAVE_HEIMDAL_VERSION
+struct gss_cred_id_t_desc_struct
+#else
+struct gss_cred_id_struct
+#endif
+{
GSSEAP_MUTEX mutex;
OM_uint32 flags;
gss_name_t name;
#define CTX_IS_INITIATOR(ctx) (((ctx)->flags & CTX_FLAG_INITIATOR) != 0)
enum gss_eap_state {
- GSSEAP_STATE_IDENTITY = 0,
- GSSEAP_STATE_AUTHENTICATE,
- GSSEAP_STATE_EXTENSIONS_REQ,
- GSSEAP_STATE_EXTENSIONS_RESP,
- GSSEAP_STATE_ESTABLISHED,
- GSSEAP_STATE_ERROR,
+ GSSEAP_STATE_IDENTITY = 0, /* identify peer */
+ GSSEAP_STATE_AUTHENTICATE, /* exchange EAP messages */
+ GSSEAP_STATE_EXTENSIONS_REQ, /* initiator extensions */
+ GSSEAP_STATE_EXTENSIONS_RESP, /* acceptor extensions */
+ GSSEAP_STATE_ESTABLISHED, /* context established */
+ GSSEAP_STATE_ERROR, /* context error */
#ifdef GSSEAP_ENABLE_REAUTH
- GSSEAP_STATE_KRB_REAUTH
+ GSSEAP_STATE_KRB_REAUTH /* fast reauthentication */
#endif
};
VALUE_PAIR *vps;
};
-struct gss_ctx_id_struct {
+#ifdef HAVE_HEIMDAL_VERSION
+struct gss_ctx_id_t_desc_struct
+#else
+struct gss_ctx_id_struct
+#endif
+{
GSSEAP_MUTEX mutex;
enum gss_eap_state state;
OM_uint32 flags;
void
gssEapSaveStatusInfo(OM_uint32 minor, const char *format, ...);
+#define IS_WIRE_ERROR(err) ((err) > GSSEAP_RESERVED && \
+ (err) <= GSSEAP_RADIUS_PROT_FAILURE)
+
#ifdef __cplusplus
}
#endif