aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/certs.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2017-01-19 20:55:19 +0100
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2017-01-23 15:14:56 +0100
commit006eb39cc562ff3f8b741f9d022503081861827f (patch)
tree28a9e2d8f994ef5924108085f2e5a0b59432a729 /mitmproxy/certs.py
parent86174eb6adfb83de6ba4dfbcff73ee9cb18ac4aa (diff)
downloadmitmproxy-006eb39cc562ff3f8b741f9d022503081861827f.tar.gz
mitmproxy-006eb39cc562ff3f8b741f9d022503081861827f.tar.bz2
mitmproxy-006eb39cc562ff3f8b741f9d022503081861827f.zip
fix #939
Diffstat (limited to 'mitmproxy/certs.py')
-rw-r--r--mitmproxy/certs.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mitmproxy/certs.py b/mitmproxy/certs.py
index 4e4eb4d1..4b939c80 100644
--- a/mitmproxy/certs.py
+++ b/mitmproxy/certs.py
@@ -3,8 +3,8 @@ import ssl
import time
import datetime
import ipaddress
-
import sys
+
from pyasn1.type import univ, constraint, char, namedtype, tag
from pyasn1.codec.der.decoder import decode
from pyasn1.error import PyAsn1Error
@@ -13,8 +13,8 @@ import OpenSSL
from mitmproxy.types import serializable
# Default expiry must not be too long: https://github.com/mitmproxy/mitmproxy/issues/815
-
DEFAULT_EXP = 94608000 # = 24 * 60 * 60 * 365 * 3
+
# Generated with "openssl dhparam". It's too slow to generate this on startup.
DEFAULT_DHPARAM = b"""
-----BEGIN DH PARAMETERS-----