From 0b7b0ac33dd8bb5d057ebc36b8979d5e3ddc0384 Mon Sep 17 00:00:00 2001
From: elitest <dcypherd@gmail.com>
Date: Sat, 28 Feb 2015 10:16:31 -0600
Subject: Update Config.py to improve cipher selection

added support for specifying cipher suites on both sides of the proxy instead of just the one.
---
 libmproxy/proxy/config.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'libmproxy/proxy')

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
+    )
-- 
cgit v1.2.3