Commit f2950a46 authored by David von Oheimb's avatar David von Oheimb Committed by Matt Caswell
Browse files

remove needless and misleading malloc failure error messages of PKCS12_SAFEBAG_create_pkcs8_encrypt 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6217)
parent 748eb991

crypto/pkcs12/p12_sbag.c

+2 −10
Original line number Diff line number Diff line
@@ -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;

}