[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  ffbf304d4832bd51bb0618f8ca5b7c26647ee664 (commit)
      from  77672802a665b26a44524a7a8091e56ee84bdf39 (commit)


- Log -----------------------------------------------------------------
commit ffbf304d4832bd51bb0618f8ca5b7c26647ee664
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>

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

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 a70fe72..fdddffb 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) {