diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-07 00:23:39 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 00:23:39 +1000 |
| commit | 135f3b4390fa00b44d8f872e995be46dad0b1d96 (patch) | |
| tree | f557b06c48b20b32eba94900d6f0eb8ad628f349 | |
| parent | Port handlers/ to Python 3 (#3803) (diff) | |
| parent | changelog (diff) | |
| download | synapse-135f3b4390fa00b44d8f872e995be46dad0b1d96.tar.xz | |
Merge pull request #3804 from matrix-org/rav/fix_openssl_dep
bump dep on pyopenssl to 16.x
| -rw-r--r-- | changelog.d/3804.bugfix | 1 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/3804.bugfix b/changelog.d/3804.bugfix new file mode 100644 index 0000000000..a0cef20e3f --- /dev/null +++ b/changelog.d/3804.bugfix @@ -0,0 +1 @@ +Bump dependency on pyopenssl 16.x, to avoid incompatibility with recent Twisted. diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 6dd5179320..0d8de600cf 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -42,8 +42,8 @@ REQUIREMENTS = { "Twisted>=17.1.0": ["twisted>=17.1.0"], "treq>=15.1": ["treq>=15.1"], - # We use crypto.get_elliptic_curve which is only supported in >=0.15 - "pyopenssl>=0.15": ["OpenSSL>=0.15"], + # Twisted has required pyopenssl 16.0 since about Twisted 16.6. + "pyopenssl>=16.0.0": ["OpenSSL>=16.0.0"], "pyyaml": ["yaml"], "pyasn1": ["pyasn1"], |