specified cipher_list in a few more locations, added a missing comma

This commit is contained in:
Jim Shaver 2015-03-01 20:12:27 -06:00
parent 6a1e294149
commit b063d6020f
3 changed files with 5 additions and 3 deletions

View File

@ -45,7 +45,8 @@ class ProxyConfig:
authenticator=None,
ignore_hosts=[],
tcp_hosts=[],
ciphers=None,
client_ciphers=None,
server_ciphers=None,
certs=[],
certforward=False,
ssl_version_client="secure",
@ -189,7 +190,8 @@ def process_proxy_options(parser, options):
ignore_hosts=options.ignore_hosts,
tcp_hosts=options.tcp_hosts,
authenticator=authenticator,
ciphers=options.ciphers,
client_ciphers=options.client_ciphers,
server_ciphers=options.server_ciphers,
certs=certs,
certforward=options.certforward,
ssl_version_client=options.ssl_version_client,

View File

@ -188,7 +188,7 @@ class ConnectionHandler:
self.config.clientcerts,
sni,
method=self.config.openssl_server_method,
options=self.config.openssl_server_options
options=self.config.openssl_server_options,
cipher_list=self.config.server_ciphers,
)
except tcp.NetLibError as v:

0
setup.py Normal file → Executable file
View File