jacobpascual/trezor-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpg: support TREZOR-based primary key

Browse Source
This commit is contained in:
Roman Zeyde
2016-06-11 13:47:56 +03:00
parent a1659e0f0d
commit 8108e5400d
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
trezor_agent/gpg/decode.py
View File

@@ -295,6 +295,7 @@ def load_public_key(pubkey_bytes, use_custom=False):
packets = packets[2:]
packet['user_id'] = userid['value']
packet['_is_custom'] = signature['_is_custom']
return packet

11
trezor_agent/gpg/encode.py
View File

@@ -135,7 +135,7 @@ def create_subkey(primary_bytes, pubkey, signer_func, ecdh=False):
proto.subpacket_time(pubkey.created)] # signature time
unhashed_subpackets = [
proto.subpacket(16, pubkey.key_id())] # issuer key id
log.info('confirm signing subkey with hardware device')
log.info('confirm signing with new subkey')
embedded_sig = proto.make_signature(
signer_func=signer_func,
data_to_sign=data_to_sign,
@@ -160,11 +160,12 @@ def create_subkey(primary_bytes, pubkey, signer_func, ecdh=False):
unhashed_subpackets.append(proto.subpacket(32, embedded_sig))
unhashed_subpackets.append(proto.CUSTOM_SUBPACKET)
log.info('confirm signing subkey with gpg-agent')
# TODO: support TREZOR-based primary key
gpg_agent = AgentSigner(primary['user_id'])
log.info('confirm signing with primary key')
if not primary['_is_custom']:
signer_func = AgentSigner(primary['user_id']).sign
signature = proto.make_signature(
signer_func=gpg_agent.sign,
signer_func=signer_func,
data_to_sign=data_to_sign,
public_algo=primary['algo'],
sig_type=0x18,