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:23:07 -0400 |
| commit | ca7b8d357638d3f7d22b5df91e325022f3517368 (patch) | |
| tree | a6f0421e63b9efc3f9036f86e27b1bfe96fc9121 /openssl/crypto/pkcs12 | |
| parent | ab75afbcc58c927654b75d8b3c179f423e38cfbd (diff) | |
| download | vcxsrv-ca7b8d357638d3f7d22b5df91e325022f3517368.tar.gz vcxsrv-ca7b8d357638d3f7d22b5df91e325022f3517368.tar.bz2 vcxsrv-ca7b8d357638d3f7d22b5df91e325022f3517368.zip | |
Update openssl: 1.0.1o -> 1.0.1p
Diffstat (limited to 'openssl/crypto/pkcs12')
| -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) { |