Update from 1.0.0-stable.

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 2f47eaf5109bf15b65b7e39bedb7e3f1d15cfea7..be51b42f23c6d30dc9b901b91078dd1b578570dc 100644 (file)
--- 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);