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

diff --git a/gpg-migrate.py b/gpg-migrate.py
index 359ceb4795c42db0736d69640b51408338a58ecc..9be8e8668f6c9eb13503717033b16ae9f38b1778 100755 (executable)
--- 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']))