From ec8d1f5aedcd077b5b1521e15b1432e616f83f3a Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Tue, 27 Jun 2017 06:44:25 -0300 Subject: [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 --- src/leap/soledad/common/preamble.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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): -- cgit v1.2.3