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 /epan/dissectors/packet-pkcs12.c | |
| parent | b48a2db7d1b3518b37197298fdd59cea3479fb54 (diff) | |
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 'epan/dissectors/packet-pkcs12.c')
| -rw-r--r-- | epan/dissectors/packet-pkcs12.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index db48f7668a..7c375c3e59 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -344,7 +344,7 @@ int PBE_decrypt_data(const char *object_identifier_id_param, tvbuff_t *encrypted return FALSE; } - encryption_algorithm = actx->external.direct_reference; + encryption_algorithm = x509af_get_last_algorithm_id(); /* these are the only encryption schemes we understand for now */ if(!strcmp(encryption_algorithm, PKCS12_PBE_3DES_SHA1_OID)) { |