diff options
Diffstat (limited to 'asn1/spnego/packet-spnego-template.c')
| -rw-r--r-- | asn1/spnego/packet-spnego-template.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c index 801ba66de7..748c22d30b 100644 --- a/asn1/spnego/packet-spnego-template.c +++ b/asn1/spnego/packet-spnego-template.c @@ -828,8 +828,8 @@ dissect_spnego_krb5_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo */ return offset; } - pinfo->gssapi_encrypted_tvb = tvb_new_subset( - tvb, offset, len, len); + pinfo->gssapi_encrypted_tvb = tvb_new_subset_length( + tvb, offset, len); } /* if this is KRB5 wrapped rc4-hmac */ @@ -840,9 +840,8 @@ dissect_spnego_krb5_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo as well ? */ if(!pinfo->gssapi_wrap_tvb){ - pinfo->gssapi_wrap_tvb = tvb_new_subset( + pinfo->gssapi_wrap_tvb = tvb_new_subset_length( tvb, start_offset-2, - GSS_ARCFOUR_WRAP_TOKEN_SIZE, GSS_ARCFOUR_WRAP_TOKEN_SIZE); } #if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS) @@ -1045,8 +1044,8 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo inner_token_len = tvb_reported_length_remaining(tvb, offset) - ec; - pinfo->gssapi_wrap_tvb = tvb_new_subset(tvb, offset, - inner_token_len, inner_token_len); + pinfo->gssapi_wrap_tvb = tvb_new_subset_length(tvb, offset, + inner_token_len); offset += inner_token_len; @@ -1083,9 +1082,8 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo as well ? */ if(!pinfo->gssapi_wrap_tvb){ - pinfo->gssapi_wrap_tvb = tvb_new_subset( + pinfo->gssapi_wrap_tvb = tvb_new_subset_length( tvb, start_offset-2, - offset - (start_offset-2), offset - (start_offset-2)); } } @@ -1093,7 +1091,7 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo #if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS) { - tvbuff_t *checksum_tvb = tvb_new_subset(tvb, 16, checksum_size, checksum_size); + tvbuff_t *checksum_tvb = tvb_new_subset_length(tvb, 16, checksum_size); if (pinfo->gssapi_data_encrypted) { if(pinfo->gssapi_encrypted_tvb){ |