[git] GnuPG - branch, master, updated. gnupg-2.1.6-37-gfb754dc

[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  fb754dc6170d12edf3d35c48340b8d7b1ded20f7 (commit)
      from  fbb6c25ab5dbb5f2b1f1eb342ca7caa3f955d8c9 (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 fb754dc6170d12edf3d35c48340b8d7b1ded20f7
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 6 18:12:31 2015 +0200

    gpg: Remove duplicated printing of the curve name in "sub" lines.
    
    * g10/keylist.c (list_keyblock_print): Do not print extra curve name.
    --
    
    This was cruft from the time before we changed to the new algo/size
    string.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keylist.c b/g10/keylist.c
index 4ea4bf5..0383931 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -1087,18 +1087,6 @@ list_keyblock_print (KBNODE keyblock, int secret, int fpr,
                   pubkey_string (pk2, pkstrbuf, sizeof pkstrbuf),
 		  keystr_from_pk (pk2), datestr_from_pk (pk2));
 
-          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 (pk2->pkey[0]);
-              const char *name = openpgp_oid_to_curve (curve, 0);
-              if (!name)
-                name = curve;
-              es_fprintf (es_stdout, " %s", name);
-              xfree (curve);
-            }
-
           if ((opt.list_options & LIST_SHOW_USAGE))
             {
               es_fprintf (es_stdout, " [%s]", usagestr_from_pk (pk2, 0));

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

Summary of changes:
 g10/keylist.c | 12 ------------
 1 file changed, 12 deletions(-)


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