You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by sh...@apache.org on 2015/02/03 19:34:35 UTC
trafficserver git commit: TS-3319: Fix callback assignment for
default certificate. Originally was only setting the cert/sni callback for
the implicit default.
Repository: trafficserver
Updated Branches:
refs/heads/master ad2c7a6ee -> 53f9b4e02
TS-3319: Fix callback assignment for default certificate. Originally
was only setting the cert/sni callback for the implicit default.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/53f9b4e0
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/53f9b4e0
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/53f9b4e0
Branch: refs/heads/master
Commit: 53f9b4e027def2c9ee8ea6a1bdb296014de5ed9a
Parents: ad2c7a6
Author: shinrich <sh...@yahoo-inc.com>
Authored: Tue Feb 3 12:31:57 2015 -0600
Committer: shinrich <sh...@yahoo-inc.com>
Committed: Tue Feb 3 12:31:57 2015 -0600
----------------------------------------------------------------------
iocore/net/SSLUtils.cc | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/53f9b4e0/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 211a34a..afdf8e9 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -1721,6 +1721,7 @@ ssl_store_ssl_context(
if (strcmp(sslMultCertSettings.addr, "*") == 0) {
if (lookup->insert(sslMultCertSettings.addr, SSLCertContext(ctx, sslMultCertSettings.opt)) >= 0) {
lookup->ssl_default = ctx;
+ setSslHandshakeCallbacks(ctx);
}
} else {
IpEndpoint ep;
@@ -1916,9 +1917,6 @@ SSLParseCertificateConfiguration(const SSLConfigParams * params, SSLCertLookup *
ssl_user_config sslMultiCertSettings;
sslMultiCertSettings.addr = ats_strdup("*");
SSL_CTX *ctx = ssl_store_ssl_context(params, lookup, sslMultiCertSettings);
- if (ctx != NULL) {
- setSslHandshakeCallbacks(ctx);
- }
}
return true;
}