diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-15 14:25:46 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-15 14:25:46 +0100 |
| commit | ef184caf30e69593b5f224f4a0ffde3605da2153 (patch) | |
| tree | c4affbe31ecedbee84ddf70bfc2f2c39d15e831a /synapse/crypto/keyring.py | |
| parent | Use federation handler function rather than duplicate (diff) | |
| parent | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name (diff) | |
| download | synapse-ef184caf30e69593b5f224f4a0ffde3605da2153.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_federation
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 e95b9fb43e..30e2742102 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -512,7 +512,7 @@ class Keyring(object): continue (response, tls_certificate) = yield fetch_server_key( - server_name, self.hs.tls_server_context_factory, + server_name, self.hs.tls_client_options_factory, path=(b"/_matrix/key/v2/server/%s" % ( urllib.quote(requested_key_id), )).encode("ascii"), @@ -655,7 +655,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_server_context_factory + server_name, self.hs.tls_client_options_factory ) # Check the response. |