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

gpg: fixup logging during key creation

Browse Source
This commit is contained in:
Roman Zeyde
2016-06-17 22:05:13 +03:00
parent 6c96cc37b9
commit 7b3874e6f7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
trezor_agent/gpg/encode.py
View File

@@ -87,7 +87,7 @@ def create_primary(user_id, pubkey, signer_func):
data_to_sign = (pubkey.data_to_hash() + data_to_sign = (pubkey.data_to_hash() +
user_id_packet[:1] + user_id_packet[:1] +
util.prefix_len('>L', user_id.encode('ascii'))) util.prefix_len('>L', user_id.encode('ascii')))
log.info('signing public key "%s"', user_id) log.info('creating primary GPG key "%s"', user_id)
hashed_subpackets = [ hashed_subpackets = [
proto.subpacket_time(pubkey.created), # signature time proto.subpacket_time(pubkey.created), # signature time
# https://tools.ietf.org/html/rfc4880#section-5.2.3.7 # https://tools.ietf.org/html/rfc4880#section-5.2.3.7
@@ -106,6 +106,7 @@ def create_primary(user_id, pubkey, signer_func):
proto.subpacket(16, pubkey.key_id()), # issuer key id proto.subpacket(16, pubkey.key_id()), # issuer key id
proto.CUSTOM_SUBPACKET] proto.CUSTOM_SUBPACKET]
log.info('confirm signing with primary key')
signature = proto.make_signature( signature = proto.make_signature(
signer_func=signer_func, signer_func=signer_func,
public_algo=pubkey.algo_id, public_algo=pubkey.algo_id,
@@ -122,8 +123,7 @@ def create_subkey(primary_bytes, pubkey, signer_func):
"""Export new subkey to GPG primary key.""" """Export new subkey to GPG primary key."""
subkey_packet = proto.packet(tag=14, blob=pubkey.data()) subkey_packet = proto.packet(tag=14, blob=pubkey.data())
primary = decode.load_public_key(primary_bytes) primary = decode.load_public_key(primary_bytes)
log.info('adding subkey to primary GPG key "%s" (%s)', log.info('adding subkey to primary GPG key "%s"', primary['user_id'])
primary['user_id'], util.hexlify(primary['key_id']))
data_to_sign = primary['_to_hash'] + pubkey.data_to_hash() data_to_sign = primary['_to_hash'] + pubkey.data_to_hash()
if pubkey.ecdh: if pubkey.ecdh: