[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.4-6-g412bb7a

[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, STABLE-BRANCH-2-2 has been updated
       via  412bb7a801f242d47a82712080cce6ddbb843166 (commit)
      from  4f88b0f56134af2ce56d434b7acd47fcf9b6f7cf (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 412bb7a801f242d47a82712080cce6ddbb843166
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Dec 29 20:18:20 2017 +0100

    gpg: Allow the use of "cv25519" and "ed25519" in the keygen parms.
    
    * g10/keygen.c (gen_ecc): Map curve names.
    --
    
    See
    https://lists.gnupg.org/pipermail/gnupg-users/2017-December/059619.html
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keygen.c b/g10/keygen.c
index b42afa8..a79b4fb 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -1581,6 +1581,13 @@ gen_ecc (int algo, const char *curve, kbnode_t pub_root,
   if (!curve || !*curve)
     return gpg_error (GPG_ERR_UNKNOWN_CURVE);
 
+  /* Map the displayed short forms of some curves to their canonical
+   * names. */
+  if (!ascii_strcasecmp (curve, "cv25519"))
+    curve = "Curve25519";
+  else if (!ascii_strcasecmp (curve, "ed25519"))
+    curve = "Ed25519";
+
   /* Note that we use the "comp" flag with EdDSA to request the use of
      a 0x40 compression prefix octet.  */
   if (algo == PUBKEY_ALGO_EDDSA)

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

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


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