diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2011-02-20 15:05:21 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2011-02-20 15:05:21 +0000 |
| commit | 2025f2e5f5aca2ddff7f2da0b665efb5950bff0c (patch) | |
| tree | c906d11d22c969acf6acdd42592e19e7bdb67db9 /asn1 | |
| parent | 632dcd0d77aa726cd7663fda6c95467bef676763 (diff) | |
Add changes in r35546 to template and conformation file.
svn path=/trunk/; revision=36010
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/cms/cms.cnf | 16 | ||||
| -rw-r--r-- | asn1/cms/packet-cms-template.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index bd4fec54c6..464211a5c0 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -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 diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c index 650df40ffa..85f9c35a32 100644 --- a/asn1/cms/packet-cms-template.c +++ b/asn1/cms/packet-cms-template.c @@ -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]); |