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:59:34 +0200 |
| commit | 72895f5112452ff63d16a02e50a8282a419ccaf7 (patch) | |
| tree | ef065287efc49ee228dc41bd1b91a607b4da94fe /crypto/pkcs12 | |
| parent | e90f1d9b74275c11e3492e521e46f4b1afa6f883 (diff) | |
Set salt length after the malloc has succeeded
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit c2319cf9fce87a2e82efb6e58ced11a85190dc3d)
Diffstat (limited to 'crypto/pkcs12')
| -rw-r--r-- | crypto/pkcs12/p12_mutl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c index 5ab4bf290e..a9277827ff 100644 --- a/crypto/pkcs12/p12_mutl.c +++ b/crypto/pkcs12/p12_mutl.c @@ -173,11 +173,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))) { + 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_pseudo_bytes(p12->mac->salt->data, saltlen) < 0) return 0; |