aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2017-12-29 19:18:20 +0000
committerWerner Koch <[email protected]>2017-12-29 19:18:20 +0000
commit412bb7a801f242d47a82712080cce6ddbb843166 (patch)
tree13b7cc8729182322a3da9f2bd17d2e1302c9c61a
parentscd: Fix for inactive card at start by internal CCID driver. (diff)
downloadgnupg-412bb7a801f242d47a82712080cce6ddbb843166.tar.gz
gnupg-412bb7a801f242d47a82712080cce6ddbb843166.zip
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 <[email protected]>
Diffstat (limited to '')
-rw-r--r--g10/keygen.c7
1 files changed, 7 insertions, 0 deletions
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)