aboutsummaryrefslogtreecommitdiffstats
path: root/pathod/pathoc.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-09-04 17:32:49 +0200
committerGitHub <noreply@github.com>2017-09-04 17:32:49 +0200
commit68fab8bd92c87f5c91f94c8837477418d5b5ea3e (patch)
treef240abdb8032eb47c7471522cdfca428d1b1ca9c /pathod/pathoc.py
parent96854cff528ebc9ef2576b3d55f712f28626ff84 (diff)
parentde006ea8adc08b9a8a6aa94eda2b30468727c307 (diff)
downloadmitmproxy-68fab8bd92c87f5c91f94c8837477418d5b5ea3e.tar.gz
mitmproxy-68fab8bd92c87f5c91f94c8837477418d5b5ea3e.tar.bz2
mitmproxy-68fab8bd92c87f5c91f94c8837477418d5b5ea3e.zip
Merge pull request #2560 from mhils/mitmproxy-net-tls
Split TLS parts from net.tcp into net.tls
Diffstat (limited to 'pathod/pathoc.py')
-rw-r--r--pathod/pathoc.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pathod/pathoc.py b/pathod/pathoc.py
index 63a15b55..e1052750 100644
--- a/pathod/pathoc.py
+++ b/pathod/pathoc.py
@@ -13,7 +13,7 @@ import logging
from mitmproxy import certs
from mitmproxy import exceptions
-from mitmproxy.net import tcp
+from mitmproxy.net import tcp, tls
from mitmproxy.net import websockets
from mitmproxy.net import socks
from mitmproxy.net import http as net_http
@@ -158,8 +158,8 @@ class Pathoc(tcp.TCPClient):
# SSL
ssl=None,
sni=None,
- ssl_version=tcp.SSL_DEFAULT_METHOD,
- ssl_options=tcp.SSL_DEFAULT_OPTIONS,
+ ssl_version=tls.DEFAULT_METHOD,
+ ssl_options=tls.DEFAULT_OPTIONS,
clientcert=None,
ciphers=None,