diff options
| author | drebs <drebs@leap.se> | 2013-04-25 19:38:44 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-04-25 19:54:35 -0300 |
| commit | 2ef514b02fa37a0a2ebac0bb9668543e29033a7f (patch) | |
| tree | 5b1d8226aef2d3cf347a4928635fcf5bc06807a0 /src/leap/soledad/__init__.py | |
| parent | ab540eacc529354cb111abc24eb2c9a70886ce21 (diff) | |
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.
Diffstat (limited to 'src/leap/soledad/__init__.py')
| -rw-r--r-- | src/leap/soledad/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/leap/soledad/__init__.py b/src/leap/soledad/__init__.py index 78888ead..a736d32b 100644 --- a/src/leap/soledad/__init__.py +++ b/src/leap/soledad/__init__.py @@ -421,8 +421,7 @@ class Soledad(object): content = { '_symkey': self.encrypt_sym(self._symkey, self._passphrase), } - doc = LeapDocument(doc_id=self._address_hash(), - crypto=self._crypto) + doc = LeapDocument(doc_id=self._address_hash()) doc.content = content self._shared_db.put_doc(doc) events.signal( |