diff options
| author | drebs <drebs@leap.se> | 2013-05-01 16:12:33 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-05-01 16:23:50 -0300 |
| commit | f2d588a965ee7fd76985d16b5ad93dc66b9d2be1 (patch) | |
| tree | 8aecf4fb6d658a768ba2e7d7e14f43970e83e4b8 /src/leap/soledad/backends/leap_backend.py | |
| parent | f0f07d240cbd5e7135076da0b1ce1dddb04fbc25 (diff) | |
Fix some items from second review.
Items are:
* remove unused imports.
* __init__.py: initialize variable before read from file.
* backends/leap_backend.py: Fix mistyped exception name, fix docstring of
encryption function.
Diffstat (limited to 'src/leap/soledad/backends/leap_backend.py')
| -rw-r--r-- | src/leap/soledad/backends/leap_backend.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/leap/soledad/backends/leap_backend.py b/src/leap/soledad/backends/leap_backend.py index 1e9eb78f..46c787a9 100644 --- a/src/leap/soledad/backends/leap_backend.py +++ b/src/leap/soledad/backends/leap_backend.py @@ -21,7 +21,6 @@ A U1DB backend for encrypting data before sending to server and decrypting after receiving. """ -import uuid try: import simplejson as json except ImportError: @@ -89,8 +88,9 @@ def encrypt_doc_json(crypto, doc_id, doc_json): The returned JSON string is the serialization of the following dictionary: { - ENC_JSON_KEY: encrypt_sym(doc_content), - '_encryption_scheme: 'symkey', + '_enc_json': encrypt_sym(doc_content), + '_enc_scheme': 'symkey', + '_mac': <mac> [Not implemented yet] } @param crypto: A SoledadCryto instance to perform the encryption. @@ -160,7 +160,7 @@ def decrypt_doc_json(crypto, doc_id, doc_json): ciphertext, crypto.passphrase_hash(doc_id)) else: - raise UnknownEncryptionScheme(enc_scheme) + raise UnknownEncryptionSchemes(enc_scheme) return plainjson |