diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-03-02 15:56:36 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-03-02 15:56:36 +1300 |
| commit | 0177eb899a87995d0faaed8a836904cac7f844ce (patch) | |
| tree | df85c3eaf40d75115c9c8f51f80176559297cbae /libpathod/pathod.py | |
| parent | 234d326080ac471ed5a92f08db458f29568f0dd4 (diff) | |
| download | mitmproxy-0177eb899a87995d0faaed8a836904cac7f844ce.tar.gz mitmproxy-0177eb899a87995d0faaed8a836904cac7f844ce.tar.bz2 mitmproxy-0177eb899a87995d0faaed8a836904cac7f844ce.zip | |
Support cert/key combo files in args. Improve argument names in SSLOptions
Diffstat (limited to 'libpathod/pathod.py')
| -rw-r--r-- | libpathod/pathod.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libpathod/pathod.py b/libpathod/pathod.py index 2feb6996..0e3cca59 100644 --- a/libpathod/pathod.py +++ b/libpathod/pathod.py @@ -14,19 +14,19 @@ class PathodError(Exception): pass class SSLOptions: - def __init__(self, confdir=CONFDIR, cn=None, certfile=None, cacert=None, + def __init__(self, confdir=CONFDIR, cn=None, certfile=None, keyfile=None, not_after_connect=None, request_client_cert=False, sslversion=tcp.SSLv23_METHOD, ciphers=None): self.confdir = confdir self.cn = cn - if cacert: - self.cacert = os.path.expanduser(cacert) + if keyfile: + self.keyfile = os.path.expanduser(keyfile) else: - cacert = os.path.join(confdir, CA_CERT_NAME) - self.cacert = os.path.expanduser(cacert) - if not os.path.exists(self.cacert): - certutils.dummy_ca(self.cacert) - self.certstore = certutils.CertStore(self.cacert) + keyfile = os.path.join(confdir, CA_CERT_NAME) + self.keyfile = os.path.expanduser(keyfile) + if not os.path.exists(self.keyfile): + certutils.dummy_ca(self.keyfile) + self.certstore = certutils.CertStore(self.keyfile) self.certfile = certfile self.not_after_connect = not_after_connect self.request_client_cert = request_client_cert @@ -104,7 +104,7 @@ class PathodHandler(tcp.BaseHandler): try: self.convert_to_ssl( self.server.ssloptions.get_cert(None), - self.server.ssloptions.cacert, + self.server.ssloptions.keyfile, handle_sni = self.handle_sni, request_client_cert = self.server.ssloptions.request_client_cert, cipher_list = self.server.ssloptions.ciphers, @@ -212,7 +212,7 @@ class PathodHandler(tcp.BaseHandler): try: self.convert_to_ssl( self.server.ssloptions.get_cert(None), - self.server.ssloptions.cacert, + self.server.ssloptions.keyfile, handle_sni = self.handle_sni, request_client_cert = self.server.ssloptions.request_client_cert, cipher_list = self.server.ssloptions.ciphers, |