Repository: trafficserver Updated Branches: refs/heads/master df59f9191 -> c58461c1c
TS-3711: Allow DHE ciphers in ciphersuite list to be negotiable. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c58461c1 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c58461c1 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c58461c1 Branch: refs/heads/master Commit: c58461c1c3908caada4507109e917c10d0fd1e6b Parents: df59f91 Author: shinrich <shinr...@yahoo-inc.com> Authored: Thu Jun 25 06:48:48 2015 -0500 Committer: shinrich <shinr...@yahoo-inc.com> Committed: Thu Jun 25 06:48:48 2015 -0500 ---------------------------------------------------------------------- iocore/net/SSLUtils.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c58461c1/iocore/net/SSLUtils.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc index 81a0be5..6f64330 100644 --- a/iocore/net/SSLUtils.cc +++ b/iocore/net/SSLUtils.cc @@ -1492,7 +1492,7 @@ SSLInitServerContext(const SSLConfigParams *params, const ssl_user_config &sslMu SSL_CTX_set_default_passwd_cb_userdata(CTX, NULL); \ } SSL_CLEAR_PW_REFERENCES(ud, ctx) - if (params->dhparamsFile != NULL && !ssl_context_enable_dhe(params->dhparamsFile, ctx)) { + if (!ssl_context_enable_dhe(params->dhparamsFile, ctx)) { goto fail; } return ssl_context_enable_ecdh(ctx);
