lili/amodem
1
0
Fork 0
mirror of https://github.com/romanz/amodem.git synced 2026-04-20 21:26:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

gpg: allow decoding secret keys

Browse Source
This commit is contained in:
Roman Zeyde
2017-01-01 18:14:28 +02:00
parent 5bec0e8382
commit 897236d556
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trezor_agent/gpg/decode.py
View File

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