diff options
author | Adam <Adam@anope.org> | 2013-08-23 00:57:36 -0400 |
---|---|---|
committer | Adam <Adam@anope.org> | 2013-08-23 00:57:36 -0400 |
commit | 154fa25e8fc33c2ce77cb0612c1587cec4f32300 (patch) | |
tree | f869c58dbd8252170f12faa59928ce991d191792 /modules/extra/m_ssl.cpp | |
parent | 2b1f75a3132b6a5719db188311d63154c287b601 (diff) |
Fix m_httpd handling fragmented http requests
Diffstat (limited to 'modules/extra/m_ssl.cpp')
-rw-r--r-- | modules/extra/m_ssl.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/modules/extra/m_ssl.cpp b/modules/extra/m_ssl.cpp index 10d1b5807..c1ba3f76a 100644 --- a/modules/extra/m_ssl.cpp +++ b/modules/extra/m_ssl.cpp @@ -116,7 +116,6 @@ class SSLModule : public Module Anope::string context_name = "Anope"; SSL_CTX_set_session_id_context(client_ctx, reinterpret_cast<const unsigned char *>(context_name.c_str()), context_name.length()); SSL_CTX_set_session_id_context(server_ctx, reinterpret_cast<const unsigned char *>(context_name.c_str()), context_name.length()); - } ~SSLModule() @@ -144,11 +143,7 @@ class SSLModule : public Module if (Anope::IsFile(this->certfile.c_str())) { if (!SSL_CTX_use_certificate_file(client_ctx, this->certfile.c_str(), SSL_FILETYPE_PEM) || !SSL_CTX_use_certificate_file(server_ctx, this->certfile.c_str(), SSL_FILETYPE_PEM)) - { - SSL_CTX_free(client_ctx); - SSL_CTX_free(server_ctx); throw ConfigException("Error loading certificate"); - } else Log(LOG_DEBUG) << "m_ssl: Successfully loaded certificate " << this->certfile; } @@ -158,22 +153,14 @@ class SSLModule : public Module if (Anope::IsFile(this->keyfile.c_str())) { if (!SSL_CTX_use_PrivateKey_file(client_ctx, this->keyfile.c_str(), SSL_FILETYPE_PEM) || !SSL_CTX_use_PrivateKey_file(server_ctx, this->keyfile.c_str(), SSL_FILETYPE_PEM)) - { - SSL_CTX_free(client_ctx); - SSL_CTX_free(server_ctx); throw ConfigException("Error loading private key"); - } else Log(LOG_DEBUG) << "m_ssl: Successfully loaded private key " << this->keyfile; } else { if (Anope::IsFile(this->certfile.c_str())) - { - SSL_CTX_free(client_ctx); - SSL_CTX_free(server_ctx); throw ConfigException("Error loading private key " + this->keyfile + " - file not found"); - } else Log() << "Unable to open private key " << this->keyfile; } |