summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-04-02 10:57:18 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2019-04-02 10:57:18 +0100
commitfec0c9a0745f5c3ebaad98f8b1788c5b74a93bef (patch)
treef3d801b41725066d8626317adede0ae62568fb58 /synapse
parentDon't run validation code if validation is turned off (diff)
downloadsynapse-fec0c9a0745f5c3ebaad98f8b1788c5b74a93bef.tar.xz
Remove TODO
Diffstat (limited to 'synapse')
-rw-r--r--synapse/crypto/context_factory.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/crypto/context_factory.py b/synapse/crypto/context_factory.py

index 97c796a047..0035846de0 100644 --- a/synapse/crypto/context_factory.py +++ b/synapse/crypto/context_factory.py
@@ -146,6 +146,7 @@ class ClientTLSOptionsFactory(object): # Check if certificate verification has been enabled if (self._config.federation_verify_certificates and + self._config.federation_certificate_validation_whitelist and host not in self._config.federation_certificate_validation_whitelist): # Require verification return ClientTLSOptions(host, self._options_validate._makeContext())