summaryrefslogtreecommitdiff
path: root/src/leap/soledad
diff options
context:
space:
mode:
authorVictor Shyba <victor1984@riseup.net>2017-06-27 06:44:25 -0300
committerdrebs <drebs@leap.se>2017-07-18 15:22:23 -0300
commitec8d1f5aedcd077b5b1521e15b1432e616f83f3a (patch)
treea49aa5c2a267c4f980725e26ca645bca09f88c00 /src/leap/soledad
parent74dae7251e2aa28f1887f36d47bcf9366557bbe6 (diff)
[feature] add external/pgp to common/preamble
Incoming API will receive externally encrypted PGP documents. This commit adds this kind of encryption scheme and method to preamble module on soledad.common -- Resolves: #8890
Diffstat (limited to 'src/leap/soledad')
-rw-r--r--src/leap/soledad/common/preamble.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/soledad/common/preamble.py b/src/leap/soledad/common/preamble.py
index 724923c5..72549031 100644
--- a/src/leap/soledad/common/preamble.py
+++ b/src/leap/soledad/common/preamble.py
@@ -33,8 +33,8 @@ from collections import namedtuple
PACMAN = struct.Struct('2sbbQ16s255p255pQ')
LEGACY_PACMAN = struct.Struct('2sbbQ16s255p255p') # DEPRECATED
BLOB_SIGNATURE_MAGIC = '\x13\x37'
-ENC_SCHEME = namedtuple('SCHEME', 'symkey')(1)
-ENC_METHOD = namedtuple('METHOD', 'aes_256_ctr aes_256_gcm')(1, 2)
+ENC_SCHEME = namedtuple('SCHEME', 'symkey external')(1, 2)
+ENC_METHOD = namedtuple('METHOD', 'aes_256_ctr aes_256_gcm pgp')(1, 2, 3)
class InvalidPreambleException(Exception):