diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-01-22 04:39:31 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-01-22 04:39:31 +0000 |
| commit | d85bca8969cac6a46b64e18072898bc5ac2c89da (patch) | |
| tree | 74434bea13334832d8337ac12a574cce5249a611 /asn1/pkcs12 | |
| parent | 051cb78cd9fe985ca6c95a5845d88d26f559a49e (diff) | |
Another probably-wrong tvb_get_string().
Also, add a URL for the PKCS #12 spec.
svn path=/trunk/; revision=54894
Diffstat (limited to 'asn1/pkcs12')
| -rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index 1dd685e85b..be2d14c2a4 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -2,6 +2,10 @@ * Routines for PKCS#12: Personal Information Exchange packet dissection * Graeme Lunt 2006 * + * See "PKCS #12 v1.1: Personal Information Exchange Syntax": + * + * http://www.emc.com/emc-plus/rsa-labs/pkcs/files/h11301-wp-pkcs-12v1-1-personal-information-exchange-syntax.pdf + * * $Id$ * * Wireshark - Network traffic analyzer @@ -314,7 +318,7 @@ int PBE_decrypt_data(const char *object_identifier_id_param, tvbuff_t *encrypted datalen = tvb_length(encrypted_tvb); clear_data = (char *)g_malloc(datalen); - err = gcry_cipher_decrypt (cipher, clear_data, datalen, tvb_get_string(wmem_packet_scope(), encrypted_tvb, 0, datalen), datalen); + err = gcry_cipher_decrypt (cipher, clear_data, datalen, (char *)tvb_memdup(wmem_packet_scope(), encrypted_tvb, 0, datalen), datalen); if (gcry_err_code (err)) { proto_item_append_text(item, " [Failed to decrypt with password preference]"); |