From 07c41006186c3954dab3da64127930bd2e009be0 Mon Sep 17 00:00:00 2001
From: Roman Zeyde <romanzeyde@google.com>
Date: Sat, 30 Apr 2016 21:55:24 +0300
Subject: [PATCH] gpg: fixup logging and make sure it works with git

---
 trezor_agent/gpg/decode.py | 2 +-
 trezor_agent/gpg/encode.py | 5 ++---
 trezor_agent/gpg/test.sh   | 7 ++++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/trezor_agent/gpg/decode.py b/trezor_agent/gpg/decode.py
index c765435..515353b 100644
--- a/trezor_agent/gpg/decode.py
+++ b/trezor_agent/gpg/decode.py
@@ -133,7 +133,7 @@ def _parse_signature(stream):
     p['unhashed_subpackets'] = parse_subpackets(stream)
     embedded = list(_parse_embedded_signatures(p['unhashed_subpackets']))
     if embedded:
-        log.info('embedded sigs: %s', embedded)
+        log.debug('embedded sigs: %s', embedded)
         p['embedded'] = embedded
 
     p['_is_custom'] = (proto.CUSTOM_SUBPACKET in p['unhashed_subpackets'])
diff --git a/trezor_agent/gpg/encode.py b/trezor_agent/gpg/encode.py
index e06d949..d6770c5 100644
--- a/trezor_agent/gpg/encode.py
+++ b/trezor_agent/gpg/encode.py
@@ -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 +
diff --git a/trezor_agent/gpg/test.sh b/trezor_agent/gpg/test.sh
index de1cba4..9dc0e20 100644
--- a/trezor_agent/gpg/test.sh
+++ b/trezor_agent/gpg/test.sh
@@ -6,10 +6,11 @@ CURVE=ed25519
 gpg2 --full-gen-key --expert
 gpg2 --export > romanz.pub
 NOW=`date +%s`
-trezor-gpg -t $NOW -v -e $CURVE --subkey "romanz" -o subkey.pub
+USERID="Roman Zeyde <roman.zeyde@gmail.com>"
+trezor-gpg -t $NOW -e $CURVE --subkey "$USERID" -o subkey.pub
 gpg2 -K
-gpg2 -vv --import <(cat romanz.pub subkey.pub)
+gpg2 -v --import <(cat romanz.pub subkey.pub)
 gpg2 -K
 
-trezor-gpg -t $NOW -v -e $CURVE "romanz" EXAMPLE
+trezor-gpg -t $NOW -e $CURVE $USERID EXAMPLE
 gpg2 --verify EXAMPLE.sig