gss: merge Apple name helper APIs
Add helper APIs to the mechanism glue from the Apple implementation. gss_mg_export_name() can be used by a mechanism to create an exported name (this is used by the future SAnon implementation). _gss_mech_import_name() allows the mechanism to pass in a list of parsing functions for specific name tiypes. This commit only adds support to the mechanism glue itself.
This commit is contained in:
@@ -30,6 +30,20 @@
|
||||
|
||||
#include "mech_locl.h"
|
||||
|
||||
gss_name_t
|
||||
_gss_mg_get_underlying_mech_name(gss_name_t name,
|
||||
gss_const_OID mech)
|
||||
{
|
||||
struct _gss_name *n = (struct _gss_name *)name;
|
||||
struct _gss_mechanism_name *mn;
|
||||
|
||||
HEIM_TAILQ_FOREACH(mn, &n->gn_mn, gmn_link) {
|
||||
if (gss_oid_equal(mech, mn->gmn_mech_oid))
|
||||
return mn->gmn_name;
|
||||
}
|
||||
return GSS_C_NO_NAME;
|
||||
}
|
||||
|
||||
OM_uint32
|
||||
_gss_find_mn(OM_uint32 *minor_status,
|
||||
struct _gss_name *name,
|
||||
@@ -138,3 +152,111 @@ _gss_mg_release_name(struct _gss_name *name)
|
||||
gss_release_buffer(&junk, &name->gn_value);
|
||||
free(name);
|
||||
}
|
||||
|
||||
void
|
||||
_gss_mg_check_name(gss_const_name_t name)
|
||||
{
|
||||
if (name == NULL) return;
|
||||
}
|
||||
|
||||
/*
|
||||
*
|
||||
*/
|
||||
|
||||
OM_uint32
|
||||
_gss_mech_import_name(OM_uint32 * minor_status,
|
||||
gss_const_OID mech,
|
||||
struct _gss_name_type *names,
|
||||
const gss_buffer_t input_name_buffer,
|
||||
gss_const_OID input_name_type,
|
||||
gss_name_t *output_name)
|
||||
{
|
||||
struct _gss_name_type *name;
|
||||
gss_buffer_t name_buffer = input_name_buffer;
|
||||
gss_buffer_desc export_name;
|
||||
|
||||
*minor_status = 0;
|
||||
|
||||
if (output_name == NULL)
|
||||
return GSS_S_CALL_INACCESSIBLE_WRITE;
|
||||
|
||||
*output_name = GSS_C_NO_NAME;
|
||||
|
||||
/*
|
||||
* If its a exported name, strip of the mech glue.
|
||||
*/
|
||||
|
||||
if (gss_oid_equal(input_name_type, GSS_C_NT_EXPORT_NAME)) {
|
||||
unsigned char *p;
|
||||
uint32_t length;
|
||||
|
||||
if (name_buffer->length < 10 + mech->length)
|
||||
return GSS_S_BAD_NAME;
|
||||
|
||||
/* TOK, MECH_OID_LEN, DER(MECH_OID), NAME_LEN, NAME */
|
||||
|
||||
p = name_buffer->value;
|
||||
|
||||
if (memcmp(&p[0], "\x04\x01\x00", 3) != 0 ||
|
||||
p[3] != mech->length + 2 ||
|
||||
p[4] != 0x06 ||
|
||||
p[5] != mech->length ||
|
||||
memcmp(&p[6], mech->elements, mech->length) != 0)
|
||||
return GSS_S_BAD_NAME;
|
||||
|
||||
p += 6 + mech->length;
|
||||
|
||||
length = p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3];
|
||||
p += 4;
|
||||
|
||||
if (length > name_buffer->length - 10 - mech->length)
|
||||
return GSS_S_BAD_NAME;
|
||||
|
||||
/*
|
||||
* Point this to the mech specific name part, don't modifity
|
||||
* orignal input_name_buffer.
|
||||
*/
|
||||
|
||||
export_name.length = length;
|
||||
export_name.value = p;
|
||||
|
||||
name_buffer = &export_name;
|
||||
}
|
||||
|
||||
for (name = names; name->gnt_parse != NULL; name++) {
|
||||
if (gss_oid_equal(input_name_type, name->gnt_name_type)
|
||||
|| (name->gnt_name_type == GSS_C_NO_OID && input_name_type == GSS_C_NO_OID))
|
||||
return name->gnt_parse(minor_status, mech, name_buffer,
|
||||
input_name_type, output_name);
|
||||
}
|
||||
|
||||
return GSS_S_BAD_NAMETYPE;
|
||||
}
|
||||
|
||||
OM_uint32
|
||||
_gss_mech_inquire_names_for_mech(OM_uint32 * minor_status,
|
||||
struct _gss_name_type *names,
|
||||
gss_OID_set *name_types)
|
||||
{
|
||||
struct _gss_name_type *name;
|
||||
OM_uint32 ret, junk;
|
||||
|
||||
ret = gss_create_empty_oid_set(minor_status, name_types);
|
||||
if (ret != GSS_S_COMPLETE)
|
||||
return ret;
|
||||
|
||||
for (name = names; name->gnt_parse != NULL; name++) {
|
||||
if (name->gnt_name_type == GSS_C_NO_OID)
|
||||
continue;
|
||||
ret = gss_add_oid_set_member(minor_status,
|
||||
name->gnt_name_type,
|
||||
name_types);
|
||||
if (ret != GSS_S_COMPLETE)
|
||||
break;
|
||||
}
|
||||
|
||||
if (ret != GSS_S_COMPLETE)
|
||||
gss_release_oid_set(&junk, name_types);
|
||||
|
||||
return GSS_S_COMPLETE;
|
||||
}
|
||||
|
Reference in New Issue
Block a user