diff options
| author | Erik Johnston <erik@matrix.org> | 2021-03-26 12:26:58 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-03-26 12:26:58 +0000 |
| commit | 019010964de1e97dc14788f980af7f0943b9168c (patch) | |
| tree | 54a7121169aa821adc4fce1cbc14f0bf8047289b /synapse/python_dependencies.py | |
| parent | Preserve host in example apache config (#9696) (diff) | |
| parent | Update cahngelog (diff) | |
| download | synapse-019010964de1e97dc14788f980af7f0943b9168c.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/python_dependencies.py')
| -rw-r--r-- | synapse/python_dependencies.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 321a333820..14ddaed026 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -82,6 +82,9 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", + # We enforce that we have a `cryptography` version that bundles an `openssl` + # with the latest security patches. + "cryptography>=3.4.7;python_version>='3.6'", ] CONDITIONAL_REQUIREMENTS = { |