[git] GnuPG - branch, master, updated. gnupg-2.1.12-87-gb56aebe

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  b56aebe76657ce6efa9c6819d5a8c2a31c2bbbba (commit)
      from  b7e3dfcf139284d30921cf44e7bab43d4244cc37 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b56aebe76657ce6efa9c6819d5a8c2a31c2bbbba
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jun 14 23:15:32 2016 +0200

    gpg: Print the subkey's curve and not the primary key curve.
    
    * g10/keylist.c (list_keyblock_colon): Use PK2 for the subkey's curve.
    --
    
    Reported-by: mantorix at vollbio punkt de
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keylist.c b/g10/keylist.c
index d77c86b..0ac763d 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -1542,11 +1542,11 @@ list_keyblock_colon (ctrl_t ctrl, kbnode_t keyblock,
             }
           es_putc (':', es_stdout);	/* End of field 15. */
           es_putc (':', es_stdout);	/* End of field 16. */
-          if (pk->pubkey_algo == PUBKEY_ALGO_ECDSA
-              || pk->pubkey_algo == PUBKEY_ALGO_EDDSA
-              || pk->pubkey_algo == PUBKEY_ALGO_ECDH)
+          if (pk2->pubkey_algo == PUBKEY_ALGO_ECDSA
+              || pk2->pubkey_algo == PUBKEY_ALGO_EDDSA
+              || pk2->pubkey_algo == PUBKEY_ALGO_ECDH)
             {
-              char *curve = openpgp_oid_to_str (pk->pkey[0]);
+              char *curve = openpgp_oid_to_str (pk2->pkey[0]);
               const char *name = openpgp_oid_to_curve (curve, 0);
               if (!name)
                 name = curve;

-----------------------------------------------------------------------

Summary of changes:
 g10/keylist.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org