projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for Heimdal (macOS) builds from Stefan.
[mech_eap.git]
/
mech_eap
/
util_radius.h
diff --git
a/mech_eap/util_radius.h
b/mech_eap/util_radius.h
index
696cac0
..
d4f86ec
100644
(file)
--- a/
mech_eap/util_radius.h
+++ b/
mech_eap/util_radius.h
@@
-39,6
+39,10
@@
#ifdef __cplusplus
#ifdef __cplusplus
+typedef std::pair <unsigned int, unsigned int> gss_eap_attrid;
+#ifdef GSSEAP_ENABLE_ACCEPTOR
+
+
struct gss_eap_radius_attr_provider : gss_eap_attr_provider {
public:
gss_eap_radius_attr_provider(void);
struct gss_eap_radius_attr_provider : gss_eap_attr_provider {
public:
gss_eap_radius_attr_provider(void);
@@
-72,26
+76,18
@@
public:
JSONObject &obj);
JSONObject jsonRepresentation(void) const;
JSONObject &obj);
JSONObject jsonRepresentation(void) const;
- bool getAttribute(uint32_t attribute,
- int *authenticated,
- int *complete,
- gss_buffer_t value,
- gss_buffer_t display_value,
- int *more) const;
- bool getAttribute(uint16_t attribute,
- uint16_t vendor,
+ bool getAttribute(const gss_eap_attrid &attrid,
int *authenticated,
int *complete,
gss_buffer_t value,
gss_buffer_t display_value,
int *more) const;
bool setAttribute(int complete,
int *authenticated,
int *complete,
gss_buffer_t value,
gss_buffer_t display_value,
int *more) const;
bool setAttribute(int complete,
-
uint32_t attribute
,
+
const gss_eap_attrid &attrid
,
const gss_buffer_t value);
const gss_buffer_t value);
- bool deleteAttribute(
uint32_t attribute
);
+ bool deleteAttribute(
const gss_eap_attrid &attrid
);
- bool getFragmentedAttribute(uint16_t attribute,
- uint16_t vendor,
+ bool getFragmentedAttribute(const gss_eap_attrid &attrid,
int *authenticated,
int *complete,
gss_buffer_t value) const;
int *authenticated,
int *complete,
gss_buffer_t value) const;
@@
-106,42
+102,46
@@
public:
static gss_eap_attr_provider *createAttrContext(void);
private:
static gss_eap_attr_provider *createAttrContext(void);
private:
-
const VALUE_PAIR
*getAvps(void) const {
+
rs_const_avp
*getAvps(void) const {
return m_vps;
}
return m_vps;
}
-
VALUE_PAIR
*m_vps;
+
rs_avp
*m_vps;
bool m_authenticated;
};
bool m_authenticated;
};
+#endif /* GSSEAP_ENABLE_ACCEPTOR */
+
/* For now */
extern "C" {
#endif
/* For now */
extern "C" {
#endif
+#ifdef GSSEAP_ENABLE_ACCEPTOR
+
OM_uint32
gssEapRadiusAddAvp(OM_uint32 *minor,
OM_uint32
gssEapRadiusAddAvp(OM_uint32 *minor,
-
VALUE_PAIR **vp
,
- u
int16_
t type,
- u
int16_
t vendor,
+
struct rs_packet *pkt
,
+ u
nsigned in
t type,
+ u
nsigned in
t vendor,
const gss_buffer_t buffer);
OM_uint32
gssEapRadiusGetAvp(OM_uint32 *minor,
const gss_buffer_t buffer);
OM_uint32
gssEapRadiusGetAvp(OM_uint32 *minor,
-
VALUE_PAIR *vps
,
- u
int16_
t type,
- u
int16_
t vendor,
+
struct rs_packet *pkt
,
+ u
nsigned in
t type,
+ u
nsigned in
t vendor,
gss_buffer_t buffer,
int concat);
OM_uint32
gssEapRadiusGetRawAvp(OM_uint32 *minor,
gss_buffer_t buffer,
int concat);
OM_uint32
gssEapRadiusGetRawAvp(OM_uint32 *minor,
-
VALUE_PAIR
*vps,
- u
int16_
t type,
- u
int16_
t vendor,
-
VALUE_PAIR
**vp);
+
rs_const_avp
*vps,
+ u
nsigned in
t type,
+ u
nsigned in
t vendor,
+
rs_const_avp
**vp);
OM_uint32
gssEapRadiusFreeAvps(OM_uint32 *minor,
OM_uint32
gssEapRadiusFreeAvps(OM_uint32 *minor,
-
VALUE_PAIR
**vps);
+
rs_avp
**vps);
OM_uint32 gssEapRadiusAttrProviderInit(OM_uint32 *minor);
OM_uint32 gssEapRadiusAttrProviderFinalize(OM_uint32 *minor);
OM_uint32 gssEapRadiusAttrProviderInit(OM_uint32 *minor);
OM_uint32 gssEapRadiusAttrProviderFinalize(OM_uint32 *minor);
@@
-150,24
+150,25
@@
OM_uint32
gssEapRadiusMapError(OM_uint32 *minor,
struct rs_error *err);
gssEapRadiusMapError(OM_uint32 *minor,
struct rs_error *err);
-#define RS_CONFIG_FILE SYSCONFDIR "/radsec.conf"
-
-#define VENDORPEC_MS 311 /* RFC 2548 */
+OM_uint32
+gssEapCreateRadiusContext(OM_uint32 *minor,
+ gss_cred_id_t cred,
+ struct rs_context **pRadContext);
-#define PW_MS_MPPE_SEND_KEY 16
-#define PW_MS_MPPE_RECV_KEY 17
+#endif /* GSSEAP_ENABLE_ACCEPTOR */
-#define VENDORPEC_UKERNA 25622
+/* initiator utilities that require only libeap, and not freeradius */
+struct wpabuf;
-#define PW_GSS_ACCEPTOR_SERVICE_NAME 128
-#define PW_GSS_ACCEPTOR_HOST_NAME 129
-#define PW_GSS_ACCEPTOR_SERVICE_SPECIFIC 130
-#define PW_GSS_ACCEPTOR_REALM_NAME 131
-#define PW_SAML_AAA_ASSERTION 132
-#define PW_MS_WINDOWS_AUTH_DATA 133
+OM_uint32
+gssEapRadiusAddAttr(OM_uint32 *minor,
+ struct wpabuf **dst,
+ uint16_t type,
+ uint16_t vendor,
+ gss_buffer_t value);
-#define IS_RADIUS_ERROR(code) ((code) >= ERROR_TABLE_BASE_rse && \
- (code) <= ERROR_TABLE_BASE_rse + RSE_TIMEOUT_IO)
+/* This really needs to be a function call on Windows */
+#define RS_CONFIG_FILE SYSCONFDIR "/radsec.conf"
#ifdef __cplusplus
}
#ifdef __cplusplus
}