summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Touceda <chiiph@leap.se>2013-05-03 08:17:16 -0300
committerTomas Touceda <chiiph@leap.se>2013-05-07 14:02:12 -0300
commit406464efb2d2589a010e95bccfc6733a8e49c4f5 (patch)
tree1bb1939410956d711930791d10bac6142c76b9cd
parent860329613b205708dc7a4b04bcaf39b9bd24fec6 (diff)
Use the new naming for the soledad document json
-rw-r--r--src/leap/mx/mail_receiver.py8
1 files 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