summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-03-26 12:00:25 +0000
committerGitHub <noreply@github.com>2021-03-26 12:00:25 +0000
commit12d61847133c4da60d3e511af37d6f7e548ccb7a (patch)
tree4fd80e1684010d64315ef7b2144714575e5ab4c8 /synapse
parent 1.30.0 (diff)
downloadsynapse-12d61847133c4da60d3e511af37d6f7e548ccb7a.tar.xz
Explicitly upgrade openssl in docker file and enforce new version of cryptography (#9697)
Diffstat (limited to '')
-rw-r--r--synapse/python_dependencies.py3
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 = {