From d7478834794cd9e73d43732da28c8bde5c9b8801 Mon Sep 17 00:00:00 2001 From: Tomas Touceda Date: Fri, 3 May 2013 08:17:16 -0300 Subject: Use the new naming for the soledad document json --- src/leap/mx/mail_receiver.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/leap/mx/mail_receiver.py b/src/leap/mx/mail_receiver.py index 2494a21..49d4455 100644 --- a/src/leap/mx/mail_receiver.py +++ b/src/leap/mx/mail_receiver.py @@ -114,8 +114,8 @@ class MailReceiver(Service): if pubkey is None or len(pubkey) == 0: doc.content = { - "_encryption_scheme": EncryptionSchemes.NONE, - "_unencrypted_json": json.dumps(data) + "_enc_scheme": EncryptionSchemes.NONE, + "_enc_json": json.dumps(data) } return uuid, doc @@ -126,8 +126,8 @@ class MailReceiver(Service): openpgp_key = openpgp._safe_call(_ascii_to_openpgp_cb, pubkey) doc.content = { - "_encryption_scheme": EncryptionSchemes.PUBKEY, - "_encrypted_json": openpgp.encrypt_asym(json.dumps(data), openpgp_key) + "_enc_scheme": EncryptionSchemes.PUBKEY, + "_enc_json": openpgp.encrypt_asym(json.dumps(data), openpgp_key) } return uuid, doc -- cgit v1.2.3