diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2014-01-08 08:19:51 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2014-01-08 08:19:51 +0000 |
| commit | a7c8e678bf1ad13fd41c8f338354bad244721099 (patch) | |
| tree | c3fc5a62c94eb6e528251c4ed3343295dcd07eaf | |
| parent | c79fb5464b5c0c0d666d620b1f90b749eff30573 (diff) | |
Added a check for valid algorithm id.
svn path=/trunk/; revision=54653
| -rw-r--r-- | asn1/cms/cms.cnf | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-cms.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index 3c2166ec27..af843d1703 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -153,7 +153,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 && actx->external.direct_reference) cms_verify_msg_digest(pi, content_tvb, actx->external.direct_reference, tvb, old_offset); #.FN_PARS SMIMECapability/capability diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 3141902330..d02e088cc7 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -1529,7 +1529,7 @@ dissect_cms_MessageDigest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs 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 && actx->external.direct_reference) cms_verify_msg_digest(pi, content_tvb, actx->external.direct_reference, tvb, old_offset); |