[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Dr. Stephen Henson]

The branch OpenSSL_1_0_1-stable has been updated
       via  0d25eb7800cbb2e845b4f38e3c78df437d68ad7c (commit)
      from  ae2f46597a01f3e7042493d09bd0559028bb5699 (commit)


- Log -----------------------------------------------------------------
commit 0d25eb7800cbb2e845b4f38e3c78df437d68ad7c
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Jun 24 12:28:50 2015 +0100

    Don't output bogus errors in PKCS12_parse
    
    PR#3923
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit ffbf304d4832bd51bb0618f8ca5b7c26647ee664)

-----------------------------------------------------------------------

Summary of changes:
 crypto/pkcs12/p12_kiss.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c
index ee476c3..9aa3c90 100644
--- a/crypto/pkcs12/p12_kiss.c
+++ b/crypto/pkcs12/p12_kiss.c
@@ -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) {