trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [1/2] trafficserver git commit: TS-3437: A null dhparamsFile will disable dh params
Date Thu, 19 Mar 2015 21:35:01 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/5.2.x 496b946fa -> 628e4f8f0


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/fba0b743
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fba0b743
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fba0b743

Branch: refs/heads/5.2.x
Commit: fba0b743b8b0636bbf6feff3a9e395862c32a9c6
Parents: 496b946
Author: Brian Geffon <briang@apache.org>
Authored: Thu Mar 19 14:25:49 2015 -0700
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Thu Mar 19 15:30:53 2015 -0600

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


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fba0b743/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 3033fcc..5c345d4 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -1379,7 +1379,7 @@ SSLInitServerContext(
   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