summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/backend/components.py6
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py3
2 files changed, 6 insertions, 3 deletions
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py
index 5ef6befd..50f723cb 100644
--- a/src/leap/bitmask/backend/components.py
+++ b/src/leap/bitmask/backend/components.py
@@ -60,7 +60,7 @@ from leap.common import certs as leap_certs
from leap.keymanager import openpgp
from leap.keymanager.errors import KeyAddressMismatch, KeyFingerprintMismatch
-from leap.soledad.client import NoStorageSecret, PassphraseTooShort
+from leap.soledad.client.secrets import NoStorageSecret, PassphraseTooShort
logger = logging.getLogger(__name__)
@@ -914,6 +914,8 @@ class Keymanager(object):
keymanager = self._keymanager_proxy
try:
+ # NOTE: parse_openpgp_ascii_key is not in keymanager anymore
+ # the API for that will need some thinking
public_key, private_key = keymanager.parse_openpgp_ascii_key(
new_key)
except (KeyAddressMismatch, KeyFingerprintMismatch) as e:
@@ -974,7 +976,7 @@ class Keymanager(object):
"""
List all the keys stored in the local DB.
"""
- keys = self._keymanager_proxy.get_all_keys_in_local_db()
+ keys = self._keymanager_proxy.get_all_keys()
self._signaler.signal(self._signaler.keymanager_keys_list, keys)
def get_key_details(self, username):
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index c4e43bfe..745645f3 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -45,7 +45,8 @@ from leap.common.files import which
from leap.keymanager import KeyManager, openpgp
from leap.keymanager.errors import KeyNotFound
from leap.soledad.common.errors import InvalidAuthTokenError
-from leap.soledad.client import Soledad, BootstrapSequenceError
+from leap.soledad.client import Soledad
+from leap.soledad.client.secrets import BootstrapSequenceError
logger = logging.getLogger(__name__)