projects
/
moonshot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add CRED_FLAG_TARGET
[moonshot.git]
/
moonshot
/
mech_eap
/
gssapiP_eap.h
diff --git
a/moonshot/mech_eap/gssapiP_eap.h
b/moonshot/mech_eap/gssapiP_eap.h
index
966adde
..
8b498e9
100644
(file)
--- a/
moonshot/mech_eap/gssapiP_eap.h
+++ b/
moonshot/mech_eap/gssapiP_eap.h
@@
-93,8
+93,10
@@
typedef const gss_OID_desc *gss_const_OID;
/* FreeRADIUS headers */
#ifdef __cplusplus
extern "C" {
/* FreeRADIUS headers */
#ifdef __cplusplus
extern "C" {
+#ifndef WIN32
#define operator fr_operator
#endif
#define operator fr_operator
#endif
+#endif
#include <freeradius/libradius.h>
#include <freeradius/radius.h>
#include <freeradius/libradius.h>
#include <freeradius/radius.h>
@@
-104,7
+106,9
@@
extern "C" {
#include <radsec/radsec.h>
#include <radsec/request.h>
#ifdef __cplusplus
#include <radsec/radsec.h>
#include <radsec/request.h>
#ifdef __cplusplus
+#ifndef WIN32
#undef operator
#undef operator
+#endif
}
#endif
#endif /* GSSEAP_ENABLE_ACCEPTOR */
}
#endif
#endif /* GSSEAP_ENABLE_ACCEPTOR */
@@
-145,6
+149,7
@@
struct gss_name_struct
#define CRED_FLAG_PASSWORD 0x00040000
#define CRED_FLAG_DEFAULT_CCACHE 0x00080000
#define CRED_FLAG_RESOLVED 0x00100000
#define CRED_FLAG_PASSWORD 0x00040000
#define CRED_FLAG_DEFAULT_CCACHE 0x00080000
#define CRED_FLAG_RESOLVED 0x00100000
+#define CRED_FLAG_TARGET 0x00200000
#define CRED_FLAG_PUBLIC_MASK 0x0000FFFF
#ifdef HAVE_HEIMDAL_VERSION
#define CRED_FLAG_PUBLIC_MASK 0x0000FFFF
#ifdef HAVE_HEIMDAL_VERSION
@@
-343,6
+348,12
@@
gssEapExportSecContext(OM_uint32 *minor,
gss_ctx_id_t ctx,
gss_buffer_t token);
gss_ctx_id_t ctx,
gss_buffer_t token);
+/* import_sec_context.c */
+OM_uint32
+gssEapImportContext(OM_uint32 *minor,
+ gss_buffer_t token,
+ gss_ctx_id_t ctx);
+
/* pseudo_random.c */
OM_uint32
gssEapPseudoRandom(OM_uint32 *minor,
/* pseudo_random.c */
OM_uint32
gssEapPseudoRandom(OM_uint32 *minor,
@@
-353,8
+364,8
@@
gssEapPseudoRandom(OM_uint32 *minor,
gss_buffer_t prf_out);
/* eap_mech.c */
gss_buffer_t prf_out);
/* eap_mech.c */
-void
-gssEapInitiatorInit(
void
);
+OM_uint32
+gssEapInitiatorInit(
OM_uint32 *minor
);
void
gssEapFinalize(void);
void
gssEapFinalize(void);