aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy
diff options
context:
space:
mode:
authorelitest <dcypherd@gmail.com>2015-02-28 10:16:31 -0600
committerelitest <dcypherd@gmail.com>2015-02-28 10:16:31 -0600
commit0b7b0ac33dd8bb5d057ebc36b8979d5e3ddc0384 (patch)
tree41d2923aad0023d18a0367bcf29cdbf92f6dcd85 /libmproxy/proxy
parenteec4c539f2f6b8124ab92d6087afb228874a479e (diff)
downloadmitmproxy-0b7b0ac33dd8bb5d057ebc36b8979d5e3ddc0384.tar.gz
mitmproxy-0b7b0ac33dd8bb5d057ebc36b8979d5e3ddc0384.tar.bz2
mitmproxy-0b7b0ac33dd8bb5d057ebc36b8979d5e3ddc0384.zip
Update Config.py to improve cipher selection
added support for specifying cipher suites on both sides of the proxy instead of just the one.
Diffstat (limited to 'libmproxy/proxy')
-rw-r--r--libmproxy/proxy/config.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py
index 84893323..335d2dcf 100644
--- a/libmproxy/proxy/config.py
+++ b/libmproxy/proxy/config.py
@@ -55,7 +55,8 @@ class ProxyConfig:
self.host = host
self.port = port
self.server_version = server_version
- self.ciphers = ciphers
+ self.client_ciphers = client_ciphers
+ self.server_ciphers = server_ciphers
self.clientcerts = clientcerts
self.no_upstream_cert = no_upstream_cert
self.body_size_limit = body_size_limit
@@ -215,9 +216,14 @@ def ssl_option_group(parser):
help="Client certificate directory."
)
group.add_argument(
- "--ciphers", action="store",
- type=str, dest="ciphers", default=None,
- help="SSL cipher specification."
+ "--client-ciphers", action="store",
+ type=str, dest="client_ciphers", default=None,
+ help="Proxy client SSL cipher specification."
+ )
+ group.add_argument(
+ "--server-ciphers", action="store",
+ type=str, dest="server_ciphers", default=None,
+ help="Proxy server SSL cipher specification."
)
group.add_argument(
"--cert-forward", action="store_true",
@@ -248,4 +254,4 @@ def ssl_option_group(parser):
metavar="PORT",
help="Can be passed multiple times. Specify destination ports which are assumed to be SSL. "
"Defaults to %s." % str(TRANSPARENT_SSL_PORTS)
- ) \ No newline at end of file
+ )