From 5fb8b0e047b06ba48e6715b83b3b3d84219533ba Mon Sep 17 00:00:00 2001
From: Roman Zeyde <romanzeyde@google.com>
Date: Tue, 26 Apr 2016 12:53:51 +0300
Subject: [PATCH] decode: parse GPG subkeys

---
 trezor_agent/gpg/decode.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/trezor_agent/gpg/decode.py b/trezor_agent/gpg/decode.py
index f1245cf..9ba444d 100644
--- a/trezor_agent/gpg/decode.py
+++ b/trezor_agent/gpg/decode.py
@@ -83,6 +83,7 @@ class Parser(object):
             6: self.pubkey,
             11: self.literal,
             13: self.user_id,
+            14: self.subkey,
         }
 
     def __iter__(self):
@@ -151,7 +152,35 @@ class Parser(object):
         p['key_id'] = hashlib.sha1(data_to_hash).digest()[-8:]
         p['_to_hash'] = data_to_hash
         log.debug('key ID: %s', util.hexlify(p['key_id']))
+        return p
 
+    def subkey(self, stream):
+        """See https://tools.ietf.org/html/rfc4880#section-5.5 for details."""
+        p = {'type': 'subkey'}
+        packet = io.BytesIO()
+        with stream.capture(packet):
+            p['version'] = stream.readfmt('B')
+            p['created'] = stream.readfmt('>L')
+            p['algo'] = stream.readfmt('B')
+
+            # https://tools.ietf.org/html/rfc6637#section-11
+            oid_size = stream.readfmt('B')
+            oid = stream.read(oid_size)
+            assert oid in SUPPORTED_CURVES
+            parser = SUPPORTED_CURVES[oid]
+
+            mpi = parse_mpi(stream)
+            log.debug('mpi: %x (%d bits)', mpi, mpi.bit_length())
+            p['verifier'] = parser(mpi)
+            p['leftover'] = stream.read()  # TBD: what is this?
+
+        # https://tools.ietf.org/html/rfc4880#section-12.2
+        packet_data = packet.getvalue()
+        data_to_hash = (b'\x99' + struct.pack('>H', len(packet_data)) +
+                        packet_data)
+        p['key_id'] = hashlib.sha1(data_to_hash).digest()[-8:]
+        p['_to_hash'] = data_to_hash
+        log.debug('key ID: %s', util.hexlify(p['key_id']))
         return p
 
     def user_id(self, stream):
@@ -209,6 +238,7 @@ def load_public_key(stream):
                   signature=signature['sig'], label='GPG public key')
     return pubkey
 
+
 def load_signature(stream, original_data):
     parser = Parser(util.Reader(stream))
     signature, = parser