diff options
author | Evan Huus <eapache@gmail.com> | 2013-06-19 23:08:58 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2013-06-19 23:08:58 +0000 |
commit | 8b0f1addd990ae1b6616dbb5a21e530942461154 (patch) | |
tree | e72f102e0cec19ee49b5729f8dcfa62afa3a931d /asn1/pkcs12 | |
parent | e6e7c1181bd33a94de00e137685f39520bd858dc (diff) | |
download | wireshark-8b0f1addd990ae1b6616dbb5a21e530942461154.tar.gz |
Apparently one of our major global headers must include emem.h, because I just
found a bunch more asn1 dissectors using emem without ever directly including
the header. Convert those to wmem as well, which involves add a number of
#include directives since dissectors do *not* automatically pull in the wmem
headers.
svn path=/trunk/; revision=50066
Diffstat (limited to 'asn1/pkcs12')
-rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index 0160213248..b43323b669 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -271,14 +271,14 @@ int PBE_decrypt_data(const char *object_identifier_id_param, tvbuff_t *encrypted } /* allocate buffers */ - key = (char *)ep_alloc(keylen); + key = (char *)wmem_alloc(wmem_packet_scope(), keylen); if(!generate_key_or_iv(1 /*LEY */, salt, iteration_count, password, keylen, key)) return FALSE; if(ivlen) { - iv = (char *)ep_alloc(ivlen); + iv = (char *)wmem_alloc(wmem_packet_scope(), ivlen); if(!generate_key_or_iv(2 /* IV */, salt, iteration_count, password, ivlen, iv)) return FALSE; |