generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make sure no error is left in the queue that is intentionally ignored

Browse Source
This commit is contained in:
Bodo Möller 2003-08-11 18:56:22 +00:00
parent 88401ed449
commit 643ecd2ed6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/ssl_rsa.c
View File

@ -207,7 +207,7 @@ static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey)
ok=1; ok=1;
else else
#endif #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)) 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); 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) if (c->pkeys[i].privatekey != NULL)
EVP_PKEY_free(c->pkeys[i].privatekey); EVP_PKEY_free(c->pkeys[i].privatekey);
CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY); CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);