diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2014-01-27 09:02:06 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2014-01-27 09:02:06 +0000 |
| commit | face757db3169f8f9964c7fd31250cf67c6764cb (patch) | |
| tree | 4e878c303482949502bf67a9f5da6cf38073994b /asn1/cms | |
| parent | b48a2db7d1b3518b37197298fdd59cea3479fb54 (diff) | |
| download | wireshark-face757db3169f8f9964c7fd31250cf67c6764cb.tar.gz | |
Added back x509af_get_last_algorithm_id() removed in revision 54647 to
restore usage in cms and pkcs12. They never got a valid value in
actx->external.direct_reference because they use another actx in this case.
This will add back the global variable in x509af, but this is needed
until we manage to pass the value in another way.
See comments in bug 9573.
svn path=/trunk/; revision=54975
Diffstat (limited to 'asn1/cms')
| -rw-r--r-- | asn1/cms/cms.cnf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index af843d1703..b2c81b09f4 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -153,8 +153,8 @@ 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 && actx->external.direct_reference) - cms_verify_msg_digest(pi, content_tvb, actx->external.direct_reference, tvb, old_offset); + if(content_tvb) + cms_verify_msg_digest(pi, content_tvb, x509af_get_last_algorithm_id(), tvb, old_offset); #.FN_PARS SMIMECapability/capability FN_VARIANT = _str HF_INDEX = hf_cms_attrType VAL_PTR = &object_identifier_id |