diff options
| author | Aldo Cortesi <aldo@corte.si> | 2014-09-07 12:50:36 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2014-09-07 12:50:36 +1200 |
| commit | 5dcc7f78df280dc2b7a1e65b63725f9f4967db8f (patch) | |
| tree | c6fb9661bb19b2e05b9c40da5082af17ebaa4e61 /netlib | |
| parent | 754b62793702ab1f9197f2fad1f52d3758667d72 (diff) | |
| parent | d8f54c7c038872fb6f05952214654843c9103da1 (diff) | |
| download | mitmproxy-5dcc7f78df280dc2b7a1e65b63725f9f4967db8f.tar.gz mitmproxy-5dcc7f78df280dc2b7a1e65b63725f9f4967db8f.tar.bz2 mitmproxy-5dcc7f78df280dc2b7a1e65b63725f9f4967db8f.zip | |
Merge pull request #34 from bbaetz/master
Change the criticality of a number of X509 extentions, to match
Diffstat (limited to 'netlib')
| -rw-r--r-- | netlib/certutils.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/netlib/certutils.py b/netlib/certutils.py index 84316882..fe067ca1 100644 --- a/netlib/certutils.py +++ b/netlib/certutils.py @@ -31,10 +31,10 @@ def create_ca(o, cn, exp): "CA:TRUE"), OpenSSL.crypto.X509Extension("nsCertType", False, "sslCA"), - OpenSSL.crypto.X509Extension("extendedKeyUsage", True, + OpenSSL.crypto.X509Extension("extendedKeyUsage", False, "serverAuth,clientAuth,emailProtection,timeStamping,msCodeInd,msCodeCom,msCTLSign,msSGC,msEFS,nsSGC" ), - OpenSSL.crypto.X509Extension("keyUsage", False, + OpenSSL.crypto.X509Extension("keyUsage", True, "keyCertSign, cRLSign"), OpenSSL.crypto.X509Extension("subjectKeyIdentifier", False, "hash", subject=cert), @@ -67,7 +67,7 @@ def dummy_cert(privkey, cacert, commonname, sans): cert.set_serial_number(int(time.time()*10000)) if ss: cert.set_version(2) - cert.add_extensions([OpenSSL.crypto.X509Extension("subjectAltName", True, ss)]) + cert.add_extensions([OpenSSL.crypto.X509Extension("subjectAltName", False, ss)]) cert.set_pubkey(cacert.get_pubkey()) cert.sign(privkey, "sha1") return SSLCert(cert) @@ -362,4 +362,4 @@ class SSLCert: continue for i in dec[0]: altnames.append(i[0].asOctets()) - return altnames
\ No newline at end of file + return altnames |