From: Luke Howard Date: Sun, 19 Sep 2010 20:16:15 +0000 (+0200) Subject: s/EXPORT_NAME_FLAG_ATTRS/EXPORT_NAME_FLAG_COMPOSITE X-Git-Url: http://www.project-moonshot.org/gitweb/?p=cyrus-sasl.git;a=commitdiff_plain;h=ecebdfdb34d6980fb1dcd483a270fea3d7e292a1 s/EXPORT_NAME_FLAG_ATTRS/EXPORT_NAME_FLAG_COMPOSITE --- diff --git a/mech_eap/export_name_composite.c b/mech_eap/export_name_composite.c index 6c4fef2..7b094f6 100644 --- a/mech_eap/export_name_composite.c +++ b/mech_eap/export_name_composite.c @@ -43,5 +43,6 @@ gss_export_name_composite(OM_uint32 *minor, } return gssEapExportNameInternal(minor, input_name, exported_name, - EXPORT_NAME_FLAG_OID | EXPORT_NAME_FLAG_ATTRS); + EXPORT_NAME_FLAG_OID | + EXPORT_NAME_FLAG_COMPOSITE); } diff --git a/mech_eap/export_sec_context.c b/mech_eap/export_sec_context.c index 92c42bc..54e5781 100644 --- a/mech_eap/export_sec_context.c +++ b/mech_eap/export_sec_context.c @@ -69,14 +69,14 @@ gssEapExportSecContext(OM_uint32 *minor, if (ctx->initiatorName != GSS_C_NO_NAME) { major = gssEapExportNameInternal(minor, ctx->initiatorName, &initiatorName, - EXPORT_NAME_FLAG_ATTRS); + EXPORT_NAME_FLAG_COMPOSITE); if (GSS_ERROR(major)) goto cleanup; } if (ctx->acceptorName != GSS_C_NO_NAME) { major = gssEapExportNameInternal(minor, ctx->acceptorName, &acceptorName, - EXPORT_NAME_FLAG_ATTRS); + EXPORT_NAME_FLAG_COMPOSITE); if (GSS_ERROR(major)) goto cleanup; } diff --git a/mech_eap/import_sec_context.c b/mech_eap/import_sec_context.c index 648bff5..6ef32b8 100644 --- a/mech_eap/import_sec_context.c +++ b/mech_eap/import_sec_context.c @@ -170,7 +170,7 @@ importName(OM_uint32 *minor, tmp.value = p + 4; major = gssEapImportNameInternal(minor, &tmp, pName, - EXPORT_NAME_FLAG_ATTRS); + EXPORT_NAME_FLAG_COMPOSITE); if (GSS_ERROR(major)) return major; } diff --git a/mech_eap/util.h b/mech_eap/util.h index 2429458..5e63616 100644 --- a/mech_eap/util.h +++ b/mech_eap/util.h @@ -282,7 +282,7 @@ gssEapValidateMechs(OM_uint32 *minor, /* util_name.c */ #define EXPORT_NAME_FLAG_OID 0x1 -#define EXPORT_NAME_FLAG_ATTRS 0x2 +#define EXPORT_NAME_FLAG_COMPOSITE 0x2 OM_uint32 gssEapAllocName(OM_uint32 *minor, gss_name_t *pName); OM_uint32 gssEapReleaseName(OM_uint32 *minor, gss_name_t *pName); diff --git a/mech_eap/util_attr.cpp b/mech_eap/util_attr.cpp index 561630f..90f8d2b 100644 --- a/mech_eap/util_attr.cpp +++ b/mech_eap/util_attr.cpp @@ -105,8 +105,7 @@ gss_eap_attr_ctx::attributeTypeToPrefix(unsigned int type) } /* - * Initialize a context from an existing context. All non-NULL providers - * in the existing context are duplicated, otherwise FALSE is returned. + * Initialize a context from an existing context. */ bool gss_eap_attr_ctx::initFromExistingContext(const gss_eap_attr_ctx *manager) @@ -175,7 +174,7 @@ gss_eap_attr_ctx::initFromBuffer(const gss_buffer_t buffer) gss_eap_attr_ctx::~gss_eap_attr_ctx(void) { - for (unsigned int i = 0; i < ATTR_TYPE_MAX; i++) + for (unsigned int i = ATTR_TYPE_MIN; i < ATTR_TYPE_MAX; i++) delete m_providers[i]; } @@ -195,6 +194,12 @@ gss_eap_attr_ctx::getProvider(const gss_buffer_t prefix) const return m_providers[type]; } +gss_eap_attr_provider * +gss_eap_attr_ctx::getPrimaryProvider(void) const +{ + return m_providers[ATTR_TYPE_RADIUS]; +} + void gss_eap_attr_ctx::setAttribute(int complete, const gss_buffer_t attr, @@ -268,7 +273,7 @@ addAttribute(const gss_eap_attr_provider *provider, major = gss_add_buffer_set_member(&minor, prefix, &args->attrs); } - return GSS_ERROR(major) ? false : true; + return GSS_ERROR(major) == false; } bool @@ -353,12 +358,6 @@ gss_eap_attr_ctx::releaseAnyNameMapping(gss_buffer_t type_id, provider->releaseAnyNameMapping(type_id, input); } -gss_eap_attr_provider * -gss_eap_attr_ctx::getPrimaryProvider(void) const -{ - return m_providers[ATTR_TYPE_RADIUS]; -} - void gss_eap_attr_ctx::exportToBuffer(gss_buffer_t buffer) const { diff --git a/mech_eap/util_name.c b/mech_eap/util_name.c index 26fccbc..2c25832 100644 --- a/mech_eap/util_name.c +++ b/mech_eap/util_name.c @@ -249,7 +249,7 @@ gssEapImportNameInternal(OM_uint32 *minor, if (remain < 6 + GSS_EAP_MECHANISM->length + 4) return GSS_S_BAD_NAME; - if (flags & EXPORT_NAME_FLAG_ATTRS) + if (flags & EXPORT_NAME_FLAG_COMPOSITE) tokType = TOK_TYPE_EXPORT_NAME_COMPOSITE; else tokType = TOK_TYPE_EXPORT_NAME; @@ -289,7 +289,7 @@ gssEapImportNameInternal(OM_uint32 *minor, if (GSS_ERROR(major)) goto cleanup; - if (flags & EXPORT_NAME_FLAG_ATTRS) { + if (flags & EXPORT_NAME_FLAG_COMPOSITE) { gss_buffer_desc buf; CHECK_REMAIN(4); @@ -340,7 +340,7 @@ gssEapImportName(OM_uint32 *minor, else if (oidEqual(nameType, GSS_C_NT_COMPOSITE_EXPORT)) major = gssEapImportNameInternal(minor, nameBuffer, name, EXPORT_NAME_FLAG_OID | - EXPORT_NAME_FLAG_ATTRS); + EXPORT_NAME_FLAG_COMPOSITE); #endif else major = GSS_S_BAD_NAMETYPE; @@ -391,7 +391,7 @@ gssEapExportNameInternal(OM_uint32 *minor, exportedName->length += 6 + GSS_EAP_MECHANISM->length; } exportedName->length += 4 + krbNameLen; - if (flags & EXPORT_NAME_FLAG_ATTRS) { + if (flags & EXPORT_NAME_FLAG_COMPOSITE) { major = gssEapExportAttrContext(minor, name, &attrs); if (GSS_ERROR(major)) goto cleanup; @@ -408,7 +408,7 @@ gssEapExportNameInternal(OM_uint32 *minor, if (flags & EXPORT_NAME_FLAG_OID) { /* TOK | MECH_OID_LEN */ - store_uint16_be((flags & EXPORT_NAME_FLAG_ATTRS) + store_uint16_be((flags & EXPORT_NAME_FLAG_COMPOSITE) ? TOK_TYPE_EXPORT_NAME_COMPOSITE : TOK_TYPE_EXPORT_NAME, p); @@ -431,7 +431,7 @@ gssEapExportNameInternal(OM_uint32 *minor, memcpy(p, krbName, krbNameLen); p += krbNameLen; - if (flags & EXPORT_NAME_FLAG_ATTRS) { + if (flags & EXPORT_NAME_FLAG_COMPOSITE) { store_uint32_be(attrs.length, p); memcpy(&p[4], attrs.value, attrs.length); p += 4 + attrs.length;