You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2015/06/26 20:01:53 UTC
[3/4] trafficserver git commit: TS-3711: Allow DHE ciphers in
ciphersuite list to be negotiable.
TS-3711: Allow DHE ciphers in ciphersuite list to be negotiable.
(cherry picked from commit c58461c1c3908caada4507109e917c10d0fd1e6b)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f79a1e78
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f79a1e78
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f79a1e78
Branch: refs/heads/6.0.x
Commit: f79a1e786c6dd685e9b4b9320491ba12d8ebfd44
Parents: 804fa87
Author: shinrich <sh...@yahoo-inc.com>
Authored: Thu Jun 25 06:48:48 2015 -0500
Committer: Bryan Call <bc...@apache.org>
Committed: Fri Jun 26 10:28:53 2015 -0700
----------------------------------------------------------------------
iocore/net/SSLUtils.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f79a1e78/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);