diff options
Diffstat (limited to 'epan/dissectors/packet-pkcs12.c')
| -rw-r--r-- | epan/dissectors/packet-pkcs12.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index f6a486eafd..b51be6eecc 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -203,7 +203,7 @@ generate_key_or_iv(unsigned int id, tvbuff_t *salt_tvb, unsigned int iter, cur_keylen = 0; salt_size = tvb_length(salt_tvb); - salt_p = tvb_get_ephemeral_string(salt_tvb, 0, salt_size); + salt_p = tvb_get_string(wmem_packet_scope(), salt_tvb, 0, salt_size); if (pw == NULL) pwlen = 0; @@ -399,7 +399,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_ephemeral_string(encrypted_tvb, 0, datalen), datalen); + err = gcry_cipher_decrypt (cipher, clear_data, datalen, tvb_get_string(wmem_packet_scope(), encrypted_tvb, 0, datalen), datalen); if (gcry_err_code (err)) { proto_item_append_text(item, " [Failed to decrypt with password preference]"); |