From: Ralf S. Engelschall <rse@openssl.org>
Date: Fri, 26 Feb 1999 22:31:54 +0000 (+0000)
Subject: Ops, the logic of the second argument has to be coupled with the != test to
X-Git-Tag: OpenSSL_0_9_2b~101
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c707fb2741b34018de6bdf2e45cba4b4b6ab38c0;p=oweals%2Fopenssl.git

Ops, the logic of the second argument has to be coupled with the != test to
work correctly for the SSL_CTX_xxx situations, too. Now "make test" passes
again fine.
---

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index e5e1b9998e..9f06b6966d 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -152,7 +152,7 @@ int ssl_cert_instantiate(CERT **o, CERT *d)
 		SSLerr(SSL_F_SSL_CERT_INSTANTIATE, ERR_R_PASSED_NULL_PARAMETER);
 		return(0);
 		}
-	if (*o != NULL && d != NULL && *o != d)
+	if (*o != NULL && (d == NULL || *o != d))
 	    return(1);
 	if ((n = ssl_cert_new()) == NULL) 
 		{