Merge pull request #272 from matrix-org/daniel/insecureclient

Allow configuration to ignore invalid SSL certs
This commit is contained in:
Daniel Wagner-Hall 2015-09-15 16:52:38 +01:00
commit 2c8f16257a
7 changed files with 55 additions and 12 deletions

View file

@ -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.