Repository: trafficserver
Updated Branches:
  refs/heads/master 78043848e -> 813bffc0a


TS-3125: Fix issue where a default context wont be created


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

Branch: refs/heads/master
Commit: 813bffc0ae994d0bbd228d127baa2a7aff7c96e2
Parents: 7804384
Author: Brian Geffon <[email protected]>
Authored: Tue Oct 14 00:55:46 2014 -0700
Committer: Brian Geffon <[email protected]>
Committed: Tue Oct 14 00:55:46 2014 -0700

----------------------------------------------------------------------
 iocore/net/SSLUtils.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/813bffc0/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index d33600e..3860bfb 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -1251,9 +1251,11 @@ SSLInitServerContext(
 
   Debug("ssl", "Using '%s' in hash for session id context", 
sslMultCertSettings.cert.get());
 
-  if (NULL == setting_cert || EVP_DigestUpdate(&digest, 
sslMultCertSettings.cert, strlen(setting_cert)) == 0) {
-   SSLError("EVP_DigestUpdate failed");
-   goto fail;
+  if (NULL != setting_cert) {
+    if (EVP_DigestUpdate(&digest, sslMultCertSettings.cert, 
strlen(setting_cert)) == 0) {
+     SSLError("EVP_DigestUpdate failed");
+     goto fail;
+    }
   }
 
   if (ca_list != NULL) {

Reply via email to