Rename certificate key password option
This commit is contained in:
parent
0163e4060b
commit
92cb3d8355
|
@ -478,7 +478,7 @@ def websockify_init():
|
|||
help="SSL certificate file")
|
||||
parser.add_option("--key", default=None,
|
||||
help="SSL key file (if separate from cert)")
|
||||
parser.add_option("--password", default=None,
|
||||
parser.add_option("--key-password", default=None,
|
||||
help="SSL key password")
|
||||
parser.add_option("--ssl-only", action="store_true",
|
||||
help="disallow non-encrypted client connections")
|
||||
|
|
|
@ -340,7 +340,7 @@ class WebSockifyServer(object):
|
|||
|
||||
def __init__(self, RequestHandlerClass, listen_fd=None,
|
||||
listen_host='', listen_port=None, source_is_ipv6=False,
|
||||
verbose=False, cert='', key='', password=None, ssl_only=None,
|
||||
verbose=False, cert='', key='', key_password=None, ssl_only=None,
|
||||
verify_client=False, cafile=None,
|
||||
daemon=False, record='', web='', web_auth=False,
|
||||
file_only=False,
|
||||
|
@ -380,7 +380,7 @@ class WebSockifyServer(object):
|
|||
|
||||
# keyfile path must be None if not specified
|
||||
self.key = None
|
||||
self.password = password
|
||||
self.key_password = key_password
|
||||
|
||||
# Make paths settings absolute
|
||||
self.cert = os.path.abspath(cert)
|
||||
|
@ -578,7 +578,7 @@ class WebSockifyServer(object):
|
|||
if self.ssl_ciphers is not None:
|
||||
context.set_ciphers(self.ssl_ciphers)
|
||||
context.options = self.ssl_options
|
||||
context.load_cert_chain(certfile=self.cert, keyfile=self.key, password=self.password)
|
||||
context.load_cert_chain(certfile=self.cert, keyfile=self.key, password=self.key_password)
|
||||
if self.verify_client:
|
||||
context.verify_mode = ssl.CERT_REQUIRED
|
||||
if self.cafile:
|
||||
|
|
Loading…
Reference in New Issue