OpenSSH requires the exported name token to include the actual OID
of the selected mechanism. We were using an OID that identified a
family of GSS EAP mechanisms. We now use the concrete OID where
possible.
major = gssEapImportName(minor, &nameBuf,
(ctx->gssFlags & GSS_C_ANON_FLAG) ?
GSS_C_NT_ANONYMOUS : GSS_C_NT_USER_NAME,
major = gssEapImportName(minor, &nameBuf,
(ctx->gssFlags & GSS_C_ANON_FLAG) ?
GSS_C_NT_ANONYMOUS : GSS_C_NT_USER_NAME,
&ctx->initiatorName);
if (GSS_ERROR(major))
return major;
&ctx->initiatorName);
if (GSS_ERROR(major))
return major;
gssEapReleaseName(&tmpMinor, &ctx->initiatorName);
return gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME,
gssEapReleaseName(&tmpMinor, &ctx->initiatorName);
return gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME,
+ ctx->mechanismUsed, &ctx->initiatorName);
{
GSSEAP_MUTEX mutex; /* mutex protects attrCtx */
OM_uint32 flags;
{
GSSEAP_MUTEX mutex; /* mutex protects attrCtx */
OM_uint32 flags;
+ gss_OID mechanismUsed; /* this is immutable */
krb5_principal krbPrincipal; /* this is immutable */
struct gss_eap_attr_ctx *attrCtx;
};
krb5_principal krbPrincipal; /* this is immutable */
struct gss_eap_attr_ctx *attrCtx;
};
gss_name_t *output_name)
{
return gssEapImportName(minor, import_name_buffer,
gss_name_t *output_name)
{
return gssEapImportName(minor, import_name_buffer,
- input_name_type, output_name);
+ input_name_type, GSS_C_NO_OID, output_name);
ctx->acceptorName == GSS_C_NO_NAME) {
/* Accept target name hint from acceptor */
major = gssEapImportName(minor, inputToken,
ctx->acceptorName == GSS_C_NO_NAME) {
/* Accept target name hint from acceptor */
major = gssEapImportName(minor, inputToken,
- GSS_C_NT_USER_NAME, &ctx->acceptorName);
+ GSS_C_NT_USER_NAME,
+ ctx->mechanismUsed,
+ &ctx->acceptorName);
if (GSS_ERROR(major))
return major;
}
if (GSS_ERROR(major))
return major;
}
OM_uint32 gssEapImportName(OM_uint32 *minor,
const gss_buffer_t input_name_buffer,
gss_OID input_name_type,
OM_uint32 gssEapImportName(OM_uint32 *minor,
const gss_buffer_t input_name_buffer,
gss_OID input_name_type,
+ gss_OID input_mech_type,
gss_name_t *output_name);
OM_uint32 gssEapImportNameInternal(OM_uint32 *minor,
const gss_buffer_t input_name_buffer,
gss_name_t *output_name);
OM_uint32 gssEapImportNameInternal(OM_uint32 *minor,
const gss_buffer_t input_name_buffer,
}
if (nameBuf.length != 0) {
}
if (nameBuf.length != 0) {
- major = gssEapImportName(minor, &nameBuf, nameType, &cred->name);
+ gss_OID mech = GSS_C_NO_OID;
+
+ if (cred->mechanisms != GSS_C_NO_OID_SET &&
+ cred->mechanisms->count == 1)
+ mech = &cred->mechanisms->elements[0];
+
+ major = gssEapImportName(minor, &nameBuf, nameType, mech, &cred->name);
if (GSS_ERROR(major))
goto cleanup;
}
if (GSS_ERROR(major))
goto cleanup;
}
GSSEAP_KRB_INIT(&krbContext);
krb5_free_principal(krbContext, name->krbPrincipal);
GSSEAP_KRB_INIT(&krbContext);
krb5_free_principal(krbContext, name->krbPrincipal);
+ gssEapReleaseOid(&tmpMinor, &name->mechanismUsed);
gssEapReleaseAttrContext(&tmpMinor, name);
gssEapReleaseAttrContext(&tmpMinor, name);
remain = nameBuffer->length;
if (flags & EXPORT_NAME_FLAG_OID) {
remain = nameBuffer->length;
if (flags & EXPORT_NAME_FLAG_OID) {
- if (remain < 6 + GSS_EAP_MECHANISM->length)
+ gss_OID_desc mech;
+
+ /* TOK_ID || MECH_OID_LEN || MECH_OID */
+ if (remain < 6)
return GSS_S_BAD_NAME;
if (flags & EXPORT_NAME_FLAG_COMPOSITE)
return GSS_S_BAD_NAME;
if (flags & EXPORT_NAME_FLAG_COMPOSITE)
/* MECH_OID_LEN */
len = load_uint16_be(p);
/* MECH_OID_LEN */
len = load_uint16_be(p);
- if (len != 2 + GSS_EAP_MECHANISM->length)
return GSS_S_BAD_NAME;
UPDATE_REMAIN(2);
/* MECH_OID */
if (p[0] != 0x06)
return GSS_S_BAD_NAME;
return GSS_S_BAD_NAME;
UPDATE_REMAIN(2);
/* MECH_OID */
if (p[0] != 0x06)
return GSS_S_BAD_NAME;
- if (p[1] != GSS_EAP_MECHANISM->length)
- return GSS_S_BAD_MECH;
- if (memcmp(&p[2], GSS_EAP_MECHANISM->elements, GSS_EAP_MECHANISM->length))
- return GSS_S_BAD_MECH;
- UPDATE_REMAIN(2 + GSS_EAP_MECHANISM->length);
+
+ mech.length = p[1];
+ mech.elements = &p[2];
+
+ CHECK_REMAIN(mech.length);
+
+ if (!gssEapIsMechanismOid(&mech)) {
+ major = GSS_S_BAD_NAME;
+ *minor = GSSEAP_WRONG_MECH;
+ goto cleanup;
+ }
+
+ if (oidEqual(&mech, GSS_EAP_MECHANISM)) {
+ name->mechanismUsed = GSS_C_NO_OID;
+ } else if (!gssEapInternalizeOid(&mech, &name->mechanismUsed)) {
+ major = duplicateOid(minor, &mech, &name->mechanismUsed);
+ if (GSS_ERROR(major))
+ goto cleanup;
+ }
+
+ UPDATE_REMAIN(2 + mech.length);
gssEapImportName(OM_uint32 *minor,
const gss_buffer_t nameBuffer,
gss_OID nameType,
gssEapImportName(OM_uint32 *minor,
const gss_buffer_t nameBuffer,
gss_OID nameType,
+ gss_OID mechType,
+ gss_name_t *pName)
{
struct gss_eap_name_import_provider nameTypes[] = {
{ GSS_C_NT_USER_NAME, importUserName },
{
struct gss_eap_name_import_provider nameTypes[] = {
{ GSS_C_NT_USER_NAME, importUserName },
-
- *name = GSS_C_NO_NAME;
+ OM_uint32 major = GSS_S_BAD_NAMETYPE;
+ OM_uint32 tmpMinor;
+ gss_name_t name = GSS_C_NO_NAME;
if (nameType == GSS_C_NO_OID)
nameType = nameTypes[0].oid;
for (i = 0; i < sizeof(nameTypes) / sizeof(nameTypes[0]); i++) {
if (nameType == GSS_C_NO_OID)
nameType = nameTypes[0].oid;
for (i = 0; i < sizeof(nameTypes) / sizeof(nameTypes[0]); i++) {
- if (oidEqual(nameTypes[i].oid, nameType))
- return nameTypes[i].import(minor, nameBuffer, name);
+ if (oidEqual(nameTypes[i].oid, nameType)) {
+ major = nameTypes[i].import(minor, nameBuffer, &name);
+ break;
+ }
- return GSS_S_BAD_NAMETYPE;
+ if (major == GSS_S_COMPLETE &&
+ mechType != GSS_C_NO_OID) {
+ assert(gssEapIsConcreteMechanismOid(mechType));
+ assert(name->mechanismUsed == GSS_C_NO_OID);
+
+ if (!gssEapInternalizeOid(mechType, &name->mechanismUsed)) {
+ major = duplicateOid(minor, mechType, &name->mechanismUsed);
+ }
+ }
+
+ if (GSS_ERROR(major))
+ gssEapReleaseName(&tmpMinor, &name);
+ else
+ *pName = name;
+
+ return major;
size_t krbNameLen, exportedNameLen;
unsigned char *p;
gss_buffer_desc attrs = GSS_C_EMPTY_BUFFER;
size_t krbNameLen, exportedNameLen;
unsigned char *p;
gss_buffer_desc attrs = GSS_C_EMPTY_BUFFER;
exportedName->length = 0;
exportedName->value = NULL;
exportedName->length = 0;
exportedName->value = NULL;
+ if (name->mechanismUsed != GSS_C_NO_OID)
+ mech = name->mechanismUsed;
+ else
+ mech = GSS_EAP_MECHANISM;
+
GSSEAP_KRB_INIT(&krbContext);
*minor = krb5_unparse_name(krbContext, name->krbPrincipal, &krbName);
GSSEAP_KRB_INIT(&krbContext);
*minor = krb5_unparse_name(krbContext, name->krbPrincipal, &krbName);
exportedNameLen = 0;
if (flags & EXPORT_NAME_FLAG_OID) {
exportedNameLen = 0;
if (flags & EXPORT_NAME_FLAG_OID) {
- exportedNameLen += 6 + GSS_EAP_MECHANISM->length;
+ exportedNameLen += 6 + mech->length;
}
exportedNameLen += 4 + krbNameLen;
if (flags & EXPORT_NAME_FLAG_COMPOSITE) {
}
exportedNameLen += 4 + krbNameLen;
if (flags & EXPORT_NAME_FLAG_COMPOSITE) {
: TOK_TYPE_EXPORT_NAME,
p);
p += 2;
: TOK_TYPE_EXPORT_NAME,
p);
p += 2;
- store_uint16_be(GSS_EAP_MECHANISM->length + 2, p);
+ store_uint16_be(mech->length + 2, p);
p += 2;
/* MECH_OID */
*p++ = 0x06;
p += 2;
/* MECH_OID */
*p++ = 0x06;
- *p++ = GSS_EAP_MECHANISM->length & 0xff;
- memcpy(p, GSS_EAP_MECHANISM->elements, GSS_EAP_MECHANISM->length);
- p += GSS_EAP_MECHANISM->length;
+ *p++ = mech->length & 0xff;
+ memcpy(p, mech->elements, mech->length);
+ p += mech->length;
+ if (input_name->mechanismUsed == GSS_C_NO_OID) {
+ name->mechanismUsed = GSS_C_NO_OID;
+ } else if (gssEapIsConcreteMechanismOid(input_name->mechanismUsed)) {
+ if (!gssEapInternalizeOid(input_name->mechanismUsed,
+ &name->mechanismUsed)) {
+ major = duplicateOid(minor, input_name->mechanismUsed,
+ &name->mechanismUsed);
+ if (GSS_ERROR(major))
+ goto cleanup;
+ }
+ } else {
+ major = GSS_S_BAD_MECH;
+ *minor = GSSEAP_WRONG_MECH;
+ goto cleanup;
+ }
+
name->flags = input_name->flags;
*minor = krb5_copy_principal(krbContext, input_name->krbPrincipal,
name->flags = input_name->flags;
*minor = krb5_copy_principal(krbContext, input_name->krbPrincipal,
goto cleanup;
major = gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME,
goto cleanup;
major = gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME,
+ ctx->mechanismUsed, pMechName);
if (GSS_ERROR(major))
goto cleanup;
if (GSS_ERROR(major))
goto cleanup;