osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Add changes in r35546 to template and conformation file. 

svn path=/trunk/; revision=36010
This commit is contained in:
Stig Bjørlykke 2011-02-20 15:05:21 +00:00
parent 632dcd0d77
commit 2025f2e5f5
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
asn1/cms/cms.cnf
View File

@ -88,9 +88,9 @@ RevocationInfoChoice/other otherRIC
%(DEFAULT_BODY)s
if(object_identifier_id) {
if(object_identifier_id) {
name = oid_resolved_from_string(object_identifier_id);
proto_item_append_text(tree, " (%%s)", name ? name : object_identifier_id);
proto_item_append_text(tree, " (%%s)", name ? name : object_identifier_id);
}
#.FN_BODY ContentInfo/content
@ -103,7 +103,7 @@ RevocationInfoChoice/other otherRIC
proto_item_set_text(actx->created_item, "eContent (%%u bytes)", tvb_length (content_tvb));
call_ber_oid_callback(object_identifier_id, content_tvb, 0, actx->pinfo, top_tree ? top_tree : tree);
#.FN_PARS OtherRecipientInfo/oriType
FN_VARIANT = _str VAL_PTR = &object_identifier_id
@ -131,7 +131,7 @@ RevocationInfoChoice/other otherRIC
if(object_identifier_id) {
name = oid_resolved_from_string(object_identifier_id);
proto_item_append_text(tree, " (%%s)", name ? name : object_identifier_id);
proto_item_append_text(tree, " (%%s)", name ? name : object_identifier_id);
}
#.FN_BODY AttributeValue
@ -150,7 +150,7 @@ RevocationInfoChoice/other otherRIC
old_offset = get_ber_identifier(tvb, old_offset, NULL, NULL, NULL);
old_offset = get_ber_length(tvb, old_offset, NULL, NULL);
if(content_tvb)
if(content_tvb)
cms_verify_msg_digest(pi, content_tvb, x509af_get_last_algorithm_id(), tvb, old_offset);
#.FN_PARS SMIMECapability/capability
@ -163,7 +163,7 @@ RevocationInfoChoice/other otherRIC
if(object_identifier_id) {
name = oid_resolved_from_string(object_identifier_id);
proto_item_append_text(tree, " %%s", name ? name : object_identifier_id);
proto_item_append_text(tree, " %%s", name ? name : object_identifier_id);
cap_tree = tree;
}
@ -179,8 +179,8 @@ RevocationInfoChoice/other otherRIC
%(DEFAULT_BODY)s
if(cap_tree != NULL)
proto_item_append_text(cap_tree, " (%%d bits)", length);
if(cap_tree != NULL)
proto_item_append_text(cap_tree, " (%%d bits)", length);
#.FN_PARS EncryptedContent VAL_PTR = &encrypted_tvb

2
asn1/cms/packet-cms-template.c
View File

@ -119,7 +119,7 @@ cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, const char *alg, tvbuff
/* compare our computed hash with what we have received */
if(tvb_bytes_exist(tvb, offset, buffer_size) &&
(memcmp(tvb_get_ptr(tvb, offset, buffer_size), digest_buf, buffer_size) != 0)) {
(tvb_memeql(tvb, offset, digest_buf, buffer_size) != 0)) {
proto_item_append_text(pi, " [incorrect, should be ");
for(i = 0; i < buffer_size; i++)
proto_item_append_text(pi, "%02X", digest_buf[i]);

2
epan/dissectors/packet-cms.c
View File

@ -1520,7 +1520,7 @@ dissect_cms_MessageDigest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
pi = actx->created_item;
/* move past TLV */