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

Implement gss_wrap_iov, gss_unwrap_iov for CFX type encryption types.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@25286 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-06-22 17:56:41 +00:00
parent 4c302b52f8
commit c99b2003e2
62 changed files with 1447 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

241
lib/gssapi/krb5/aeap.c
View File

@@ -35,68 +35,6 @@
#include <roken.h>
#if 0
static OM_uint32
iov_allocate(OM_uint32 *minor_status, gss_iov_buffer_desc *iov, int iov_count)
{
unsigned int i;
for (i = 0; i < iov_count; i++) {
if (GSS_IOV_BUFFER_FLAGS(iov[i].type) & GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE){
void *ptr = malloc(iov[i].buffer.length);
if (ptr == NULL)
abort();
if (iov[i].buffer.value)
memcpy(ptr, iov[i].buffer.value, iov[i].buffer.length);
iov[i].buffer.value = ptr;
iov[i].type |= GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATED;
}
}
return GSS_S_COMPLETE;
}
static OM_uint32
iov_map(OM_uint32 *minor_status,
const gss_iov_buffer_desc *iov,
int iov_count,
krb5_crypto_iov *data)
{
unsigned int i;
for (i = 0; i < iov_count; i++) {
switch(GSS_IOV_BUFFER_TYPE(iov[i].type)) {
case GSS_IOV_BUFFER_TYPE_EMPTY:
data[i].flags = KRB5_CRYPTO_TYPE_EMPTY;
break;
case GSS_IOV_BUFFER_TYPE_DATA:
data[i].flags = KRB5_CRYPTO_TYPE_DATA;
break;
case GSS_IOV_BUFFER_TYPE_SIGN_ONLY:
data[i].flags = KRB5_CRYPTO_TYPE_SIGN_ONLY;
break;
case GSS_IOV_BUFFER_TYPE_HEADER:
data[i].flags = KRB5_CRYPTO_TYPE_HEADER;
break;
case GSS_IOV_BUFFER_TYPE_TRAILER:
data[i].flags = KRB5_CRYPTO_TYPE_TRAILER;
break;
case GSS_IOV_BUFFER_TYPE_PADDING:
data[i].flags = KRB5_CRYPTO_TYPE_PADDING;
break;
case GSS_IOV_BUFFER_TYPE_STREAM:
abort();
break;
default:
*minor_status = EINVAL;
return GSS_S_FAILURE;
}
data[i].data.data = iov[i].buffer.value;
data[i].data.length = iov[i].buffer.length;
}
return GSS_S_COMPLETE;
}
#endif
OM_uint32 GSSAPI_LIB_FUNCTION
_gk_wrap_iov(OM_uint32 * minor_status,
gss_ctx_id_t context_handle,
@@ -106,54 +44,17 @@ _gk_wrap_iov(OM_uint32 * minor_status,
gss_iov_buffer_desc *iov,
int iov_count)
{
#if 1
const gsskrb5_ctx ctx = (const gsskrb5_ctx) context_handle;
krb5_context context;
GSSAPI_KRB5_INIT (&context);
if (ctx->more_flags & IS_CFX)
return _gssapi_wrap_cfx_iov(minor_status, ctx, context,
conf_req_flag, conf_state,
iov, iov_count);
return GSS_S_FAILURE;
#else
gsskrb5_ctx ctx = (gsskrb5_ctx) context_handle;
krb5_context context;
OM_uint32 major_status, junk;
krb5_crypto_iov *data;
krb5_error_code ret;
unsigned usage;
GSSAPI_KRB5_INIT (&context);
major_status = iov_allocate(minor_status, iov, iov_count);
if (major_status != GSS_S_COMPLETE)
return major_status;
data = calloc(iov_count, sizeof(data[0]));
if (data == NULL) {
gss_release_iov_buffer(&junk, iov, iov_count);
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
major_status = iov_map(minor_status, iov, iov_count, data);
if (major_status != GSS_S_COMPLETE) {
gss_release_iov_buffer(&junk, iov, iov_count);
free(data);
return major_status;
}
if (ctx->more_flags & LOCAL) {
usage = KRB5_KU_USAGE_ACCEPTOR_SIGN;
} else {
usage = KRB5_KU_USAGE_INITIATOR_SIGN;
}
ret = krb5_encrypt_iov_ivec(context, ctx->crypto, usage,
data, iov_count, NULL);
free(data);
if (ret) {
gss_release_iov_buffer(&junk, iov, iov_count);
*minor_status = ret;
return GSS_S_FAILURE;
}
*minor_status = 0;
return GSS_S_COMPLETE;
#endif
}
OM_uint32 GSSAPI_LIB_FUNCTION
@@ -164,54 +65,16 @@ _gk_unwrap_iov(OM_uint32 *minor_status,
gss_iov_buffer_desc *iov,
int iov_count)
{
#if 1
const gsskrb5_ctx ctx = (const gsskrb5_ctx) context_handle;
krb5_context context;
GSSAPI_KRB5_INIT (&context);
if (ctx->more_flags & IS_CFX)
return _gssapi_unwrap_cfx_iov(minor_status, ctx, context,
conf_state, qop_state, iov, iov_count);
return GSS_S_FAILURE;
#else
gsskrb5_ctx ctx = (gsskrb5_ctx) context_handle;
krb5_context context;
krb5_error_code ret;
OM_uint32 major_status, junk;
krb5_crypto_iov *data;
unsigned usage;
GSSAPI_KRB5_INIT (&context);
major_status = iov_allocate(minor_status, iov, iov_count);
if (major_status != GSS_S_COMPLETE)
return major_status;
data = calloc(iov_count, sizeof(data[0]));
if (data == NULL) {
gss_release_iov_buffer(&junk, iov, iov_count);
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
major_status = iov_map(minor_status, iov, iov_count, data);
if (major_status != GSS_S_COMPLETE) {
gss_release_iov_buffer(&junk, iov, iov_count);
free(data);
return major_status;
}
if (ctx->more_flags & LOCAL) {
usage = KRB5_KU_USAGE_INITIATOR_SIGN;
} else {
usage = KRB5_KU_USAGE_ACCEPTOR_SIGN;
}
ret = krb5_decrypt_iov_ivec(context, ctx->crypto, usage,
data, iov_count, NULL);
free(data);
if (ret) {
*minor_status = ret;
gss_release_iov_buffer(&junk, iov, iov_count);
return GSS_S_FAILURE;
}
*minor_status = 0;
return GSS_S_COMPLETE;
#endif
}
OM_uint32 GSSAPI_LIB_FUNCTION
@@ -223,63 +86,15 @@ _gk_wrap_iov_length(OM_uint32 * minor_status,
gss_iov_buffer_desc *iov,
int iov_count)
{
#if 1
return GSS_S_FAILURE;
#else
gsskrb5_ctx ctx = (gsskrb5_ctx) context_handle;
const gsskrb5_ctx ctx = (const gsskrb5_ctx) context_handle;
krb5_context context;
unsigned int i;
size_t size;
size_t *padding = NULL;
GSSAPI_KRB5_INIT (&context);
*minor_status = 0;
for (size = 0, i = 0; i < iov_count; i++) {
switch(GSS_IOV_BUFFER_TYPE(iov[i].type)) {
case GSS_IOV_BUFFER_TYPE_EMPTY:
break;
case GSS_IOV_BUFFER_TYPE_DATA:
size += iov[i].buffer.length;
break;
case GSS_IOV_BUFFER_TYPE_HEADER:
iov[i].buffer.length =
krb5_crypto_length(context, ctx->crypto, KRB5_CRYPTO_TYPE_HEADER);
size += iov[i].buffer.length;
break;
case GSS_IOV_BUFFER_TYPE_TRAILER:
iov[i].buffer.length =
krb5_crypto_length(context, ctx->crypto, KRB5_CRYPTO_TYPE_TRAILER);
size += iov[i].buffer.length;
break;
case GSS_IOV_BUFFER_TYPE_PADDING:
if (padding != NULL) {
*minor_status = 0;
return GSS_S_FAILURE;
}
padding = &iov[i].buffer.length;
break;
case GSS_IOV_BUFFER_TYPE_STREAM:
size += iov[i].buffer.length;
break;
case GSS_IOV_BUFFER_TYPE_SIGN_ONLY:
break;
default:
*minor_status = EINVAL;
return GSS_S_FAILURE;
}
}
if (padding) {
size_t pad = krb5_crypto_length(context, ctx->crypto,
KRB5_CRYPTO_TYPE_PADDING);
if (pad > 1) {
*padding = pad - (size % pad);
if (*padding == pad)
*padding = 0;
} else
*padding = 0;
}
return GSS_S_COMPLETE;
#endif
if (ctx->more_flags & IS_CFX)
return _gssapi_wrap_iov_length_cfx(minor_status, ctx, context,
conf_req_flag, qop_req, conf_state,
iov, iov_count);
return GSS_S_FAILURE;
}