From: Bodo Möller <bodo@openssl.org>
Date: Mon, 11 Aug 2003 18:56:50 +0000 (+0000)
Subject: make sure no error is left in the queue that is intentionally ignored
X-Git-Tag: OpenSSL_0_9_6k~12
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=46a539a2c9a2eadc2e65ce8d9c77167e98cdcb7a;p=oweals%2Fopenssl.git

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

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);