Merge branch 'newsham-master'
This commit is contained in:
@@ -132,6 +132,9 @@ def _wrap_sni_socket(sock, sslopt, hostname, check_hostname):
|
|||||||
context.check_hostname = check_hostname
|
context.check_hostname = check_hostname
|
||||||
if 'ciphers' in sslopt:
|
if 'ciphers' in sslopt:
|
||||||
context.set_ciphers(sslopt['ciphers'])
|
context.set_ciphers(sslopt['ciphers'])
|
||||||
|
if 'cert_chain' in sslopt :
|
||||||
|
certfile,keyfile,password = sslopt['cert_chain']
|
||||||
|
context.load_cert_chain(certfile,keyfile,password)
|
||||||
|
|
||||||
return context.wrap_socket(
|
return context.wrap_socket(
|
||||||
sock,
|
sock,
|
||||||
|
Reference in New Issue
Block a user