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 cb7fb60e432bd34f408544db3b7ab21c4beff15d..b259b969ce1bd0be1c69800a5e6130fe33643cb0 100644 (file)
--- 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 101f042a4311fb72fe50e9f6079fa124531c53c1..aa74480f17215c4c74284579d0d9ee3e3d9c5229 100644 (file)
--- 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 fa52c9bacaf79c6573db369ba9a3ad934bd41984..9e8a3821e59856ba5a7b807fcb49856991663094 100644 (file)
--- 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);