Author: abartlet Date: 2006-11-07 06:50:29 +0000 (Tue, 07 Nov 2006) New Revision: 655
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=655 Log: This padding isn't here for DCE_STYLE, so don't verify that it exists. Andrew Bartlett Modified: trunk/heimdal/lib/gssapi/krb5/arcfour.c Changeset: Modified: trunk/heimdal/lib/gssapi/krb5/arcfour.c =================================================================== --- trunk/heimdal/lib/gssapi/krb5/arcfour.c 2006-11-07 06:23:57 UTC (rev 654) +++ trunk/heimdal/lib/gssapi/krb5/arcfour.c 2006-11-07 06:50:29 UTC (rev 655) @@ -509,7 +509,7 @@ u_char *p, *p0; int cmp; int conf_flag; - size_t padlen, len; + size_t padlen = 0, len; if (conf_state) *conf_state = 0; @@ -635,13 +635,15 @@ } memset(k6_data, 0, sizeof(k6_data)); - ret = _gssapi_verify_pad(output_message_buffer, datalen, &padlen); - if (ret) { - _gsskrb5_release_buffer(minor_status, output_message_buffer); - *minor_status = 0; - return ret; + if ((context_handle->flags & GSS_C_DCE_STYLE) == 0) { + ret = _gssapi_verify_pad(output_message_buffer, datalen, &padlen); + if (ret) { + _gsskrb5_release_buffer(minor_status, output_message_buffer); + *minor_status = 0; + return ret; + } + output_message_buffer->length -= padlen; } - output_message_buffer->length -= padlen; ret = arcfour_mic_cksum(key, KRB5_KU_USAGE_SEAL, cksum_data, sizeof(cksum_data),