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 e5e1b9998e2098be2475d29c15cabbc4119ffeeb..9f06b6966d55b5064653c8f672a595dec62155ca 100644 (file)
--- 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) 
                {