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

gss: add oid/buffer storage helpers to mechglue

Browse Source 
The functions for storing and retrieving GSS OIDs and buffers from
krb5_storage, added in 6554dc69, are generally useful. Move those into private
_gss_mg_XXX() API and update gss_{export,import}_{cred,sec_context} to use them
where appropriate.
This commit is contained in:
Luke Howard
2021-08-10 10:15:08 +10:00
parent 490173b417
commit 43858eaf9b
7 changed files with 210 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
lib/gssapi/mech/gss_cred.c
View File

@@ -35,47 +35,35 @@
#include <krb5.h>
static OM_uint32
export_oid_set(OM_uint32 *minor_status,
gss_const_OID mech,
gss_const_OID_set oids,
krb5_storage *sp)
store_mech_oid_and_oid_set(OM_uint32 *minor_status,
krb5_storage *sp,
gss_const_OID mech,
gss_const_OID_set oids)
{
krb5_error_code ret;
krb5_data data;
OM_uint32 ret;
size_t i, len;
data.length = mech->length;
data.data = mech->elements;
ret = krb5_store_data(sp, data);
ret = _gss_mg_store_oid(minor_status, sp, mech);
if (ret)
goto out;
return ret;
for (i = 0, len = 0; i < oids->count; i++)
len += 4 + oids->elements[i].length;
ret = krb5_store_uint32(sp, len);
if (ret)
goto out;
*minor_status = krb5_store_uint32(sp, len);
if (*minor_status)
return GSS_S_FAILURE;
for (i = 0; i < oids->count; i++) {
data.length = oids->elements[i].length;
data.data = oids->elements[i].elements;
ret = krb5_store_data(sp, data);
ret = _gss_mg_store_oid(minor_status, sp, &oids->elements[i]);
if (ret)
goto out;
return ret;
}
ret = krb5_storage_to_data(sp, &data);
if (ret)
goto out;
out:
*minor_status = ret;
return ret ? GSS_S_FAILURE : GSS_S_COMPLETE;
return GSS_S_COMPLETE;
}
/*
* format: any number of:
* mech-len: int32
@@ -144,8 +132,9 @@ gss_export_cred(OM_uint32 * minor_status,
}
if (cred->gc_neg_mechs != GSS_C_NO_OID_SET) {
major = export_oid_set(minor_status, GSS_SPNEGO_MECHANISM,
cred->gc_neg_mechs, sp);
major = store_mech_oid_and_oid_set(minor_status, sp,
GSS_SPNEGO_MECHANISM,
cred->gc_neg_mechs);
if (major != GSS_S_COMPLETE) {
krb5_storage_free(sp);
return major;
@@ -179,7 +168,6 @@ import_oid_set(OM_uint32 *minor_status,
gss_OID_set *oids)
{
OM_uint32 major, junk;
krb5_error_code ret;
krb5_storage *sp = NULL;
*oids = GSS_C_NO_OID_SET;
@@ -199,27 +187,17 @@ import_oid_set(OM_uint32 *minor_status,
}
while (1) {
gss_OID_desc oid;
krb5_data data;
gss_OID oid;
ret = krb5_ret_data(sp, &data);
if (ret == HEIM_ERR_EOF)
major = _gss_mg_ret_oid(minor_status, sp, &oid);
if (*minor_status == HEIM_ERR_EOF)
break;
else if (ret) {
*minor_status = ret;
major = GSS_S_FAILURE;
else if (major)
goto out;
}
oid.elements = data.data;
oid.length = (OM_uint32)data.length;
major = gss_add_oid_set_member(minor_status, &oid, oids);
if (major != GSS_S_COMPLETE) {
krb5_data_free(&data);
major = gss_add_oid_set_member(minor_status, oid, oids);
if (major != GSS_S_COMPLETE)
goto out;
}
krb5_data_free(&data);
}
major = GSS_S_COMPLETE;
@@ -239,11 +217,9 @@ gss_import_cred(OM_uint32 * minor_status,
gss_cred_id_t * cred_handle)
{
gssapi_mech_interface m;
krb5_error_code ret;
struct _gss_cred *cred;
krb5_storage *sp = NULL;
OM_uint32 major, junk;
krb5_data data;
*cred_handle = GSS_C_NO_CREDENTIAL;
@@ -271,21 +247,15 @@ gss_import_cred(OM_uint32 * minor_status,
struct _gss_mechanism_cred *mc;
gss_buffer_desc buffer;
gss_cred_id_t mcred;
gss_OID_desc oid;
gss_OID oid;
ret = krb5_ret_data(sp, &data);
if (ret == HEIM_ERR_EOF) {
major = _gss_mg_ret_oid(minor_status, sp, &oid);
if (*minor_status == HEIM_ERR_EOF)
break;
} else if (ret) {
*minor_status = ret;
major = GSS_S_FAILURE;
else if (major != GSS_S_COMPLETE)
goto out;
}
oid.elements = data.data;
oid.length = (OM_uint32)data.length;
m = __gss_get_mechanism(&oid);
krb5_data_free(&data);
m = __gss_get_mechanism(oid);
if (!m) {
*minor_status = 0;
major = GSS_S_BAD_MECH;
@@ -299,19 +269,18 @@ gss_import_cred(OM_uint32 * minor_status,
goto out;
}
ret = krb5_ret_data(sp, &data);
if (ret) {
*minor_status = ret;
major = GSS_S_FAILURE;
major = _gss_mg_ret_buffer(minor_status, sp, &buffer);
if (major != GSS_S_COMPLETE)
goto out;
if (buffer.value == NULL) {
major = GSS_S_DEFECTIVE_TOKEN;
goto out;
}
buffer.value = data.data;
buffer.length = data.length;
if (gss_oid_equal(&m->gm_mech_oid, GSS_SPNEGO_MECHANISM)) {
major = import_oid_set(minor_status, &buffer, &cred->gc_neg_mechs);
krb5_data_free(&data);
gss_release_buffer(&junk, &buffer);
if (major != GSS_S_COMPLETE)
goto out;
else
@@ -320,12 +289,11 @@ gss_import_cred(OM_uint32 * minor_status,
major = m->gm_import_cred(minor_status,
&buffer, &mcred);
krb5_data_free(&data);
if (major) {
gss_release_buffer(&junk, &buffer);
if (major != GSS_S_COMPLETE)
goto out;
}
mc = malloc(sizeof(struct _gss_mechanism_cred));
mc = calloc(1, sizeof(struct _gss_mechanism_cred));
if (mc == NULL) {
*minor_status = EINVAL;
major = GSS_S_FAILURE;

22
lib/gssapi/mech/gss_export_sec_context.c
View File

@@ -86,12 +86,10 @@ gss_export_sec_context(OM_uint32 *minor_status,
*minor_status = kret;
goto failure;
}
kret = krb5_store_datalen(sp, ctx->gc_input.value,
ctx->gc_input.length);
if (kret) {
*minor_status = kret;
major_status = _gss_mg_store_buffer(minor_status, sp,
&ctx->gc_input);
if (major_status != GSS_S_COMPLETE)
goto failure;
}
} else if (ctx->gc_ctx == GSS_C_NO_CONTEXT) {
gss_delete_sec_context(&tmp_minor, context_handle,
GSS_C_NO_BUFFER);
@@ -109,18 +107,14 @@ gss_export_sec_context(OM_uint32 *minor_status,
goto failure;
}
kret = krb5_store_datalen(sp, m->gm_mech_oid.elements,
m->gm_mech_oid.length);
if (kret) {
*minor_status = kret;
major_status = _gss_mg_store_oid(minor_status, sp,
&m->gm_mech_oid);
if (major_status != GSS_S_COMPLETE)
goto failure;
}
kret = krb5_store_datalen(sp, buf.value, buf.length);
if (kret) {
*minor_status = kret;
major_status = _gss_mg_store_buffer(minor_status, sp, &buf);
if (major_status != GSS_S_COMPLETE)
goto failure;
}
}
kret = krb5_storage_to_data(sp, &data);

44
lib/gssapi/mech/gss_import_sec_context.c
View File

@@ -35,11 +35,9 @@ gss_import_sec_context(OM_uint32 *minor_status,
{
OM_uint32 ret = GSS_S_FAILURE, tmp_minor;
krb5_storage *sp;
krb5_data data;
gssapi_mech_interface m;
struct _gss_context *ctx = NULL;
gss_OID_desc mech_oid;
gss_buffer_desc buf;
gss_buffer_desc buf = GSS_C_EMPTY_BUFFER;
unsigned char verflags;
_gss_mg_log(10, "gss-isc called");
@@ -85,42 +83,51 @@ gss_import_sec_context(OM_uint32 *minor_status,
if (krb5_ret_uint32(sp, &target_len))
goto failure;
if (krb5_ret_data(sp, &data))
ret = _gss_mg_ret_buffer(minor_status, sp, &buf);
if (ret != GSS_S_COMPLETE)
goto failure;
ctx->gc_input.value = calloc(target_len, 1);
ctx->gc_input.value = calloc(target_len, 1);
if (ctx->gc_input.value == NULL)
goto failure;
ctx->gc_target_len = target_len;
ctx->gc_input.length = data.length;
memcpy(ctx->gc_input.value, data.data, data.length);
ctx->gc_input.length = buf.length;
if (buf.value)
memcpy(ctx->gc_input.value, buf.value, buf.length);
krb5_data_free(&data);
gss_release_buffer(&tmp_minor, &buf);
}
if (verflags & EXPORT_CONTEXT_FLAG_MECH_CTX) {
if (krb5_ret_data(sp, &data))
gss_OID mech_oid;
ret = _gss_mg_ret_oid(minor_status, sp, &mech_oid);
if (ret != GSS_S_COMPLETE)
goto failure;
mech_oid.length = data.length;
mech_oid.elements = data.data;
m = __gss_get_mechanism(&mech_oid);
krb5_data_free(&data);
if (mech_oid == GSS_C_NO_OID) {
ret = GSS_S_BAD_MECH;
goto failure;
}
m = __gss_get_mechanism(mech_oid);
if (m == NULL) {
ret = GSS_S_DEFECTIVE_TOKEN;
goto failure;
}
ctx->gc_mech = m;
if (krb5_ret_data(sp, &data))
goto failure;
ret = _gss_mg_ret_buffer(minor_status, sp, &buf);
if (ret != GSS_S_COMPLETE)
goto failure;
buf.length = data.length;
buf.value = data.data;
if (buf.value == NULL) {
ret = GSS_S_DEFECTIVE_TOKEN;
goto failure;
}
ret = m->gm_import_sec_context(minor_status, &buf, &ctx->gc_ctx);
_gss_secure_release_buffer(&tmp_minor, &buf);
if (ret != GSS_S_COMPLETE) {
_gss_mg_error(m, *minor_status);
goto failure;
@@ -135,5 +142,6 @@ gss_import_sec_context(OM_uint32 *minor_status,
failure:
free(ctx);
krb5_storage_free(sp);
_gss_secure_release_buffer(&tmp_minor, &buf);
return ret;
}

86
lib/gssapi/mech/gss_utils.c
View File

@@ -236,3 +236,89 @@ _gss_mg_decode_be_uint16(const void *ptr, uint16_t *n)
const uint8_t *p = ptr;
*n = (p[0] << 24) | (p[1] << 16);
}
OM_uint32
_gss_mg_ret_oid(OM_uint32 *minor,
krb5_storage *sp,
gss_OID *oidp)
{
krb5_data data;
gss_OID_desc oid;
OM_uint32 major;
*minor = 0;
*oidp = GSS_C_NO_OID;
*minor = krb5_ret_data(sp, &data);
if (*minor)
return GSS_S_FAILURE;
if (data.length) {
oid.length = data.length;
oid.elements = data.data;
major = _gss_intern_oid(minor, &oid, oidp);
} else
major = GSS_S_COMPLETE;
krb5_data_free(&data);
return major;
}
OM_uint32
_gss_mg_store_oid(OM_uint32 *minor,
krb5_storage *sp,
gss_const_OID oid)
{
krb5_data data;
if (oid) {
data.length = oid->length;
data.data = oid->elements;
} else
krb5_data_zero(&data);
*minor = krb5_store_data(sp, data);
return *minor ? GSS_S_FAILURE : GSS_S_COMPLETE;
}
OM_uint32
_gss_mg_ret_buffer(OM_uint32 *minor,
krb5_storage *sp,
gss_buffer_t buffer)
{
krb5_data data;
_mg_buffer_zero(buffer);
*minor = krb5_ret_data(sp, &data);
if (*minor == 0) {
if (data.length) {
buffer->length = data.length;
buffer->value = data.data;
} else
krb5_data_free(&data);
}
return *minor ? GSS_S_FAILURE : GSS_S_COMPLETE;
}
OM_uint32
_gss_mg_store_buffer(OM_uint32 *minor,
krb5_storage *sp,
gss_const_buffer_t buffer)
{
krb5_data data;
if (buffer) {
data.length = buffer->length;
data.data = buffer->value;
} else
krb5_data_zero(&data);
*minor = krb5_store_data(sp, data);
return *minor ? GSS_S_FAILURE : GSS_S_COMPLETE;
}

27
lib/gssapi/mech/utils.h
View File

@@ -53,3 +53,30 @@ _gss_mg_import_rfc4121_context(OM_uint32 *minor,
int32_t rfc3961_enctype,
gss_const_buffer_t session_key,
gss_ctx_id_t *rfc4121_context_handle);
#include <krb5.h>
/*
* Note: functions below support zero-length OIDs and buffers and will
* return NULL values. Callers should handle accordingly.
*/
OM_uint32
_gss_mg_ret_oid(OM_uint32 *minor,
krb5_storage *sp,
gss_OID *oidp);
OM_uint32
_gss_mg_store_oid(OM_uint32 *minor,
krb5_storage *sp,
gss_const_OID oid);
OM_uint32
_gss_mg_ret_buffer(OM_uint32 *minor,
krb5_storage *sp,
gss_buffer_t buffer);
OM_uint32
_gss_mg_store_buffer(OM_uint32 *minor,
krb5_storage *sp,
gss_const_buffer_t buffer);