From 412bb7a801f242d47a82712080cce6ddbb843166 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 29 Dec 2017 20:18:20 +0100 Subject: [PATCH] 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 --- g10/keygen.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/g10/keygen.c b/g10/keygen.c index b42afa858..a79b4fb09 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)