You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2014/10/13 19:37:33 UTC
git commit: TS-3125: Fix small issue where the default ssl context
doesn't have a cert
Repository: trafficserver
Updated Branches:
refs/heads/master d6f1f4ee2 -> 1e1ca9d78
TS-3125: Fix small issue where the default ssl context doesn't have a cert
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1e1ca9d7
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1e1ca9d7
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1e1ca9d7
Branch: refs/heads/master
Commit: 1e1ca9d780473bdec669f672c3d8f106046dd6d1
Parents: d6f1f4e
Author: Brian Geffon <br...@apache.org>
Authored: Sun Oct 12 18:48:53 2014 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Sun Oct 12 18:48:53 2014 -0700
----------------------------------------------------------------------
iocore/net/SSLUtils.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1e1ca9d7/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 8fcc0b8..85b385a 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -1064,6 +1064,7 @@ SSLInitServerContext(
STACK_OF(X509_NAME) *ca_list;
unsigned char hash_buf[EVP_MAX_MD_SIZE];
unsigned int hash_len = 0;
+ char const* setting_cert = sslMultCertSettings.cert.get();
// disable selected protocols
SSL_CTX_set_options(ctx, params->ssl_ctx_options);
@@ -1245,7 +1246,7 @@ SSLInitServerContext(
Debug("ssl", "Using '%s' in hash for session id context", sslMultCertSettings.cert.get());
- if (EVP_DigestUpdate(&digest, sslMultCertSettings.cert, strlen(sslMultCertSettings.cert.get())) == 0) {
+ if (NULL == setting_cert || EVP_DigestUpdate(&digest, sslMultCertSettings.cert, strlen(setting_cert)) == 0) {
SSLError("EVP_DigestUpdate failed");
goto fail;
}