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

Improve the calcucation of header lengths. DCE-STYLE data is also

Browse Source 
padded so remove if (1 || ...) code.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18204 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-10-02 19:04:50 +00:00
parent 2d4a99078f
commit 563a9bf25e
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/gssapi/krb5/arcfour.c
View File

@@ -60,8 +60,9 @@ RCSID("$Id$");
/* /*
* WRAP in DCE-style have a fixed size header, the oid and length over * WRAP in DCE-style have a fixed size header, the oid and length over
* the WRAP header is a total of * the WRAP header is a total of
* GSS_ARCFOUR_WRAP_TOKEN_DCE_DER_HEADER_SIZE byte (ie total of 45 * GSS_ARCFOUR_WRAP_TOKEN_DCE_DER_HEADER_SIZE +
* bytes overhead, remember the 2 bytes from APPL [0] SEQ). * GSS_ARCFOUR_WRAP_TOKEN_SIZE byte (ie total of 45 bytes overhead,
* remember the 2 bytes from APPL [0] SEQ).
*/ */
#define GSS_ARCFOUR_WRAP_TOKEN_SIZE 32 #define GSS_ARCFOUR_WRAP_TOKEN_SIZE 32
@@ -361,9 +362,8 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status,
_gssapi_encap_length(len, &len, &total_len, GSS_KRB5_MECHANISM); _gssapi_encap_length(len, &len, &total_len, GSS_KRB5_MECHANISM);
} else { } else {
len = GSS_ARCFOUR_WRAP_TOKEN_SIZE; len = GSS_ARCFOUR_WRAP_TOKEN_SIZE;
total_len = GSS_ARCFOUR_WRAP_TOKEN_DCE_DER_HEADER_SIZE; _gssapi_encap_length(len, &len, &total_len, GSS_KRB5_MECHANISM);
total_len += GSS_ARCFOUR_WRAP_TOKEN_SIZE; total_len = GSS_ARCFOUR_WRAP_TOKEN_SIZE + GSS_ARCFOUR_WRAP_TOKEN_DCE_DER_HEADER_SIZE + datalen;
total_len += datalen;
} }
output_message_buffer->length = total_len; output_message_buffer->length = total_len;
@@ -529,9 +529,15 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status,
if (omret) if (omret)
return omret; return omret;
datalen = input_message_buffer->length /* length of mech header */
- (p0 - (u_char *)input_message_buffer->value) len = (p0 - (u_char *)input_message_buffer->value) +
- GSS_ARCFOUR_WRAP_TOKEN_SIZE; GSS_ARCFOUR_WRAP_TOKEN_SIZE;
if (len > input_message_buffer->length)
return GSS_S_BAD_MECH;
/* length of data */
datalen = input_message_buffer->length - len;
p = p0; p = p0;
@@ -625,16 +631,13 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status,
} }
memset(k6_data, 0, sizeof(k6_data)); memset(k6_data, 0, sizeof(k6_data));
if (1 || (context_handle->flags & GSS_C_DCE_STYLE) == 0) { ret = _gssapi_verify_pad(output_message_buffer, datalen, &padlen);
ret = _gssapi_verify_pad(output_message_buffer, datalen, &padlen); if (ret) {
if (ret) { _gsskrb5_release_buffer(minor_status, output_message_buffer);
_gsskrb5_release_buffer(minor_status, output_message_buffer); *minor_status = 0;
*minor_status = 0; return ret;
return ret; }
} output_message_buffer->length -= padlen;
output_message_buffer->length -= padlen;
} else
padlen = 0;
ret = arcfour_mic_cksum(key, KRB5_KU_USAGE_SEAL, ret = arcfour_mic_cksum(key, KRB5_KU_USAGE_SEAL,
cksum_data, sizeof(cksum_data), cksum_data, sizeof(cksum_data),