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

gpg: fixup logging and make sure it works with git

Browse Source
This commit is contained in:
Roman Zeyde
2016-04-30 21:55:24 +03:00
parent b9f139b74a
commit 07c4100618
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
trezor_agent/gpg/encode.py
View File

@@ -181,7 +181,8 @@ class Signer(object):
subkey_packet = proto.packet(tag=14, blob=self.pubkey.data())
primary = decode.load_from_gpg(self.user_id)
keygrip = agent.get_keygrip(self.user_id)
log.info('adding as subkey to %s (%s)', self.user_id, keygrip)
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()
# Primary Key Binding Signature
@@ -195,7 +196,6 @@ class Signer(object):
sig_type=0x19,
hashed_subpackets=hashed_subpackets,
unhashed_subpackets=unhashed_subpackets)
log.info('embedded signature: %r', embedded_sig)
# Subkey Binding Signature
hashed_subpackets = [
@@ -249,7 +249,6 @@ def _make_signature(signer_func, data_to_sign, public_algo,
log.debug('hashing %d bytes', len(data_to_hash))
digest = hashlib.sha256(data_to_hash).digest()
sig = signer_func(digest=digest)
return bytes(header + hashed + unhashed +