summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-06-30 11:42:04 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-06-30 11:42:04 +0000
commit746570e575d9ba6bea523661ef3aa844d695d7d2 (patch)
tree0c2c9f2e01b4c0ff2d544dafef9063da93f447a4 /ssl
parent508c53522145ccd59b330e789a07470c79e87770 (diff)
Update from 1.0.0-stable.
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_cert.c4
1 files changed, 1 insertions, 3 deletions
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);