From 897236d556d99c87d0d0d3deae6ea610247eff03 Mon Sep 17 00:00:00 2001
From: Roman Zeyde <roman.zeyde@gmail.com>
Date: Sun, 1 Jan 2017 18:14:28 +0200
Subject: [PATCH] gpg: allow decoding secret keys

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

diff --git a/trezor_agent/gpg/decode.py b/trezor_agent/gpg/decode.py
index bbd8c9f..12d5ef7 100644
--- a/trezor_agent/gpg/decode.py
+++ b/trezor_agent/gpg/decode.py
@@ -160,7 +160,7 @@ def _parse_pubkey(stream, packet_type='pubkey'):
                 # should be b'\x03\x01\x08\x07': SHA256 + AES128
                 size, = util.readfmt(leftover, 'B')
                 p['kdf'] = leftover.read(size)
-                assert not leftover.read()
+                p['secret'] = leftover.read()
 
             parse_func, keygrip_func = SUPPORTED_CURVES[oid]
             keygrip = keygrip_func(parse_func(mpi))
@@ -199,7 +199,9 @@ _parse_attribute = functools.partial(_parse_user_id,
 
 PACKET_TYPES = {
     2: _parse_signature,
+    5: _parse_pubkey,
     6: _parse_pubkey,
+    7: _parse_subkey,
     13: _parse_user_id,
     14: _parse_subkey,
     17: _parse_attribute,