[git] GnuPG - branch, master, updated. gnupg-2.1.0-40-gb716e6a

[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  b716e6a69919b89c7887d6c7c9b97e58d18fdf95 (commit)
      from  0082766aace354e49a23227475e664c515217a8d (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 b716e6a69919b89c7887d6c7c9b97e58d18fdf95
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Nov 24 11:56:49 2014 +0100

    gpg: Fix batch generation of ECC keys.
    
    * g10/keygen.c (get_parameter_algo): Map ECC algorithm strings
    directly.
    --
    
    Interactive generation of the keys uses the OpenPGP algorithms numbers
    but batch generation allows the use of strings.
    
    Reported-by: Gaetan Bisson.
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keygen.c b/g10/keygen.c
index 2610af5..89cc255 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -2826,6 +2826,8 @@ get_parameter_algo( struct para_data_s *para, enum para_name key,
   if (!r)
     return -1;
 
+  /* Note that we need to handle the ECC algorithms specified as
+     strings directly because Libgcrypt folds them all to ECC.  */
   if (!ascii_strcasecmp (r->u.value, "default"))
     {
       /* Note: If you change this default algo, remember to change it
@@ -2839,6 +2841,12 @@ get_parameter_algo( struct para_data_s *para, enum para_name key,
   else if (!strcmp (r->u.value, "ELG-E")
            || !strcmp (r->u.value, "ELG"))
     i = PUBKEY_ALGO_ELGAMAL_E;
+  else if (!ascii_strcasecmp (r->u.value, "EdDSA"))
+    i = PUBKEY_ALGO_EDDSA;
+  else if (!ascii_strcasecmp (r->u.value, "ECDSA"))
+    i = PUBKEY_ALGO_ECDSA;
+  else if (!ascii_strcasecmp (r->u.value, "ECDH"))
+    i = PUBKEY_ALGO_ECDH;
   else
     i = map_pk_gcry_to_openpgp (gcry_pk_map_name (r->u.value));
 

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

Summary of changes:
 g10/keygen.c |    8 ++++++++
 1 file changed, 8 insertions(+)


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