diff options
| author | Peter Powell <petpow@saberuk.com> | 2017-11-01 17:23:00 +0000 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2017-11-01 17:35:55 +0000 |
| commit | a2a071126726a40a877e10b024e2c2cccfd35512 (patch) | |
| tree | 90f48dd692b7c5090bfc15408874ee1ed053ce88 /src/modules | |
| parent | 906260c24f7818fb7cf15a0371d760acb1254113 (diff) | |
Fix some SSL module issues.
- Use the same dhparams name in m_ssl_openssl as in other modules.
- Fix building m_ssl_mbedtls.
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/extra/m_ssl_mbedtls.cpp | 6 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_openssl.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp index ec67d9787..4e0032fdc 100644 --- a/src/modules/extra/m_ssl_mbedtls.cpp +++ b/src/modules/extra/m_ssl_mbedtls.cpp @@ -782,6 +782,12 @@ class mbedTLSIOHook : public SSLIOHook out.append(ciphersuitestr + skip); } + bool GetServerName(std::string& out) const CXX11_OVERRIDE + { + // TODO: Implement SNI support. + return false; + } + bool IsHandshakeDone() const { return (status == ISSL_HANDSHAKEN); } }; diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 45a728106..9b7e608a2 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -307,7 +307,7 @@ namespace OpenSSL public: Profile(const std::string& profilename, ConfigTag* tag) : name(profilename) - , dh(ServerInstance->Config->Paths.PrependConfig(tag->getString("dhfile", "dh.pem"))) + , dh(ServerInstance->Config->Paths.PrependConfig(tag->getString("dhfile", "dhparams.pem"))) , ctx(SSL_CTX_new(SSLv23_server_method())) , clictx(SSL_CTX_new(SSLv23_client_method())) , allowrenego(tag->getBool("renegotiation")) // Disallow by default |