Fix symmetric encryption when syncing.

Also does:

  * Remove all crypto methods from LeapDocument.
  * Encode 'encryption_scheme' inside the document JSON.
  * Add functions for encrypting and decrypting.
  * Fix LeapSyncTarget so its connection actually returns a LeapSyncTarget.
  * Fix symmetric encryption when syncing:
    - don't try to encrypt tombstone documents.
  * Fix symmetric decryption when syncing:
    - Only try do decrypt if the incoming document has an '_encryption_scheme'
      entry with value equal to EncryptionSchemes.PUBKEY.
  * Fix doc skipping for non-syncable docs.
  * Fix tests that compared raw content with encrypted content.

1 files changed, 0 insertions, 26 deletions

diff --git a/src/leap/soledad/tests/test_couch.py b/src/leap/soledad/tests/test_couch.py
index cdf9c9ff..456bc080 100644
--- a/src/leap/soledad/tests/test_couch.py
+++ b/src/leap/soledad/tests/test_couch.py
@@ -17,7 +17,6 @@ except ImportError:
     import json  # noqa
 from leap.soledad.backends.leap_backend import (
     LeapDocument,
-    EncryptionSchemes,
 )
 
 
@@ -412,30 +411,5 @@ class CouchDatabaseStorageTests(CouchDBTestCase):
         content = self._fetch_u1db_data(db)
         self.assertEqual(db._replica_uid, content['replica_uid'])
 
-    def test_store_encryption_scheme(self):
-        db = couch.CouchDatabase('http://localhost:' + str(self.wrapper.port),
-                                 'u1db_tests')
-        doc = db.create_doc_from_json(tests.simple_doc)
-        # assert that docs have no encryption_scheme by default
-        self.assertEqual(EncryptionSchemes.NONE, doc.encryption_scheme)
-        # assert that we can store a different value
-        doc.encryption_scheme = EncryptionSchemes.PUBKEY
-        db.put_doc(doc)
-        self.assertEqual(
-            EncryptionSchemes.PUBKEY,
-            db.get_doc(doc.doc_id).encryption_scheme)
-        # assert that we can store another different value
-        doc.encryption_scheme = EncryptionSchemes.SYMKEY
-        db.put_doc(doc)
-        self.assertEqual(
-            EncryptionSchemes.SYMKEY,
-            db.get_doc(doc.doc_id).encryption_scheme)
-        # assert that we can store the default value
-        doc.encryption_scheme = EncryptionSchemes.NONE
-        db.put_doc(doc)
-        self.assertEqual(
-            EncryptionSchemes.NONE,
-            db.get_doc(doc.doc_id).encryption_scheme)
-
 
 load_tests = tests.load_with_scenarios