Updated Branches: refs/heads/master 14ef40ef2 -> 44fe5296e
TS-2372 Make ecdh CTX prototype follow SNI, and fix unused ctx on some platforms Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/44fe5296 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/44fe5296 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/44fe5296 Branch: refs/heads/master Commit: 44fe5296ee5d5b2e96d27918c4b57f7fb4343ec2 Parents: 14ef40e Author: Leif Hedstrom <[email protected]> Authored: Thu Dec 5 11:00:47 2013 -0700 Committer: Leif Hedstrom <[email protected]> Committed: Thu Dec 5 11:00:47 2013 -0700 ---------------------------------------------------------------------- iocore/net/SSLUtils.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/44fe5296/iocore/net/SSLUtils.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc index 3ef6165..020c16b 100644 --- a/iocore/net/SSLUtils.cc +++ b/iocore/net/SSLUtils.cc @@ -182,15 +182,14 @@ ssl_context_enable_sni(SSL_CTX * ctx, SSLCertLookup * lookup) SSL_CTX_set_tlsext_servername_arg(ctx, lookup); } #else - (void)ctx; (void)lookup; #endif /* TS_USE_TLS_SNI */ return ctx; } -static void -ssl_enable_ecdh(SSL_CTX * ctx) +static SSL_CTX * +ssl_context_enable_ecdh(SSL_CTX * ctx) { #if TS_USE_TLS_ECKEY @@ -204,8 +203,9 @@ ssl_enable_ecdh(SSL_CTX * ctx) EC_KEY_free(ecdh); } #endif - #endif + + return ctx; } void @@ -430,9 +430,7 @@ SSLInitServerContext( } } - ssl_enable_ecdh(ctx); - - return ctx; + return ssl_context_enable_ecdh(ctx); fail: SSL_CTX_free(ctx);
