From ca7b8d357638d3f7d22b5df91e325022f3517368 Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Fri, 10 Jul 2015 08:13:00 -0400 Subject: Update openssl: 1.0.1o -> 1.0.1p --- openssl/crypto/pkcs12/p12_kiss.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'openssl/crypto/pkcs12') diff --git a/openssl/crypto/pkcs12/p12_kiss.c b/openssl/crypto/pkcs12/p12_kiss.c index ee476c38f..9aa3c90c4 100644 --- a/openssl/crypto/pkcs12/p12_kiss.c +++ b/openssl/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) { -- cgit v1.2.3