Repository: trafficserver Updated Branches: refs/heads/master 6a0219139 -> d5382adef
TS-3006: Fixing more obscure build errors and documentation tweaks. This close #120. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d5382ade Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d5382ade Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d5382ade Branch: refs/heads/master Commit: d5382adef49a5f6cd3f4312d0b8c6535b939b5a5 Parents: 6a02191 Author: shinrich <shinr...@network-geographics.com> Authored: Wed Sep 24 10:42:50 2014 -0500 Committer: Alan M. Carroll <a...@apache.org> Committed: Wed Sep 24 11:41:39 2014 -0500 ---------------------------------------------------------------------- doc/reference/api/TSVConnSslConnectionGet.en.rst | 2 +- iocore/net/SSLNetVConnection.cc | 4 ++++ iocore/net/SSLUtils.cc | 6 +++--- plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc | 3 +-- 4 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d5382ade/doc/reference/api/TSVConnSslConnectionGet.en.rst ---------------------------------------------------------------------- diff --git a/doc/reference/api/TSVConnSslConnectionGet.en.rst b/doc/reference/api/TSVConnSslConnectionGet.en.rst index 610c8a0..eeb69ae 100644 --- a/doc/reference/api/TSVConnSslConnectionGet.en.rst +++ b/doc/reference/api/TSVConnSslConnectionGet.en.rst @@ -16,7 +16,7 @@ TSVConnSslConnectionGet -=========== +======================= Synopsis -------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d5382ade/iocore/net/SSLNetVConnection.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc index 0f26679..f5232b0 100644 --- a/iocore/net/SSLNetVConnection.cc +++ b/iocore/net/SSLNetVConnection.cc @@ -1175,11 +1175,15 @@ SSLNetVConnection::reenable(NetHandler* nh) { bool SSLNetVConnection::sslContextSet(void* ctx) { +#if TS_USE_TLS_SNI bool zret = true; if (ssl) SSL_set_SSL_CTX(ssl, static_cast<SSL_CTX*>(ctx)); else zret = false; +#else + bool zret = false; +#endif return zret; } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d5382ade/iocore/net/SSLUtils.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc index 59e0b63..86301f4 100644 --- a/iocore/net/SSLUtils.cc +++ b/iocore/net/SSLUtils.cc @@ -117,7 +117,9 @@ struct ssl_ticket_key_t unsigned char aes_key[16]; }; +#if HAVE_OPENSSL_SESSION_TICKETS static int ssl_session_ticket_index = -1; +#endif static pthread_mutex_t *mutex_buf = NULL; static bool open_ssl_initialized = false; @@ -285,10 +287,8 @@ ssl_context_enable_sni(SSL_CTX * ctx, SSLCertLookup * /*lookup*/) // lookup data structure safely //SSL_CTX_set_tlsext_servername_arg(ctx, lookup); } -#else - (void)lookup; -#endif /* TS_USE_TLS_SNI */ +#endif /* TS_USE_TLS_SNI */ return ctx; } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d5382ade/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc ---------------------------------------------------------------------- diff --git a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc index 54a6603..1385468 100644 --- a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc +++ b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc @@ -174,8 +174,7 @@ Load_Configuration() { SSL_CTX * Load_Certificate(SslEntry const *entry, std::deque<std::string> &names) { - const SSL_METHOD *meth = SSLv23_client_method(); - SSL_CTX *retval = SSL_CTX_new(meth); + SSL_CTX *retval = SSL_CTX_new(SSLv23_client_method()); X509* cert = NULL; if (entry->certFileName.length() > 0) { // Must load the cert file to fetch the names out later