From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 17 Apr 2014 10:30:14 +0000 (+0200)
Subject: Add a --ciphers option to Lib/test/ssl_servers.py
X-Git-Tag: v3.5.0a1~1836
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=617c4dc30427041984a21b3ca3873a585ca2cb1a;p=thirdparty%2FPython%2Fcpython.git

Add a --ciphers option to Lib/test/ssl_servers.py
---

diff --git a/Lib/test/ssl_servers.py b/Lib/test/ssl_servers.py
index e6ae7c499ce7..f9d30cf0bd73 100644
--- a/Lib/test/ssl_servers.py
+++ b/Lib/test/ssl_servers.py
@@ -182,6 +182,8 @@ if __name__ == "__main__":
     parser.add_argument('--curve-name', dest='curve_name', type=str,
                         action='store',
                         help='curve name for EC-based Diffie-Hellman')
+    parser.add_argument('--ciphers', dest='ciphers', type=str,
+                        help='allowed cipher list')
     parser.add_argument('--dh', dest='dh_file', type=str, action='store',
                         help='PEM file containing DH parameters')
     args = parser.parse_args()
@@ -198,6 +200,8 @@ if __name__ == "__main__":
         context.set_ecdh_curve(args.curve_name)
     if args.dh_file:
         context.load_dh_params(args.dh_file)
+    if args.ciphers:
+        context.set_ciphers(args.ciphers)
 
     server = HTTPSServer(("", args.port), handler_class, context)
     if args.verbose: