diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-07-10 08:13:00 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-07-10 08:13:00 -0400 |
| commit | 1f6433e7473a14bf4263b618d3f0c1e17196a267 (patch) | |
| tree | 9e809df23efaebf611765948726ff76805426093 /openssl/crypto/pkcs12/p12_kiss.c | |
| parent | ddb34d947fe45fcc4d2a8da284e7fa0c001bb7d3 (diff) | |
| download | vcxsrv-1f6433e7473a14bf4263b618d3f0c1e17196a267.tar.gz vcxsrv-1f6433e7473a14bf4263b618d3f0c1e17196a267.tar.bz2 vcxsrv-1f6433e7473a14bf4263b618d3f0c1e17196a267.zip | |
Update openssl: 1.0.1o -> 1.0.1prelease/external-1.15.2.x
Diffstat (limited to 'openssl/crypto/pkcs12/p12_kiss.c')
| -rw-r--r-- | openssl/crypto/pkcs12/p12_kiss.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) { |