From 246fe2ca4c67d8c98caa84e2f57694f6322e2f96 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Tue, 17 Jun 2014 17:45:00 +0200 Subject: Fixup: tvb_* -> tvb_captured Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman --- epan/dissectors/packet-cms.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'epan/dissectors/packet-cms.c') diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 904499b75b..bffc9e26bf 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -291,8 +291,8 @@ cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, const char *alg, tvbuff sha1_starts(&sha1_ctx); - sha1_update(&sha1_ctx, tvb_get_ptr(content, 0, tvb_length(content)), - tvb_length(content)); + sha1_update(&sha1_ctx, tvb_get_ptr(content, 0, tvb_captured_length(content)), + tvb_captured_length(content)); sha1_finish(&sha1_ctx, digest_buf); @@ -302,8 +302,8 @@ cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, const char *alg, tvbuff md5_init(&md5_ctx); - md5_append(&md5_ctx, tvb_get_ptr(content, 0, tvb_length(content)), - tvb_length(content)); + md5_append(&md5_ctx, tvb_get_ptr(content, 0, tvb_captured_length(content)), + tvb_captured_length(content)); md5_finish(&md5_ctx, digest_buf); @@ -436,7 +436,7 @@ dissect_cms_T_eContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset #line 102 "../../asn1/cms/cms.cnf" offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_index, &content_tvb); - proto_item_set_text(actx->created_item, "eContent (%u bytes)", tvb_length (content_tvb)); + proto_item_set_text(actx->created_item, "eContent (%u bytes)", tvb_captured_length (content_tvb)); call_ber_oid_callback(object_identifier_id, content_tvb, 0, actx->pinfo, top_tree ? top_tree : tree, NULL); -- cgit v1.2.3