diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-01-08 04:55:59 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-01-08 04:55:59 +0000 |
| commit | 92a567f20d2d45db3ed0bfb9a3a8a09dc5db76db (patch) | |
| tree | a5cab4590056f8e0684de70c56559a7b3717e76f /asn1/pkcs12 | |
| parent | bf284da2eef917f8bf55be3aad15bb296072bb77 (diff) | |
Make global algorithm_id in x509af dissector a direct_reference instead. Bug 9573 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9573). Removes valgrind warnings as well as just being Good Code.
svn path=/trunk/; revision=54647
Diffstat (limited to 'asn1/pkcs12')
| -rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index 85267e2b80..261a5cdd88 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -241,7 +241,7 @@ int PBE_decrypt_data(const char *object_identifier_id_param, tvbuff_t *encrypted return FALSE; } - encryption_algorithm = x509af_get_last_algorithm_id(); + encryption_algorithm = actx->external.direct_reference; /* these are the only encryption schemes we understand for now */ if(!strcmp(encryption_algorithm, PKCS12_PBE_3DES_SHA1_OID)) { |