diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-09-15 16:52:38 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-09-15 16:52:38 +0100 |
| commit | 2c8f16257a3c8d4ad330f584f59f5e678207af14 (patch) | |
| tree | 2745c1dff2e67b7bec31ca96d79bce999f9bf788 /synapse/crypto | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Use shorter config key name (diff) | |
| download | synapse-2c8f16257a3c8d4ad330f584f59f5e678207af14.tar.xz | |
Merge pull request #272 from matrix-org/daniel/insecureclient
Allow configuration to ignore invalid SSL certs
Diffstat (limited to 'synapse/crypto')
| -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 e251ab6af3..1b1b31c5c0 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -470,7 +470,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"), @@ -604,7 +604,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. |