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

FORWARD_NULL fixes [CID-163] and friends

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-07-30 07:36:03 +02:00
parent d544768d1c
commit 9581e59bde
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/gssapi/mech/gss_aeap.c
View File

@@ -66,11 +66,8 @@ gss_wrap_iov(OM_uint32 * minor_status,
m = ctx->gc_mech; m = ctx->gc_mech;
if (m->gm_wrap_iov == NULL) { if (m->gm_wrap_iov == NULL)
if (minor_status)
*minor_status = 0;
return GSS_S_UNAVAILABLE; return GSS_S_UNAVAILABLE;
}
return (m->gm_wrap_iov)(minor_status, ctx->gc_ctx, return (m->gm_wrap_iov)(minor_status, ctx->gc_ctx,
conf_req_flag, qop_req, conf_state, conf_req_flag, qop_req, conf_state,
@@ -108,10 +105,8 @@ gss_unwrap_iov(OM_uint32 *minor_status,
m = ctx->gc_mech; m = ctx->gc_mech;
if (m->gm_unwrap_iov == NULL) { if (m->gm_unwrap_iov == NULL)
*minor_status = 0;
return GSS_S_UNAVAILABLE; return GSS_S_UNAVAILABLE;
}
return (m->gm_unwrap_iov)(minor_status, ctx->gc_ctx, return (m->gm_unwrap_iov)(minor_status, ctx->gc_ctx,
conf_state, qop_state, conf_state, qop_state,
@@ -152,10 +147,8 @@ gss_wrap_iov_length(OM_uint32 * minor_status,
m = ctx->gc_mech; m = ctx->gc_mech;
if (m->gm_wrap_iov_length == NULL) { if (m->gm_wrap_iov_length == NULL)
*minor_status = 0;
return GSS_S_UNAVAILABLE; return GSS_S_UNAVAILABLE;
}
return (m->gm_wrap_iov_length)(minor_status, ctx->gc_ctx, return (m->gm_wrap_iov_length)(minor_status, ctx->gc_ctx,
conf_req_flag, qop_req, conf_state, conf_req_flag, qop_req, conf_state,
@@ -213,7 +206,8 @@ gss_context_query_attributes(OM_uint32 *minor_status,
void *data, void *data,
size_t len) size_t len)
{ {
*minor_status = 0; if (minor_status)
*minor_status = 0;
if (gss_oid_equal(GSS_C_ATTR_STREAM_SIZES, attribute)) { if (gss_oid_equal(GSS_C_ATTR_STREAM_SIZES, attribute)) {
memset(data, 0, len); memset(data, 0, len);