From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 30 Jun 2009 11:42:04 +0000 (+0000)
Subject: Update from 1.0.0-stable.
X-Git-Tag: OpenSSL-fips-2_0-rc1~1619
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=746570e575d9ba6bea523661ef3aa844d695d7d2;p=oweals%2Fopenssl.git

Update from 1.0.0-stable.
---

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 2f47eaf510..be51b42f23 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -518,9 +518,7 @@ int ssl_verify_cert_chain(SSL *s,STACK_OF(X509) *sk)
 	/* Anything non-default in "param" should overwrite anything in the
 	 * ctx.
 	 */
-	if (s->param)
-		X509_VERIFY_PARAM_set1(X509_STORE_CTX_get0_param(&ctx),
-						s->param);
+	X509_VERIFY_PARAM_set1(X509_STORE_CTX_get0_param(&ctx), s->param);
 
 	if (s->verify_callback)
 		X509_STORE_CTX_set_verify_cb(&ctx, s->verify_callback);