aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/net
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2018-02-07 13:50:26 +0100
committerMaximilian Hils <git@maximilianhils.com>2018-02-08 13:17:33 +0100
commite4f70b795723c5e477198294f3bb8eae245b2b46 (patch)
tree192974cfeaf9c2d5368b309642b15886a66abaec /mitmproxy/net
parent4decb5c2e321f582cb99f70aa2d19c533dee3b2f (diff)
downloadmitmproxy-e4f70b795723c5e477198294f3bb8eae245b2b46.tar.gz
mitmproxy-e4f70b795723c5e477198294f3bb8eae245b2b46.tar.bz2
mitmproxy-e4f70b795723c5e477198294f3bb8eae245b2b46.zip
use TLS options also for request replay, refs #2840
Diffstat (limited to 'mitmproxy/net')
-rw-r--r--mitmproxy/net/tls.py21
1 files changed, 21 insertions, 0 deletions
diff --git a/mitmproxy/net/tls.py b/mitmproxy/net/tls.py
index 0e43a2ac..f8eeb44b 100644
--- a/mitmproxy/net/tls.py
+++ b/mitmproxy/net/tls.py
@@ -13,6 +13,7 @@ import certifi
from OpenSSL import SSL
from kaitaistruct import KaitaiStream
+import mitmproxy.options # noqa
from mitmproxy import exceptions, certs
from mitmproxy.contrib.kaitaistruct import tls_client_hello
from mitmproxy.net import check
@@ -57,6 +58,26 @@ METHOD_NAMES = {
}
+def client_arguments_from_options(options: "mitmproxy.options.Options") -> dict:
+
+ if options.ssl_insecure:
+ verify = SSL.VERIFY_NONE
+ else:
+ verify = SSL.VERIFY_PEER
+
+ method, tls_options = VERSION_CHOICES[options.ssl_version_server]
+
+ return {
+ "verify": verify,
+ "method": method,
+ "options": tls_options,
+ "ca_path": options.ssl_verify_upstream_trusted_cadir,
+ "ca_pemfile": options.ssl_verify_upstream_trusted_ca,
+ "client_certs": options.client_certs,
+ "cipher_list": options.ciphers_server,
+ }
+
+
class MasterSecretLogger:
def __init__(self, filename):
self.filename = filename