diff options
| author | Erik Johnston <erik@matrix.org> | 2019-06-10 18:16:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-10 18:16:12 +0100 |
| commit | a6b181794081e49ceb455cd97dec427e897ef269 (patch) | |
| tree | 26d08d9c022d9f1baab7407646c48e386267b1ff /synapse/python_dependencies.py | |
| parent | Merge branch 'erikj/fix_null_valid_until_ms' of github.com:matrix-org/synapse... (diff) | |
| parent | fix ci on py2, again (diff) | |
| download | synapse-a6b181794081e49ceb455cd97dec427e897ef269.tar.xz | |
Merge pull request #5417 from matrix-org/rav/shared_ssl_context
Share an SSL context object between SSL connections
Diffstat (limited to 'synapse/python_dependencies.py')
| -rw-r--r-- | synapse/python_dependencies.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index c78f2cb15e..6efd81f204 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -44,7 +44,10 @@ REQUIREMENTS = [ "canonicaljson>=1.1.3", "signedjson>=1.0.0", "pynacl>=1.2.1", - "service_identity>=16.0.0", + "idna>=2", + + # validating SSL certs for IP addresses requires service_identity 18.1. + "service_identity>=18.1.0", # our logcontext handling relies on the ability to cancel inlineCallbacks # (https://twistedmatrix.com/trac/ticket/4632) which landed in Twisted 18.7. |