diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-20 18:12:55 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-20 18:12:55 +0200 |
| commit | 3f1ca556d14ce71331b8dbc69be4db670863271a (patch) | |
| tree | f22b8f35250d8a6431235cb4f3eecb6874208e88 /netlib/certutils.py | |
| parent | 91cdd78201497e89b9a17275a484d461f0143137 (diff) | |
| download | mitmproxy-3f1ca556d14ce71331b8dbc69be4db670863271a.tar.gz mitmproxy-3f1ca556d14ce71331b8dbc69be4db670863271a.tar.bz2 mitmproxy-3f1ca556d14ce71331b8dbc69be4db670863271a.zip | |
python3++
Diffstat (limited to 'netlib/certutils.py')
| -rw-r--r-- | netlib/certutils.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/netlib/certutils.py b/netlib/certutils.py index 9193b757..df793537 100644 --- a/netlib/certutils.py +++ b/netlib/certutils.py @@ -5,6 +5,8 @@ import time import datetime import itertools 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 @@ -184,7 +186,7 @@ class CertStore(object): with open(path, "wb") as f: f.write(DEFAULT_DHPARAM) - bio = OpenSSL.SSL._lib.BIO_new_file(path, b"r") + bio = OpenSSL.SSL._lib.BIO_new_file(path.encode(sys.getfilesystemencoding()), b"r") if bio != OpenSSL.SSL._ffi.NULL: bio = OpenSSL.SSL._ffi.gc(bio, OpenSSL.SSL._lib.BIO_free) dh = OpenSSL.SSL._lib.PEM_read_bio_DHparams( @@ -318,10 +320,9 @@ class CertStore(object): potential_keys.append((commonname, tuple(sans))) name = next( - itertools.ifilter( - lambda key: key in self.certs, - potential_keys), - None) + filter(lambda key: key in self.certs, potential_keys), + None + ) if name: entry = self.certs[name] else: |