gssEapReleaseName(&tmpMinor, &ctx->initiatorName);
- vp = pairfind(ctx->acceptorCtx.avps, PW_USER_NAME);
+ vp = pairfind(ctx->acceptorCtx.vps, PW_USER_NAME);
if (vp != NULL) {
nameBuf.length = vp->length;
nameBuf.value = vp->vp_strvalue;
ctx->initiatorName->attrCtx = gssEapCreateAttrContext(cred, ctx);
- major = gssEapRadiusGetRawAvp(minor, ctx->acceptorCtx.avps,
+ major = gssEapRadiusGetRawAvp(minor, ctx->acceptorCtx.vps,
PW_MS_MPPE_SEND_KEY, VENDORPEC_MS, &vp);
if (major == GSS_S_COMPLETE && ctx->encryptionType != ENCTYPE_NULL) {
major = gssEapDeriveRfc3961Key(minor,
static OM_uint32
setAcceptorIdentity(OM_uint32 *minor,
gss_ctx_id_t ctx,
- VALUE_PAIR **avps)
+ VALUE_PAIR **vps)
{
OM_uint32 major;
gss_buffer_desc nameBuf;
/* Acceptor-Service-Name */
krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 0), &nameBuf);
- major = gssEapRadiusAddAvp(minor, rh, avps,
+ major = gssEapRadiusAddAvp(minor, rh, vps,
PW_GSS_ACCEPTOR_SERVICE_NAME,
VENDORPEC_UKERNA,
&nameBuf);
/* Acceptor-Host-Name */
krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 1), &nameBuf);
- major = gssEapRadiusAddAvp(minor, rh, avps,
+ major = gssEapRadiusAddAvp(minor, rh, vps,
PW_GSS_ACCEPTOR_HOST_NAME,
VENDORPEC_UKERNA,
&nameBuf);
nameBuf.value = ssi;
nameBuf.length = strlen(ssi);
- major = gssEapRadiusAddAvp(minor, rh, avps,
+ major = gssEapRadiusAddAvp(minor, rh, vps,
PW_GSS_ACCEPTOR_SERVICE_SPECIFIC,
VENDORPEC_UKERNA,
&nameBuf);
krbDataToGssBuffer(krb5_princ_realm(krbContext, krbPrinc), &nameBuf);
if (nameBuf.length != 0) {
/* Acceptor-Realm-Name */
- major = gssEapRadiusAddAvp(minor, rh, avps,
+ major = gssEapRadiusAddAvp(minor, rh, vps,
PW_GSS_ACCEPTOR_REALM_NAME,
VENDORPEC_UKERNA,
&nameBuf);
if (major != GSS_S_UNAVAILABLE && GSS_ERROR(major))
goto cleanup;
} else {
- ctx->acceptorCtx.avps = frresp->vps;
+ ctx->acceptorCtx.vps = frresp->vps;
frresp->vps = NULL;
major = acceptReadyEap(minor, ctx, cred);
struct rs_connection *radConn;
char *radServer;
gss_buffer_desc state;
- VALUE_PAIR *avps;
+ VALUE_PAIR *vps;
};
struct gss_ctx_id_struct {
if (ctx->radServer != NULL)
GSSEAP_FREE(ctx->radServer);
gss_release_buffer(&tmpMinor, &ctx->state);
- if (ctx->avps != NULL)
- pairfree(&ctx->avps);
+ if (ctx->vps != NULL)
+ pairfree(&ctx->vps);
}
OM_uint32
gss_eap_radius_attr_provider::gss_eap_radius_attr_provider(void)
{
m_rh = NULL;
- m_avps = NULL;
+ m_vps = NULL;
m_authenticated = false;
}
{
if (m_rh != NULL)
rs_context_destroy(m_rh);
- if (m_avps != NULL)
- pairfree(&m_avps);
+ if (m_vps != NULL)
+ pairfree(&m_vps);
}
bool
if (!allocRadHandle(radius->m_configFile))
return false;
- if (radius->m_avps != NULL)
- m_avps = paircopy(const_cast<VALUE_PAIR *>(radius->getAvps()));
+ if (radius->m_vps != NULL)
+ m_vps = paircopy(const_cast<VALUE_PAIR *>(radius->getAvps()));
return true;
}
return false;
if (gssCtx != GSS_C_NO_CONTEXT) {
- if (gssCtx->acceptorCtx.avps != NULL) {
- m_avps = paircopy(gssCtx->acceptorCtx.avps);
- if (m_avps == NULL)
+ if (gssCtx->acceptorCtx.vps != NULL) {
+ m_vps = paircopy(gssCtx->acceptorCtx.vps);
+ if (m_vps == NULL)
return false;
}
}
VALUE_PAIR *vp;
std::vector <std::string> seen;
- for (vp = m_avps; vp != NULL; vp = vp->next) {
+ for (vp = m_vps; vp != NULL; vp = vp->next) {
gss_buffer_desc attribute;
char attrid[64];
if (isHiddenAttributeP(ATTRID(vp->attribute), VENDOR(vp->attribute)))
if (i == -1)
i = 0;
- for (vp = pairfind(m_avps, attrid);
+ for (vp = pairfind(m_vps, attrid);
vp != NULL;
vp = pairfind(vp->next, attrid)) {
if (count++ == i) {
{
OM_uint32 major, minor;
- major = gssEapRadiusGetAvp(&minor, m_avps, attribute, vendor, value, TRUE);
+ major = gssEapRadiusGetAvp(&minor, m_vps, attribute, vendor, value, TRUE);
if (authenticated != NULL)
*authenticated = m_authenticated;
if (authenticated && !m_authenticated)
return (gss_any_t)NULL;
- return (gss_any_t)paircopy(m_avps);
+ return (gss_any_t)paircopy(m_vps);
}
void
unsigned char *p = (unsigned char *)buffer->value;
size_t remain = buffer->length;
OM_uint32 configFileLen, count;
- VALUE_PAIR **pNext = &m_avps;
+ VALUE_PAIR **pNext = &m_vps;
if (!gss_eap_attr_provider::initFromBuffer(ctx, buffer))
return false;
unsigned char *p;
size_t remain = 4 + m_configFile.length() + 4;
- for (vp = m_avps; vp != NULL; vp = vp->next) {
+ for (vp = m_vps; vp != NULL; vp = vp->next) {
remain += avpSize(vp);
count++;
}
p += 4;
remain -= 4;
- for (vp = m_avps; vp != NULL; vp = vp->next) {
+ for (vp = m_vps; vp != NULL; vp = vp->next) {
avpExport(m_rh, vp, &p, &remain);
}
{
VALUE_PAIR *vp;
- vp = pairfind(m_avps, PW_SESSION_TIMEOUT);
+ vp = pairfind(m_vps, PW_SESSION_TIMEOUT);
if (vp == NULL || vp->lvalue == 0)
return 0;
private:
bool allocRadHandle(const std::string &configFile);
const VALUE_PAIR *getAvps(void) const {
- return m_avps;
+ return m_vps;
}
struct rs_handle *m_rh;
- VALUE_PAIR *m_avps;
+ VALUE_PAIR *m_vps;
bool m_authenticated;
std::string m_configFile;
};