Merge remote-tracking branch 'drebs/feature/2602-remove-strict-dependency-on-leap.common-2' into develop

1 files changed, 12 insertions, 14 deletions

diff --git a/src/leap/soledad/backends/leap_backend.py b/src/leap/soledad/backends/leap_backend.py
index d92025db..4d92db37 100644
--- a/src/leap/soledad/backends/leap_backend.py
+++ b/src/leap/soledad/backends/leap_backend.py
@@ -33,13 +33,11 @@ from u1db.errors import BrokenSyncStream
 from u1db.remote.http_target import HTTPSyncTarget
 
 
-from leap.common.crypto import (
+from leap.soledad import soledad_assert
+from leap.soledad.crypto import (
     EncryptionMethods,
     UnknownEncryptionMethod,
-    encrypt_sym,
-    decrypt_sym,
 )
-from leap.common.check import leap_assert
 from leap.soledad.auth import TokenBasedAuth
 
 
@@ -167,9 +165,9 @@ def encrypt_doc(crypto, doc):
         content.
     @rtype: str
     """
-    leap_assert(doc.is_tombstone() is False)
+    soledad_assert(doc.is_tombstone() is False)
     # encrypt content using AES-256 CTR mode
-    iv, ciphertext = encrypt_sym(
+    iv, ciphertext = crypto.encrypt_sym(
         doc.get_json(),
         crypto.doc_passphrase(doc.doc_id),
         method=EncryptionMethods.AES_256_CTR)
@@ -220,12 +218,12 @@ def decrypt_doc(crypto, doc):
     @return: The JSON serialization of the decrypted content.
     @rtype: str
     """
-    leap_assert(doc.is_tombstone() is False)
-    leap_assert(ENC_JSON_KEY in doc.content)
-    leap_assert(ENC_SCHEME_KEY in doc.content)
-    leap_assert(ENC_METHOD_KEY in doc.content)
-    leap_assert(MAC_KEY in doc.content)
-    leap_assert(MAC_METHOD_KEY in doc.content)
+    soledad_assert(doc.is_tombstone() is False)
+    soledad_assert(ENC_JSON_KEY in doc.content)
+    soledad_assert(ENC_SCHEME_KEY in doc.content)
+    soledad_assert(ENC_METHOD_KEY in doc.content)
+    soledad_assert(MAC_KEY in doc.content)
+    soledad_assert(MAC_METHOD_KEY in doc.content)
     # verify MAC
     ciphertext = binascii.a2b_hex(  # content is stored as hex.
         doc.content[ENC_JSON_KEY])
@@ -241,8 +239,8 @@ def decrypt_doc(crypto, doc):
     if enc_scheme == EncryptionSchemes.SYMKEY:
         enc_method = doc.content[ENC_METHOD_KEY]
         if enc_method == EncryptionMethods.AES_256_CTR:
-            leap_assert(ENC_IV_KEY in doc.content)
-            plainjson = decrypt_sym(
+            soledad_assert(ENC_IV_KEY in doc.content)
+            plainjson = crypto.decrypt_sym(
                 ciphertext,
                 crypto.doc_passphrase(doc.doc_id),
                 method=enc_method,