summaryrefslogtreecommitdiff
path: root/service/pixelated/bitmask_libraries/smtp.py
diff options
context:
space:
mode:
authorBruno Wagner <bwgpro@gmail.com>2015-06-08 18:27:09 -0300
committerBruno Wagner <bwgpro@gmail.com>2015-06-08 18:27:09 -0300
commit7b1af2ede753a63c9f584ccf37691917714e9655 (patch)
treebc40f8275a802e4072a9dc7a1679f83bf0ff7b6e /service/pixelated/bitmask_libraries/smtp.py
parent8b0e4f05b142b73a5ca13f4706fcb6ececbb6911 (diff)
Fixed certificates initialization and removed which_api_bundle
Diffstat (limited to 'service/pixelated/bitmask_libraries/smtp.py')
-rw-r--r--service/pixelated/bitmask_libraries/smtp.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/service/pixelated/bitmask_libraries/smtp.py b/service/pixelated/bitmask_libraries/smtp.py
index c22601d2..4b6ec719 100644
--- a/service/pixelated/bitmask_libraries/smtp.py
+++ b/service/pixelated/bitmask_libraries/smtp.py
@@ -17,8 +17,8 @@ import logging
import os
import requests
import random
-from .certs import which_api_CA_bundle
from leap.mail.smtp import setup_smtp_gateway
+from pixelated.bitmask_libraries.certs import LeapCertificate
logger = logging.getLogger(__name__)
@@ -59,7 +59,11 @@ class LeapSmtp(object):
cert_url = '%s/%s/cert' % (self._provider.api_uri, self._provider.api_version)
cookies = {"_session_id": self.session_id}
- response = requests.get(cert_url, verify=which_api_CA_bundle(self._provider), cookies=cookies, timeout=self._provider.config.timeout_in_s)
+ response = requests.get(
+ cert_url,
+ verify=LeapCertificate(self._provider).api_ca_bundle(),
+ cookies=cookies,
+ timeout=self._provider.config.timeout_in_s)
response.raise_for_status()
client_cert = response.content