From 7783520dc356cf45df5060697bf02cc84a95278d Mon Sep 17 00:00:00 2001 From: Peter Justin Date: Tue, 9 May 2017 13:17:25 +0200 Subject: [PATCH] load certificate with password Readded because the last commit removed this. --- apns2/client.py | 2 +- apns2/credentials.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apns2/client.py b/apns2/client.py index be47fed..e8f012e 100644 --- a/apns2/client.py +++ b/apns2/client.py @@ -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): if credentials is None or isinstance(credentials, str): - self.__credentials = CertificateCredentials(credentials) + self.__credentials = CertificateCredentials(credentials, password) else: self.__credentials = credentials self._init_connection(use_sandbox, use_alternative_port, proto) diff --git a/apns2/credentials.py b/apns2/credentials.py index a5bbdbd..a26a617 100644 --- a/apns2/credentials.py +++ b/apns2/credentials.py @@ -31,9 +31,9 @@ class Credentials(object): # Credentials subclass for certificate authentication class CertificateCredentials(Credentials): - def __init__(self, cert_file): + def __init__(self, cert_file, password=None): 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)