diff options
| author | Alessandro Ghedini <alessandro@ghedini.me> | 2015-10-08 14:39:58 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-10-23 19:52:08 +0200 |
| commit | c2319cf9fce87a2e82efb6e58ced11a85190dc3d (patch) | |
| tree | fd7a3d1980ab32e6d881e7101b7149733dcd78e6 /crypto/pkcs12 | |
| parent | 3f6c7691870d1cd2ad0e0c83638cef3f35a0b548 (diff) | |
Set salt length after the malloc has succeeded
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/pkcs12')
| -rw-r--r-- | crypto/pkcs12/p12_mutl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c index 9da65fe616..4cf68e17ed 100644 --- a/crypto/pkcs12/p12_mutl.c +++ b/crypto/pkcs12/p12_mutl.c @@ -208,11 +208,11 @@ int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen, } if (!saltlen) saltlen = PKCS12_SALT_LEN; - p12->mac->salt->length = saltlen; if ((p12->mac->salt->data = OPENSSL_malloc(saltlen)) == NULL) { PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE); return 0; } + p12->mac->salt->length = saltlen; if (!salt) { if (RAND_bytes(p12->mac->salt->data, saltlen) <= 0) return 0; |