summaryrefslogtreecommitdiff
path: root/service/pixelated/bitmask_libraries/soledad.py
diff options
context:
space:
mode:
authorFolker Bernitt and Victor Shyba <pixelated-team+fbernitt+vshyba@thoughtworks.com>2015-03-31 11:58:23 -0300
committerPatrick Maia <pmaia@thoughtworks.com>2015-03-31 12:01:29 -0300
commit46ea4c16a78b0dcb18ccdd301c164963150204a4 (patch)
treeb124257c2c584c6c4a1f1758d4431a39c3f85380 /service/pixelated/bitmask_libraries/soledad.py
parentb998b240868ee4d6d30c86397793c9d194d4501b (diff)
Better naming for which_bundle functions
-- Issues #93 and #333
Diffstat (limited to 'service/pixelated/bitmask_libraries/soledad.py')
-rw-r--r--service/pixelated/bitmask_libraries/soledad.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/service/pixelated/bitmask_libraries/soledad.py b/service/pixelated/bitmask_libraries/soledad.py
index 1c46f2ab..83a8caa9 100644
--- a/service/pixelated/bitmask_libraries/soledad.py
+++ b/service/pixelated/bitmask_libraries/soledad.py
@@ -19,7 +19,7 @@ import os
from leap.keymanager import KeyManager
from leap.soledad.client import Soledad
from leap.soledad.common.crypto import WrongMac, UnknownMacMethod
-from .certs import which_bundle
+from .certs import which_api_CA_bundle
SOLEDAD_TIMEOUT = 120
@@ -67,7 +67,7 @@ class SoledadSession(object):
local_db = self._local_db_path()
return Soledad(self.leap_srp_session.uuid, unicode(encryption_passphrase), secrets,
- local_db, server_url, which_bundle(self.provider), self.leap_srp_session.token, defer_encryption=False)
+ local_db, server_url, which_api_CA_bundle(self.provider), self.leap_srp_session.token, defer_encryption=False)
except (WrongMac, UnknownMacMethod), e:
raise SoledadWrongPassphraseException(e)