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

gpg: refactor pubkeys' parsing code

Browse Source
This commit is contained in:
Roman Zeyde
2016-05-27 11:19:10 +03:00
parent 80a5ea0f2a
commit 4be55156ed
4 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
trezor_agent/gpg/encode.py
View File

@@ -2,7 +2,7 @@
import logging
import time
from . import keyring, proto
from . import decode, keyring, proto
from .. import client, factory, formats, util
log = logging.getLogger(__name__)
@@ -136,10 +136,10 @@ class Factory(object):
sign_packet = proto.packet(tag=2, blob=signature)
return pubkey_packet + user_id_packet + sign_packet
def create_subkey(self):
def create_subkey(self, primary_bytes):
"""Export new subkey to `self.user_id` GPG primary key."""
subkey_packet = proto.packet(tag=14, blob=self.pubkey.data())
primary = keyring.get_public_key(self.user_id)
primary = decode.load_public_key(primary_bytes)
log.info('adding subkey to primary GPG key "%s" (%s)',
self.user_id, util.hexlify(primary['key_id']))
data_to_sign = primary['_to_hash'] + self.pubkey.data_to_hash()
@@ -176,7 +176,7 @@ class Factory(object):
hashed_subpackets=hashed_subpackets,
unhashed_subpackets=unhashed_subpackets)
sign_packet = proto.packet(tag=2, blob=signature)
return subkey_packet + sign_packet
return primary_bytes + subkey_packet + sign_packet
def sign_message(self, msg, sign_time=None):
"""Sign GPG message at specified time."""