Fix whitelist check for a badchan redirect (#1676).

[user/henk/code/inspircd.git] / src / modules / extra / m_ssl_gnutls.cpp

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 56b60de260cab0d87830e4fb471f0a5783582f3f..5785b1ab4d8ecba76f6586d60c432f2163574eaf 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -37,20 +37,31 @@
 #include "modules/ssl.h"
 #include <memory>
 
+#ifdef __GNUC__
+# pragma GCC diagnostic push
+#endif
+
 // Fix warnings about the use of commas at end of enumerator lists on C++03.
 #if defined __clang__
 # pragma clang diagnostic ignored "-Wc++11-extensions"
 #elif defined __GNUC__
-# if __GNUC__ < 6
-#  pragma GCC diagnostic ignored "-pedantic"
+# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8))
+#  pragma GCC diagnostic ignored "-Wpedantic"
 # else
-#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  pragma GCC diagnostic ignored "-pedantic"
 # endif
 #endif
 
+// Fix warnings about using std::auto_ptr on C++11 or newer.
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 
+#ifdef __GNUC__
+# pragma GCC diagnostic pop
+#endif
+
 #ifndef GNUTLS_VERSION_NUMBER
 #define GNUTLS_VERSION_NUMBER LIBGNUTLS_VERSION_NUMBER
 #define GNUTLS_VERSION LIBGNUTLS_VERSION
@@ -184,14 +195,12 @@ namespace GnuTLS
                                throw Exception("Unknown hash type " + hashname);
                        gnutls_hash_deinit(is_digest, NULL);
 #else
-                       if (hashname == "md5")
+                       if (stdalgo::string::equalsci(hashname, "md5"))
                                hash = GNUTLS_DIG_MD5;
-                       else if (hashname == "sha1")
+                       else if (stdalgo::string::equalsci(hashname, "sha1"))
                                hash = GNUTLS_DIG_SHA1;
-#ifdef INSPIRCD_GNUTLS_ENABLE_SHA256_FINGERPRINT
-                       else if (hashname == "sha256")
+                       else if (stdalgo::string::equalsci(hashname, "sha256"))
                                hash = GNUTLS_DIG_SHA256;
-#endif
                        else
                                throw Exception("Unknown hash type " + hashname);
 #endif
@@ -650,7 +659,7 @@ namespace GnuTLS
                                , keystr(ReadFile(tag->getString("keyfile", "key.pem")))
                                , dh(DHParams::Import(ReadFile(tag->getString("dhfile", "dhparams.pem"))))
                                , priostr(GetPrioStr(profilename, tag))
-                               , mindh(tag->getInt("mindhbits", 1024))
+                               , mindh(tag->getUInt("mindhbits", 1024))
                                , hashstr(tag->getString("hash", "md5"))
                                , requestclientcert(tag->getBool("requestclientcert", true))
                        {
@@ -667,9 +676,9 @@ namespace GnuTLS
 
 #ifdef INSPIRCD_GNUTLS_HAS_CORK
                                // If cork support is available outrecsize represents the (rough) max amount of data we give GnuTLS while corked
-                               outrecsize = tag->getInt("outrecsize", 2048, 512);
+                               outrecsize = tag->getUInt("outrecsize", 2048, 512);
 #else
-                               outrecsize = tag->getInt("outrecsize", 2048, 512, 16384);
+                               outrecsize = tag->getUInt("outrecsize", 2048, 512, 16384);
 #endif
                        }
                };
@@ -1298,7 +1307,7 @@ class ModuleSSLGnuTLS : public Module
                for (ConfigIter i = tags.first; i != tags.second; ++i)
                {
                        ConfigTag* tag = i->second;
-                       if (tag->getString("provider") != "gnutls")
+                       if (!stdalgo::string::equalsci(tag->getString("provider"), "gnutls"))
                                continue;
 
                        std::string name = tag->getString("name");
@@ -1386,7 +1395,7 @@ class ModuleSSLGnuTLS : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides SSL support for clients", VF_VENDOR);
+               return Version("Provides SSL support via GnuTLS", VF_VENDOR);
        }
 
        ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE