Commit 0d25eb78 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Don't output bogus errors in PKCS12_parse 



PR#3923

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(cherry picked from commit ffbf304d)
parent ae2f4659

crypto/pkcs12/p12_kiss.c

+2 −0
Original line number Diff line number Diff line
@@ -135,10 +135,12 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, 


    while ((x = sk_X509_pop(ocerts))) {

        if (pkey && *pkey && cert && !*cert) {

            ERR_set_mark();

            if (X509_check_private_key(x, *pkey)) {

                *cert = x;

                x = NULL;

            }

            ERR_pop_to_mark();

        }



        if (ca && x) {