Added **kwargs to ClientXMPP, BaseXMPP and XMLStream so that certfile, keyfile and ca_certs can be initialized.
This commit is contained in:
@@ -114,7 +114,8 @@ class XMLStream(object):
|
||||
:param int port: The port to use for the connection. Defaults to 0.
|
||||
"""
|
||||
|
||||
def __init__(self, socket=None, host='', port=0):
|
||||
def __init__(self, socket=None, host='', port=0, certfile=None,
|
||||
keyfile=None, ca_certs=None, **kwargs):
|
||||
#: Most XMPP servers support TLSv1, but OpenFire in particular
|
||||
#: does not work well with it. For OpenFire, set
|
||||
#: :attr:`ssl_version` to use ``SSLv23``::
|
||||
@@ -136,16 +137,16 @@ class XMLStream(object):
|
||||
#:
|
||||
#: On Mac OS X, certificates in the system keyring will
|
||||
#: be consulted, even if they are not in the provided file.
|
||||
self.ca_certs = None
|
||||
self.ca_certs = ca_certs
|
||||
|
||||
#: Path to a file containing a client certificate to use for
|
||||
#: authenticating via SASL EXTERNAL. If set, there must also
|
||||
#: be a corresponding `:attr:keyfile` value.
|
||||
self.certfile = None
|
||||
self.certfile = certfile
|
||||
|
||||
#: Path to a file containing the private key for the selected
|
||||
#: client certificate to use for authenticating via SASL EXTERNAL.
|
||||
self.keyfile = None
|
||||
self.keyfile = keyfile
|
||||
|
||||
self._der_cert = None
|
||||
|
||||
|
Reference in New Issue
Block a user