oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(import_export_name): new function, parses a GSS_C_NT_EXPORT_NAME

Browse Source 
(import_krb5_name): factor out common code of parsing krb5 name
(gss_oid_equal): rename from oid_equal


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11732 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-03-16 17:33:31 +00:00
parent f5f5c968b6
commit b310e96168
2 changed files with 184 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
lib/gssapi/import_name.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2002 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2003 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -36,27 +36,14 @@
RCSID("$Id$"); RCSID("$Id$");
static OM_uint32 static OM_uint32
import_krb5_name (OM_uint32 *minor_status, parse_krb5_name (OM_uint32 *minor_status,
const gss_buffer_t input_name_buffer, const char *name,
gss_name_t *output_name) gss_name_t *output_name)
{ {
krb5_error_code kerr; krb5_error_code kerr;
char *tmp;
tmp = malloc (input_name_buffer->length + 1); kerr = krb5_parse_name (gssapi_krb5_context, name, output_name);
if (tmp == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
memcpy (tmp,
input_name_buffer->value,
input_name_buffer->length);
tmp[input_name_buffer->length] = '\0';
kerr = krb5_parse_name (gssapi_krb5_context,
tmp,
output_name);
free (tmp);
if (kerr == 0) if (kerr == 0)
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
else if (kerr == KRB5_PARSE_ILLCHAR || kerr == KRB5_PARSE_MALFORMED) { else if (kerr == KRB5_PARSE_ILLCHAR || kerr == KRB5_PARSE_MALFORMED) {
@@ -70,6 +57,30 @@ import_krb5_name (OM_uint32 *minor_status,
} }
} }
static OM_uint32
import_krb5_name (OM_uint32 *minor_status,
const gss_buffer_t input_name_buffer,
gss_name_t *output_name)
{
OM_uint32 ret;
char *tmp;
tmp = malloc (input_name_buffer->length + 1);
if (tmp == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
memcpy (tmp,
input_name_buffer->value,
input_name_buffer->length);
tmp[input_name_buffer->length] = '\0';
ret = parse_krb5_name(minor_status, tmp, output_name);
free(tmp);
return ret;
}
static OM_uint32 static OM_uint32
import_hostbased_name (OM_uint32 *minor_status, import_hostbased_name (OM_uint32 *minor_status,
const gss_buffer_t input_name_buffer, const gss_buffer_t input_name_buffer,
@@ -81,6 +92,8 @@ import_hostbased_name (OM_uint32 *minor_status,
char *host; char *host;
char local_hostname[MAXHOSTNAMELEN]; char local_hostname[MAXHOSTNAMELEN];
*output_name = NULL;
tmp = malloc (input_name_buffer->length + 1); tmp = malloc (input_name_buffer->length + 1);
if (tmp == NULL) { if (tmp == NULL) {
*minor_status = ENOMEM; *minor_status = ENOMEM;
@@ -124,8 +137,55 @@ import_hostbased_name (OM_uint32 *minor_status,
} }
} }
static int static OM_uint32
oid_equal(const gss_OID a, const gss_OID b) import_export_name (OM_uint32 *minor_status,
const gss_buffer_t input_name_buffer,
gss_name_t *output_name)
{
unsigned char *p;
uint32_t length;
OM_uint32 ret;
char *name;
if (input_name_buffer->length < 10 + GSS_KRB5_MECHANISM->length)
return GSS_S_BAD_NAME;
/* TOK, MECH_OID_LEN, DER(MECH_OID), NAME_LEN, NAME */
p = input_name_buffer->value;
if (memcmp(&p[0], "\x04\x01\x00", 3) != 0 ||
p[3] != GSS_KRB5_MECHANISM->length + 2 ||
p[4] != 0x06 ||
p[5] != GSS_KRB5_MECHANISM->length ||
memcmp(&p[6], GSS_KRB5_MECHANISM->elements,
GSS_KRB5_MECHANISM->length) != 0)
return GSS_S_BAD_NAME;
p += 6 + GSS_KRB5_MECHANISM->length;
length = p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3];
p += 4;
if (length > input_name_buffer->length - 10 - GSS_KRB5_MECHANISM->length)
return GSS_S_BAD_NAME;
name = malloc(length + 1);
if (name == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
memcpy(name, p, length);
name[length] = '\0';
ret = parse_krb5_name(minor_status, name, output_name);
free(name);
return ret;
}
int
gss_oid_equal(const gss_OID a, const gss_OID b)
{ {
if (a == b) if (a == b)
return 1; return 1;
@@ -144,18 +204,25 @@ OM_uint32 gss_import_name
{ {
GSSAPI_KRB5_INIT (); GSSAPI_KRB5_INIT ();
if (oid_equal(input_name_type, GSS_C_NT_HOSTBASED_SERVICE)) *minor_status = 0;
*output_name = GSS_C_NO_NAME;
if (gss_oid_equal(input_name_type, GSS_C_NT_HOSTBASED_SERVICE))
return import_hostbased_name (minor_status, return import_hostbased_name (minor_status,
input_name_buffer, input_name_buffer,
output_name); output_name);
else if (input_name_type == GSS_C_NO_OID else if (gss_oid_equal(input_name_type, GSS_C_NO_OID)
|| oid_equal(input_name_type, GSS_C_NT_USER_NAME) || gss_oid_equal(input_name_type, GSS_C_NT_USER_NAME)
|| oid_equal(input_name_type, GSS_KRB5_NT_PRINCIPAL_NAME)) || gss_oid_equal(input_name_type, GSS_KRB5_NT_PRINCIPAL_NAME))
/* default printable syntax */ /* default printable syntax */
return import_krb5_name (minor_status, return import_krb5_name (minor_status,
input_name_buffer, input_name_buffer,
output_name); output_name);
else { else if (gss_oid_equal(input_name_type, GSS_C_NT_EXPORT_NAME)) {
return import_export_name(minor_status,
input_name_buffer,
output_name);
} else {
*minor_status = 0; *minor_status = 0;
return GSS_S_BAD_NAMETYPE; return GSS_S_BAD_NAMETYPE;
} }

117
lib/gssapi/krb5/import_name.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2002 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2003 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -36,27 +36,14 @@
RCSID("$Id$"); RCSID("$Id$");
static OM_uint32 static OM_uint32
import_krb5_name (OM_uint32 *minor_status, parse_krb5_name (OM_uint32 *minor_status,
const gss_buffer_t input_name_buffer, const char *name,
gss_name_t *output_name) gss_name_t *output_name)
{ {
krb5_error_code kerr; krb5_error_code kerr;
char *tmp;
tmp = malloc (input_name_buffer->length + 1); kerr = krb5_parse_name (gssapi_krb5_context, name, output_name);
if (tmp == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
memcpy (tmp,
input_name_buffer->value,
input_name_buffer->length);
tmp[input_name_buffer->length] = '\0';
kerr = krb5_parse_name (gssapi_krb5_context,
tmp,
output_name);
free (tmp);
if (kerr == 0) if (kerr == 0)
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
else if (kerr == KRB5_PARSE_ILLCHAR || kerr == KRB5_PARSE_MALFORMED) { else if (kerr == KRB5_PARSE_ILLCHAR || kerr == KRB5_PARSE_MALFORMED) {
@@ -70,6 +57,30 @@ import_krb5_name (OM_uint32 *minor_status,
} }
} }
static OM_uint32
import_krb5_name (OM_uint32 *minor_status,
const gss_buffer_t input_name_buffer,
gss_name_t *output_name)
{
OM_uint32 ret;
char *tmp;
tmp = malloc (input_name_buffer->length + 1);
if (tmp == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
memcpy (tmp,
input_name_buffer->value,
input_name_buffer->length);
tmp[input_name_buffer->length] = '\0';
ret = parse_krb5_name(minor_status, tmp, output_name);
free(tmp);
return ret;
}
static OM_uint32 static OM_uint32
import_hostbased_name (OM_uint32 *minor_status, import_hostbased_name (OM_uint32 *minor_status,
const gss_buffer_t input_name_buffer, const gss_buffer_t input_name_buffer,
@@ -81,6 +92,8 @@ import_hostbased_name (OM_uint32 *minor_status,
char *host; char *host;
char local_hostname[MAXHOSTNAMELEN]; char local_hostname[MAXHOSTNAMELEN];
*output_name = NULL;
tmp = malloc (input_name_buffer->length + 1); tmp = malloc (input_name_buffer->length + 1);
if (tmp == NULL) { if (tmp == NULL) {
*minor_status = ENOMEM; *minor_status = ENOMEM;
@@ -124,8 +137,55 @@ import_hostbased_name (OM_uint32 *minor_status,
} }
} }
static int static OM_uint32
oid_equal(const gss_OID a, const gss_OID b) import_export_name (OM_uint32 *minor_status,
const gss_buffer_t input_name_buffer,
gss_name_t *output_name)
{
unsigned char *p;
uint32_t length;
OM_uint32 ret;
char *name;
if (input_name_buffer->length < 10 + GSS_KRB5_MECHANISM->length)
return GSS_S_BAD_NAME;
/* TOK, MECH_OID_LEN, DER(MECH_OID), NAME_LEN, NAME */
p = input_name_buffer->value;
if (memcmp(&p[0], "\x04\x01\x00", 3) != 0 ||
p[3] != GSS_KRB5_MECHANISM->length + 2 ||
p[4] != 0x06 ||
p[5] != GSS_KRB5_MECHANISM->length ||
memcmp(&p[6], GSS_KRB5_MECHANISM->elements,
GSS_KRB5_MECHANISM->length) != 0)
return GSS_S_BAD_NAME;
p += 6 + GSS_KRB5_MECHANISM->length;
length = p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3];
p += 4;
if (length > input_name_buffer->length - 10 - GSS_KRB5_MECHANISM->length)
return GSS_S_BAD_NAME;
name = malloc(length + 1);
if (name == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
memcpy(name, p, length);
name[length] = '\0';
ret = parse_krb5_name(minor_status, name, output_name);
free(name);
return ret;
}
int
gss_oid_equal(const gss_OID a, const gss_OID b)
{ {
if (a == b) if (a == b)
return 1; return 1;
@@ -144,18 +204,25 @@ OM_uint32 gss_import_name
{ {
GSSAPI_KRB5_INIT (); GSSAPI_KRB5_INIT ();
if (oid_equal(input_name_type, GSS_C_NT_HOSTBASED_SERVICE)) *minor_status = 0;
*output_name = GSS_C_NO_NAME;
if (gss_oid_equal(input_name_type, GSS_C_NT_HOSTBASED_SERVICE))
return import_hostbased_name (minor_status, return import_hostbased_name (minor_status,
input_name_buffer, input_name_buffer,
output_name); output_name);
else if (input_name_type == GSS_C_NO_OID else if (gss_oid_equal(input_name_type, GSS_C_NO_OID)
|| oid_equal(input_name_type, GSS_C_NT_USER_NAME) || gss_oid_equal(input_name_type, GSS_C_NT_USER_NAME)
|| oid_equal(input_name_type, GSS_KRB5_NT_PRINCIPAL_NAME)) || gss_oid_equal(input_name_type, GSS_KRB5_NT_PRINCIPAL_NAME))
/* default printable syntax */ /* default printable syntax */
return import_krb5_name (minor_status, return import_krb5_name (minor_status,
input_name_buffer, input_name_buffer,
output_name); output_name);
else { else if (gss_oid_equal(input_name_type, GSS_C_NT_EXPORT_NAME)) {
return import_export_name(minor_status,
input_name_buffer,
output_name);
} else {
*minor_status = 0; *minor_status = 0;
return GSS_S_BAD_NAMETYPE; return GSS_S_BAD_NAMETYPE;
} }