diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-02 14:51:04 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-02 14:51:04 +0000 |
| commit | 9991973c373321fd7903a552f06dcb3ff576ad1f (patch) | |
| tree | d0566a8853d835782e92c96d527ea1a382f9df09 /asn1/pkcs12 | |
| parent | 240af26981370328011b319f570b10bc4f61f4a7 (diff) | |
| download | wireshark-9991973c373321fd7903a552f06dcb3ff576ad1f.tar.gz | |
Use explicit casts.
svn path=/trunk/; revision=48008
Diffstat (limited to 'asn1/pkcs12')
| -rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index 964fa0a8cb..6bb98a5fb4 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -268,14 +268,14 @@ int PBE_decrypt_data(const char *object_identifier_id_param, tvbuff_t *encrypted } /* allocate buffers */ - key = ep_alloc(keylen); + key = (char *)ep_alloc(keylen); if(!generate_key_or_iv(1 /*LEY */, salt, iteration_count, password, keylen, key)) return FALSE; if(ivlen) { - iv = ep_alloc(ivlen); + iv = (char *)ep_alloc(ivlen); if(!generate_key_or_iv(2 /* IV */, salt, iteration_count, password, ivlen, iv)) return FALSE; @@ -301,7 +301,7 @@ int PBE_decrypt_data(const char *object_identifier_id_param, tvbuff_t *encrypted } datalen = tvb_length(encrypted_tvb); - clear_data = g_malloc(datalen); + clear_data = (char *)g_malloc(datalen); err = gcry_cipher_decrypt (cipher, clear_data, datalen, tvb_get_ephemeral_string(encrypted_tvb, 0, datalen), datalen); if (gcry_err_code (err)) { |