diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-15 11:33:26 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-15 11:33:26 -0300 |
| commit | a9ddf49a05e3f6610dd5a96307c37fb4f4cf3d65 (patch) | |
| tree | 24d4626674968746854d9d9e0cb21dc3126429c1 /soledad/src/leap/soledad/target.py | |
| parent | 5513cbb2432255087cfff47f1a287cdd351b892e (diff) | |
| parent | df8b3c9bcbb3659667f8a7e08de6ad9aaf527ff2 (diff) | |
Merge remote-tracking branch 'drebs/feature/2601-use-pycryptopp' into develop
Diffstat (limited to 'soledad/src/leap/soledad/target.py')
| -rw-r--r-- | soledad/src/leap/soledad/target.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/soledad/src/leap/soledad/target.py b/soledad/src/leap/soledad/target.py index 9fac9f54..cad51b74 100644 --- a/soledad/src/leap/soledad/target.py +++ b/soledad/src/leap/soledad/target.py @@ -168,7 +168,7 @@ def encrypt_doc(crypto, doc): soledad_assert(doc.is_tombstone() is False) # encrypt content using AES-256 CTR mode iv, ciphertext = crypto.encrypt_sym( - doc.get_json(), + str(doc.get_json()), # encryption/decryption routines expect str crypto.doc_passphrase(doc.doc_id), method=EncryptionMethods.AES_256_CTR) # Return a representation for the encrypted content. In the following, we |