diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-08-10 12:23:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-10 12:23:54 +0100 |
| commit | 3c0213a21754c9ad8f9309d7548284dd08302a92 (patch) | |
| tree | bc9f07fdeb29929d3601afbe9a5891d932e519f8 /synapse/crypto/keyring.py | |
| parent | Merge pull request #3655 from matrix-org/neilj/disable_hs (diff) | |
| parent | more generic conversion of str/bytes to unicode (diff) | |
| download | synapse-3c0213a21754c9ad8f9309d7548284dd08302a92.tar.xz | |
Merge pull request #3439 from vojeroen/send_sni_for_federation_requests
send SNI for federation requests
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. |