diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2013-01-05 16:48:49 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2013-01-05 16:48:49 +1300 |
| commit | 1e932e704577ff8159f93d424d4b7041dec29eea (patch) | |
| tree | 0e44bc0b17af293a4721978cd3223cf48efca625 /libpathod/test.py | |
| parent | 3886ccae9379d065e54e0eb7e961992ff3c0ee62 (diff) | |
| download | mitmproxy-1e932e704577ff8159f93d424d4b7041dec29eea.tar.gz mitmproxy-1e932e704577ff8159f93d424d4b7041dec29eea.tar.bz2 mitmproxy-1e932e704577ff8159f93d424d4b7041dec29eea.zip | |
Collect SSL options into an SSLOptions object
Also split SSL cert specifications from SSL service mode - we can now enter SSL
service mode through a proxy CONNECT request as well.
Diffstat (limited to 'libpathod/test.py')
| -rw-r--r-- | libpathod/test.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libpathod/test.py b/libpathod/test.py index 22dc035d..5ff7180c 100644 --- a/libpathod/test.py +++ b/libpathod/test.py @@ -71,17 +71,9 @@ class _PaThread(threading.Thread): self.daemonargs = daemonargs def run(self): - if self.ssl is True: - ssloptions = dict( - keyfile = utils.data.path("resources/server.key"), - certfile = utils.data.path("resources/server.crt"), - ssl_after_connect = False - ) - else: - ssloptions = self.ssl self.server = pathod.Pathod( (self.iface, 0), - ssloptions = ssloptions, + ssl = self.ssl, **self.daemonargs ) self.q.put(self.server.port) |