aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2020-04-03 17:10:32 +0200
committerGitHub <noreply@github.com>2020-04-03 17:10:32 +0200
commit3c09e1a5166bc8f976722d9cbee3817ee9504920 (patch)
treee04b4c9b60238130a48f5262c24efe4d3ba5aeda /setup.py
parent0b76afdf5759d229f5657d447866691c433caf45 (diff)
parent4bfb81c0089d0e0c1c24739f01fca41a3f055f3a (diff)
downloadmitmproxy-3c09e1a5166bc8f976722d9cbee3817ee9504920.tar.gz
mitmproxy-3c09e1a5166bc8f976722d9cbee3817ee9504920.tar.bz2
mitmproxy-3c09e1a5166bc8f976722d9cbee3817ee9504920.zip
Merge pull request #3692 from mhils/tls13
Update cryptography, enable TLS 1.3
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 2b66188e..d6016746 100644
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@ setup(
"Brotli>=1.0,<1.1",
"certifi>=2019.9.11", # no semver here - this should always be on the last release!
"click>=7.0,<8",
- "cryptography>=2.1.4,<2.5",
+ "cryptography>=2.9,<3.0",
"flask>=1.1.1,<1.2",
"h2>=3.2.0,<4",
"hyperframe>=5.1.0,<6",
@@ -75,7 +75,7 @@ setup(
"passlib>=1.6.5, <1.8",
"protobuf>=3.6.0, <3.11",
"pyasn1>=0.3.1,<0.5",
- "pyOpenSSL==19.0.0",
+ "pyOpenSSL>=19.1.0,<19.2",
"pyparsing>=2.4.2,<2.5",
"pyperclip>=1.6.0,<1.8",
"ruamel.yaml>=0.16,<0.17",