diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2013-07-06 08:27:08 -0700 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2013-07-06 08:27:08 -0700 |
| commit | 752cb8b179cc1cbec3f36d7a3084fa98a81f92d8 (patch) | |
| tree | e16459f7fc7484883a9bec0f08de084ff3c3443f /src/modules/extra/m_ssl_gnutls.cpp | |
| parent | 27ae66eb3fb7056570936e7f4655ec3128bac2a7 (diff) | |
| parent | b31b911bba26d59ba6b44cf314b6b0e3e58e6d85 (diff) | |
Merge pull request #573 from ShutterQuick/inspircd+sslhash
Allow the user to specify any hashing mechanism supported by the underlying SSL library
Diffstat (limited to 'src/modules/extra/m_ssl_gnutls.cpp')
| -rw-r--r-- | src/modules/extra/m_ssl_gnutls.cpp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index f6268c8d6..c303aa98f 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -28,6 +28,11 @@ #include "modules/ssl.h" #include "modules/cap.h" +#if ((GNUTLS_VERSION_MAJOR > 2) || (GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR > 9) || (GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR == 9 && GNUTLS_VERSION_PATCH >= 8)) +#define GNUTLS_HAS_MAC_GET_ID +#include <gnutls/crypto.h> +#endif + #ifdef _WIN32 # pragma comment(lib, "libgnutls.lib") # pragma comment(lib, "libgcrypt.lib") @@ -701,13 +706,28 @@ class ModuleSSLGnuTLS : public Module iohook.dh_bits = dh_bits; + // As older versions of gnutls can't do this, let's disable it where needed. +#ifdef GNUTLS_HAS_MAC_GET_ID + // As gnutls_digest_algorithm_t and gnutls_mac_algorithm_t are mapped 1:1, we can do this + // There is no gnutls_dig_get_id() at the moment, but it may come later + iohook.hash = (gnutls_digest_algorithm_t)gnutls_mac_get_id(hashname.c_str()); + if (iohook.hash == GNUTLS_DIG_UNKNOWN) + throw ModuleException("Unknown hash type " + hashname); + + // Check if the user is walking around with their head in the ass, + // giving us something that is a valid MAC but not digest + gnutls_hash_hd_t is_digest; + if (gnutls_hash_init(&is_digest, iohook.hash) < 0) + throw ModuleException("Unknown hash type " + hashname); + gnutls_hash_deinit(is_digest, NULL); +#else if (hashname == "md5") iohook.hash = GNUTLS_DIG_MD5; else if (hashname == "sha1") iohook.hash = GNUTLS_DIG_SHA1; else throw ModuleException("Unknown hash type " + hashname); - +#endif int ret; |