[Pkg-gnupg-commit] [gnupg2] 87/102: gpg: Print the subkey's curve and not the primary key curve.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

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>
---
 g10/keylist.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git