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/keyclient.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/keyclient.py')
| -rw-r--r-- | synapse/crypto/keyclient.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/crypto/keyclient.py b/synapse/crypto/keyclient.py index 668b4f517d..c20a32096a 100644 --- a/synapse/crypto/keyclient.py +++ b/synapse/crypto/keyclient.py @@ -30,14 +30,14 @@ KEY_API_V1 = b"/_matrix/key/v1/" @defer.inlineCallbacks -def fetch_server_key(server_name, ssl_context_factory, path=KEY_API_V1): +def fetch_server_key(server_name, tls_client_options_factory, path=KEY_API_V1): """Fetch the keys for a remote server.""" factory = SynapseKeyClientFactory() factory.path = path factory.host = server_name endpoint = matrix_federation_endpoint( - reactor, server_name, ssl_context_factory, timeout=30 + reactor, server_name, tls_client_options_factory, timeout=30 ) for i in range(5): |