Skip to content
Snippets Groups Projects
Commit 96457286 authored by Richard van der Hoff's avatar Richard van der Hoff
Browse files

Don't create server contexts when TLS is disabled

we aren't going to use them anyway.
parent 086f6f27
No related branches found
No related tags found
No related merge requests found
Don't create server contexts when TLS is disabled
......@@ -214,6 +214,11 @@ def refresh_certificate(hs):
disk and updating the TLS context factories to use them.
"""
hs.config.read_certificate_from_disk()
if hs.config.no_tls:
# nothing else to do here
return
hs.tls_server_context_factory = context_factory.ServerContextFactory(hs.config)
if hs._listening_services:
......
......@@ -43,9 +43,7 @@ class ServerContextFactory(ContextFactory):
logger.exception("Failed to enable elliptic curve for TLS")
context.set_options(SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3)
context.use_certificate_chain_file(config.tls_certificate_file)
if not config.no_tls:
context.use_privatekey(config.tls_private_key)
context.use_privatekey(config.tls_private_key)
# https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers/
context.set_cipher_list(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment