[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.5-44-g870527d

[by NIIBE Yutaka]

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, STABLE-BRANCH-2-2 has been updated
       via  870527df0dd704c994928348c8c2910030776680 (commit)
      from  83529e1bd14a6d39f2a8ecab9fb6aa4c1f344c73 (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 870527df0dd704c994928348c8c2910030776680
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Apr 5 10:37:23 2018 +0900

    g10: Let card-edit/key-attr show message when change.
    
    * g10/card-util.c (ask_card_rsa_keysize): Don't show message here.
    (ask_card_keyattr): Show message when change, also for ECC.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/card-util.c b/g10/card-util.c
index e33a417..896ead0 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -1389,12 +1389,7 @@ ask_card_rsa_keysize (unsigned int nbits)
                       "RSA", min_nbits, max_nbits);
         }
       else
-        {
-          tty_printf (_("The card will now be re-configured"
-                        " to generate a key of %u bits\n"), req_nbits);
-          show_keysize_warning ();
-          return req_nbits;
-        }
+        return req_nbits;
     }
 }
 
@@ -1501,8 +1496,19 @@ ask_card_keyattr (int keyno, const struct key_attr *current)
     }
 
  leave:
-  if (!key_attr)
-    tty_printf (_("No change."));
+  if (key_attr)
+    {
+      if (key_attr->algo == PUBKEY_ALGO_RSA)
+        tty_printf (_("The card will now be re-configured"
+                      " to generate a key of %u bits\n"), key_attr->nbits);
+      else if (key_attr->algo == PUBKEY_ALGO_ECDH
+               || key_attr->algo == PUBKEY_ALGO_ECDSA
+               || key_attr->algo == PUBKEY_ALGO_EDDSA)
+        tty_printf (_("The card will now be re-configured"
+                      " to generate a key of type: %s\n"), key_attr->curve),
+
+      show_keysize_warning ();
+    }
 
   return key_attr;
 }

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

Summary of changes:
 g10/card-util.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)


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