diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-02-27 17:00:19 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-02-27 17:00:19 +0100 |
| commit | 738a7b34a243944a472e1f6909d515cf5b3b6f71 (patch) | |
| tree | 0a901022249784143dfc0c8bef15e7f27c64f7c1 /netlib/certutils.py | |
| parent | 224f737646a3f9d0d6540a295524806df7ed1943 (diff) | |
| parent | 2a2402dfffc9f1a51869170793673eaf49207d0f (diff) | |
| download | mitmproxy-738a7b34a243944a472e1f6909d515cf5b3b6f71.tar.gz mitmproxy-738a7b34a243944a472e1f6909d515cf5b3b6f71.tar.bz2 mitmproxy-738a7b34a243944a472e1f6909d515cf5b3b6f71.zip | |
Merge branch 'master' of github.com:mitmproxy/netlib
Diffstat (limited to 'netlib/certutils.py')
| -rw-r--r-- | netlib/certutils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/netlib/certutils.py b/netlib/certutils.py index af6177d8..5d8a56b8 100644 --- a/netlib/certutils.py +++ b/netlib/certutils.py @@ -6,7 +6,7 @@ from pyasn1.codec.der.decoder import decode from pyasn1.error import PyAsn1Error import OpenSSL -DEFAULT_EXP = 62208000 # =24 * 60 * 60 * 720 +DEFAULT_EXP = 157680000 # = 24 * 60 * 60 * 365 * 5 # Generated with "openssl dhparam". It's too slow to generate this on startup. DEFAULT_DHPARAM = """-----BEGIN DH PARAMETERS----- MIGHAoGBAOdPzMbYgoYfO3YBYauCLRlE8X1XypTiAjoeCFD0qWRx8YUsZ6Sj20W5 @@ -61,7 +61,7 @@ def dummy_cert(privkey, cacert, commonname, sans): cert = OpenSSL.crypto.X509() cert.gmtime_adj_notBefore(-3600*48) - cert.gmtime_adj_notAfter(60 * 60 * 24 * 30) + cert.gmtime_adj_notAfter(DEFAULT_EXP) cert.set_issuer(cacert.get_subject()) cert.get_subject().CN = commonname cert.set_serial_number(int(time.time()*10000)) |