diff options
| author | Richard Levitte <levitte@openssl.org> | 2003-08-14 10:33:04 +0400 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2003-08-14 10:33:04 +0400 |
| commit | 3ef63bcc6bf922e09c5fda7c997d35a97f9feb68 (patch) | |
| tree | ada28c5b6c71ae4c485a9aaae5a129c3922c5b07 /ssl | |
| parent | 980645e55e4816878aab9353285dc9e39a793fc0 (diff) | |
Recent changes from 0.9.6-stable
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_rsa.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c index 6ec7a5cdb1..d9468fc725 100644 --- a/ssl/ssl_rsa.c +++ b/ssl/ssl_rsa.c @@ -207,7 +207,7 @@ static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey) ok=1; else #endif - if (!X509_check_private_key(c->pkeys[i].x509,pkey)) + if (!X509_check_private_key(c->pkeys[i].x509,pkey)) { if ((i == SSL_PKEY_DH_RSA) || (i == SSL_PKEY_DH_DSA)) { @@ -241,6 +241,8 @@ static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey) return(0); } + ERR_clear_error(); /* make sure no error from X509_check_private_key() + * is left if we have chosen to ignore it */ if (c->pkeys[i].privatekey != NULL) EVP_PKEY_free(c->pkeys[i].privatekey); CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY); |