diff options
| author | David von Oheimb <David.von.Oheimb@siemens.com> | 2018-05-10 21:10:03 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-06-18 10:44:32 +0100 |
| commit | f2950a46a6217110a7f77b5acfe558a6fb4dfeeb (patch) | |
| tree | fe97eea7e5f25009138a9d6f88843db3f3c357cc | |
| parent | 748eb991f49585a609ec65b0d8d26835a2911045 (diff) | |
remove needless and misleading malloc failure error messages of PKCS12_SAFEBAG_create_pkcs8_encrypt
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6217)
| -rw-r--r-- | crypto/pkcs12/p12_sbag.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/crypto/pkcs12/p12_sbag.c b/crypto/pkcs12/p12_sbag.c index 4a3d259930..2f1ce58739 100644 --- a/crypto/pkcs12/p12_sbag.c +++ b/crypto/pkcs12/p12_sbag.c @@ -146,25 +146,17 @@ PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_pkcs8_encrypt(int pbe_nid, X509_SIG *p8; pbe_ciph = EVP_get_cipherbynid(pbe_nid); - if (pbe_ciph) pbe_nid = -1; p8 = PKCS8_encrypt(pbe_nid, pbe_ciph, pass, passlen, salt, saltlen, iter, p8inf); - - if (p8 == NULL) { - PKCS12err(PKCS12_F_PKCS12_SAFEBAG_CREATE_PKCS8_ENCRYPT, ERR_R_MALLOC_FAILURE); + if (p8 == NULL) return NULL; - } bag = PKCS12_SAFEBAG_create0_pkcs8(p8); - - if (bag == NULL) { - PKCS12err(PKCS12_F_PKCS12_SAFEBAG_CREATE_PKCS8_ENCRYPT, ERR_R_MALLOC_FAILURE); + if (bag == NULL) X509_SIG_free(p8); - return NULL; - } return bag; } |