diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-09-09 12:02:07 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-09-09 12:02:07 +0100 |
| commit | 81a93ddcc8798568276582ed9c7a63bc64dc5bc0 (patch) | |
| tree | 6e90aaf6a19d5a7fd1f912111cb7ade49bb698cd /synapse/crypto/keyring.py | |
| parent | update logger to match new ambiguous script name... (diff) | |
| download | synapse-81a93ddcc8798568276582ed9c7a63bc64dc5bc0.tar.xz | |
Allow configuration to ignore invalid SSL certs
This will be useful for sytest, and sytest only, hence the aggressive config key name.
Diffstat (limited to 'synapse/crypto/keyring.py')
| -rw-r--r-- | synapse/crypto/keyring.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index a692cdbe55..e98a625fea 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -463,7 +463,7 @@ class Keyring(object): continue (response, tls_certificate) = yield fetch_server_key( - server_name, self.hs.tls_context_factory, + server_name, self.hs.tls_server_context_factory, path=(b"/_matrix/key/v2/server/%s" % ( urllib.quote(requested_key_id), )).encode("ascii"), @@ -597,7 +597,7 @@ class Keyring(object): # Try to fetch the key from the remote server. (response, tls_certificate) = yield fetch_server_key( - server_name, self.hs.tls_context_factory + server_name, self.hs.tls_server_context_factory ) # Check the response. |