From be5b3b454d0a141248a9b684bc4f97a520deb979 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 20 Dec 2013 10:02:41 -0800 Subject: [PATCH] Add salted S2K parsing to PGPPacket._parse_string_to_key_specifier From RFC 4880 [1]: Octet 0: 0x01 Octet 1: hash algorithm Octets 2-9: 8-octet salt value [1]: http://tools.ietf.org/search/rfc4880#section-3.7.1.2 --- gpg-migrate.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gpg-migrate.py b/gpg-migrate.py index 359ceb4..9be8e86 100755 --- a/gpg-migrate.py +++ b/gpg-migrate.py @@ -230,6 +230,12 @@ class PGPPacket (dict): self['string-to-key-hash-algorithm'] = self._hash_algorithms[ data[offset]] offset += 1 + elif self['string-to-key-type'] == 'salted': + self['string-to-key-hash-algorithm'] = self._hash_algorithms[ + data[offset]] + offset += 1 + self['string-to-key-salt'] = data[offset: offset + 8] + offset += 8 else: raise NotImplementedError( 'string-to-key type {}'.format(self['string-to-key-type'])) -- 2.26.2