diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-08-16 15:53:07 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-08-16 15:53:07 +0200 |
| commit | 6d1b601ddf070ef1335be1804386fa0f4a2fcbd4 (patch) | |
| tree | 54c3a433a9562759a02bc5b57008c7ff6fe1b3c0 /netlib/certutils.py | |
| parent | 1c1167eda0a2757b8fb6588f0400d47020fdb1ab (diff) | |
| download | mitmproxy-6d1b601ddf070ef1335be1804386fa0f4a2fcbd4.tar.gz mitmproxy-6d1b601ddf070ef1335be1804386fa0f4a2fcbd4.tar.bz2 mitmproxy-6d1b601ddf070ef1335be1804386fa0f4a2fcbd4.zip | |
minor cleanups
Diffstat (limited to 'netlib/certutils.py')
| -rw-r--r-- | netlib/certutils.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/netlib/certutils.py b/netlib/certutils.py index 308d6cf8..18179917 100644 --- a/netlib/certutils.py +++ b/netlib/certutils.py @@ -1,11 +1,10 @@ +from __future__ import (absolute_import, print_function, division) import os, ssl, time, datetime import itertools from pyasn1.type import univ, constraint, char, namedtype, tag from pyasn1.codec.der.decoder import decode from pyasn1.error import PyAsn1Error import OpenSSL -import tcp -import UserDict DEFAULT_EXP = 62208000 # =24 * 60 * 60 * 720 # Generated with "openssl dhparam". It's too slow to generate this on startup. @@ -255,7 +254,7 @@ class CertStore: return c[0], (c[1] or self.privkey) def gen_pkey(self, cert): - import certffi + from . import certffi certffi.set_flags(self.privkey, 1) return self.privkey @@ -360,12 +359,4 @@ class SSLCert: continue for i in dec[0]: altnames.append(i[0].asOctets()) - return altnames - - - -def get_remote_cert(host, port, sni): - c = tcp.TCPClient((host, port)) - c.connect() - c.convert_to_ssl(sni=sni) - return c.cert + return altnames
\ No newline at end of file |