trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject [1/2] trafficserver git commit: TS-3437: A null dhparamsFile will disable dh params
Date Thu, 19 Mar 2015 21:26:23 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 145d94b7e -> 07b710c7f


TS-3437: A null dhparamsFile will disable dh params


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d4addc06
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d4addc06
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d4addc06

Branch: refs/heads/master
Commit: d4addc061d1babc9ee3eb20f90e11427ca6c2863
Parents: 145d94b
Author: Brian Geffon <briang@apache.org>
Authored: Thu Mar 19 14:25:49 2015 -0700
Committer: Brian Geffon <briang@apache.org>
Committed: Thu Mar 19 14:25:49 2015 -0700

----------------------------------------------------------------------
 iocore/net/SSLUtils.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d4addc06/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index fd69911..2a240dd 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -1473,7 +1473,7 @@ SSLInitServerContext(const SSLConfigParams * params, const ssl_user_config
& ssl
   SSL_CTX_set_default_passwd_cb_userdata(CTX, NULL);\
   }
   SSL_CLEAR_PW_REFERENCES(ud,ctx)
-  if (!ssl_context_enable_dhe(params->dhparamsFile, ctx)) {
+  if (params->dhparamsFile != NULL && !ssl_context_enable_dhe(params->dhparamsFile,
ctx)) {
     goto fail;
   }
   return ssl_context_enable_ecdh(ctx);


Mime
View raw message