[git] GnuPG - branch, master, updated. gnupg-2.2.1-62-gfd3f5ca

[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  fd3f5ca151b9440ade2fa4991b7cfb190e357893 (commit)
       via  87b94e08d7811af94403384c45ae5d2bb88f6ed9 (commit)
       via  f795f4529d8ab5a05db1cc1960abd34390bfae1b (commit)
      from  6c63a04569c07c9c2817c7c530a92ccfa58155cc (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 fd3f5ca151b9440ade2fa4991b7cfb190e357893
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Nov 1 18:17:44 2017 +0100

    Register another OpenPGP card vendor.
    
    --

diff --git a/g10/card-util.c b/g10/card-util.c
index 90178dd..9495038 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -212,6 +212,7 @@ get_manufacturer (unsigned int no)
     case 0x000A: return "Dangerous Things";
 
     case 0x002A: return "Magrathea";
+    case 0x0042: return "GnuPG e.V.";
 
     case 0x1337: return "Warsaw Hackerspace";
     case 0x2342: return "warpzone"; /* hackerspace Muenster.  */

commit 87b94e08d7811af94403384c45ae5d2bb88f6ed9
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Nov 1 18:14:26 2017 +0100

    gpg: Remove trailing comma in an enum.
    
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keygen.c b/g10/keygen.c
index e63fbaa..1281574 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -90,7 +90,7 @@ enum para_name {
   pHANDLE,
   pKEYSERVER,
   pKEYGRIP,
-  pSUBKEYGRIP,
+  pSUBKEYGRIP
 };
 
 struct para_data_s {

commit f795f4529d8ab5a05db1cc1960abd34390bfae1b
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 27 14:44:53 2017 +0200

    gpg: Rename two card related functions in card-util.
    
    * g10/card-util.c (ask_card_rsa_keysize): Rename to ask_card_keyattr.
    (do_change_rsa_keysize): Rename to do_change_keyattr.
    --
    
    We want to support other algos than RSA and thus we need a better name
    for the functions.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/card-util.c b/g10/card-util.c
index dae11b0..90178dd 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -1330,7 +1330,7 @@ show_keysize_warning (void)
    select the prompt.  Returns 0 to use the default size (i.e. NBITS)
    or the selected size.  */
 static unsigned int
-ask_card_rsa_keysize (int keyno, unsigned int nbits)
+ask_card_keyattr (int keyno, unsigned int nbits)
 {
   unsigned int min_nbits = 1024;
   unsigned int max_nbits = 4096;
@@ -1380,7 +1380,7 @@ ask_card_rsa_keysize (int keyno, unsigned int nbits)
 /* Change the size of key KEYNO (0..2) to NBITS and show an error
    message if that fails.  */
 static gpg_error_t
-do_change_rsa_keysize (int keyno, unsigned int nbits)
+do_change_keyattr (int keyno, unsigned int nbits)
 {
   gpg_error_t err;
   char args[100];
@@ -1461,8 +1461,8 @@ generate_card_keys (ctrl_t ctrl)
         {
           if (info.key_attr[keyno].algo == PUBKEY_ALGO_RSA)
             {
-              nbits = ask_card_rsa_keysize (keyno, info.key_attr[keyno].nbits);
-              if (nbits && do_change_rsa_keysize (keyno, nbits))
+              nbits = ask_card_keyattr (keyno, info.key_attr[keyno].nbits);
+              if (nbits && do_change_keyattr (keyno, nbits))
                 {
                   /* Error: Better read the default key size again.  */
                   agent_release_card_info (&info);
@@ -1544,8 +1544,8 @@ card_generate_subkey (ctrl_t ctrl, kbnode_t pub_keyblock)
           unsigned int nbits;
 
         ask_again:
-          nbits = ask_card_rsa_keysize (keyno-1, info.key_attr[keyno-1].nbits);
-          if (nbits && do_change_rsa_keysize (keyno-1, nbits))
+          nbits = ask_card_keyattr (keyno-1, info.key_attr[keyno-1].nbits);
+          if (nbits && do_change_keyattr (keyno-1, nbits))
             {
               /* Error: Better read the default key size again.  */
               agent_release_card_info (&info);

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

Summary of changes:
 g10/card-util.c | 13 +++++++------
 g10/keygen.c    |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)


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