load certificate with password

Readded because the last commit removed this.
This commit is contained in:
Peter Justin
2017-05-09 15:22:08 +03:00
committed by Sergey Petrov
parent ae835a195f
commit 7783520dc3
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -33,7 +33,7 @@ class APNsClient(object):
def __init__(self, credentials, use_sandbox=False, use_alternative_port=False, proto=None, json_encoder=None, password=None): def __init__(self, credentials, use_sandbox=False, use_alternative_port=False, proto=None, json_encoder=None, password=None):
if credentials is None or isinstance(credentials, str): if credentials is None or isinstance(credentials, str):
self.__credentials = CertificateCredentials(credentials) self.__credentials = CertificateCredentials(credentials, password)
else: else:
self.__credentials = credentials self.__credentials = credentials
self._init_connection(use_sandbox, use_alternative_port, proto) self._init_connection(use_sandbox, use_alternative_port, proto)
+2 -2
View File
@@ -31,9 +31,9 @@ class Credentials(object):
# Credentials subclass for certificate authentication # Credentials subclass for certificate authentication
class CertificateCredentials(Credentials): class CertificateCredentials(Credentials):
def __init__(self, cert_file): def __init__(self, cert_file, password=None):
ssl_context = init_context() ssl_context = init_context()
ssl_context.load_cert_chain(cert_file) ssl_context.load_cert_chain(cert_file, password=password)
super(CertificateCredentials, self).__init__(ssl_context) super(CertificateCredentials, self).__init__(ssl_context)