From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 8 May 2015 11:18:30 +0000 (-0700)
Subject: Cleanup: Rename Ssl::method() to Ssl::clientMethod() to say what it produces
X-Git-Tag: merge-candidate-3-v1~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30a32641b4eb3a01461a8b872cea5d1e07be9889;p=thirdparty%2Fsquid.git

Cleanup: Rename Ssl::method() to Ssl::clientMethod() to say what it produces
---

diff --git a/src/ssl/bio.cc b/src/ssl/bio.cc
index cb7fb60e43..b259b969ce 100644
--- a/src/ssl/bio.cc
+++ b/src/ssl/bio.cc
@@ -1146,7 +1146,7 @@ Ssl::Bio::sslFeatures::applyToSSL(SSL *ssl, Ssl::BumpMode bumpMode) const
     // SSL version which can be used to the SSL version used for client hello message.
     // For example will prevent comunnicating with a tls1.0 server if the
     // client sent and tlsv1.2 Hello message.
-    //SSL_set_ssl_method(ssl, Ssl::method(features.toSquidSSLVersion()));
+    //SSL_set_ssl_method(ssl, Ssl::clientMethod(features.toSquidSSLVersion()));
 #if defined(TLSEXT_NAMETYPE_host_name)
     if (!serverName.isEmpty()) {
         SSL_set_tlsext_host_name(ssl, serverName.c_str());
diff --git a/src/ssl/support.cc b/src/ssl/support.cc
index 101f042a43..aa74480f17 100644
--- a/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@ -1018,7 +1018,7 @@ SSL_METHOD *
 #else
 const SSL_METHOD *
 #endif
-Ssl::method(int version)
+Ssl::clientMethod(int version)
 {
     switch (version) {
 
@@ -1142,7 +1142,7 @@ sslCreateClientContext(const char *certfile, const char *keyfile, int version, c
 
     ssl_initialize();
 
-    if (!(method = Ssl::method(version)))
+    if (!(method = Ssl::clientMethod(version)))
         return NULL;
 
     sslContext = SSL_CTX_new(method);
diff --git a/src/ssl/support.h b/src/ssl/support.h
index fa52c9baca..9e8a3821e5 100644
--- a/src/ssl/support.h
+++ b/src/ssl/support.h
@@ -290,11 +290,10 @@ bool setClientSNI(SSL *ssl, const char *fqdn);
 
 int OpenSSLtoSquidSSLVersion(int sslVersion);
 
-#if OPENSSL_VERSION_NUMBER < 0x00909000L
-SSL_METHOD *method(int version);
-#else
-const SSL_METHOD *method(int version);
+#if OPENSSL_VERSION_NUMBER >= 0x00909000L
+const
 #endif
+SSL_METHOD *clientMethod(int version);
 
 const SSL_METHOD *serverMethod(int version);