diff options
| author | Werner Koch <wk@gnupg.org> | 2020-05-13 11:18:58 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2020-05-13 11:22:50 +0200 |
| commit | 72726c07cc6392ca32597f0279cd5af16edd79eb (patch) | |
| tree | 13acbfffe91957c0d8131c1777e2820cc3587099 /cipher/ecc-curves.c | |
| parent | 72061833f7476b7702812e81042d02816af1ea8f (diff) | |
| download | libgcrypt-72726c07cc6392ca32597f0279cd5af16edd79eb.tar.gz | |
ecc: Remove not yet supported Ed448 and make X25519 an alias.
--
We should not have an algo for a not implemented curve. Further X25519
needs to be an alias for Curve25519 and not a separate entry for a
non-existent curve parameter.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'cipher/ecc-curves.c')
| -rw-r--r-- | cipher/ecc-curves.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cipher/ecc-curves.c b/cipher/ecc-curves.c index 2cc409f5..25c5d9e8 100644 --- a/cipher/ecc-curves.c +++ b/cipher/ecc-curves.c @@ -41,13 +41,14 @@ static const struct const char *other; /* Other name. */ } curve_aliases[] = { - { "Curve25519", "1.3.6.1.4.1.3029.1.5.1" }, /* OpenPGP */ - { "X22519", "1.3.101.110" }, /* rfc8410 */ - { "Ed25519", "1.3.6.1.4.1.11591.15.1" }, /* OpenPGP */ { "Ed25519", "1.3.101.112" }, /* rfc8410 */ - { "Ed448", "1.3.101.113" }, /* rfc8410 */ + { "Curve25519", "1.3.6.1.4.1.3029.1.5.1" }, /* OpenPGP */ + { "Curve25519", "1.3.101.110" }, /* rfc8410 */ + { "Curve25519", "X25519" }, /* rfc8410 */ + + /* { "Ed448", "1.3.101.113" }, /\* rfc8410 *\/ */ { "X448", "1.3.101.111" }, /* rfc8410 */ { "NIST P-192", "1.2.840.10045.3.1.1" }, /* X9.62 OID */ @@ -166,7 +167,7 @@ static const ecc_domain_parms_t domain_parms[] = /* Note: As per RFC-7748 errata eid4730 the g_y value should be * "0x5F51E65E475F794B1FE122D388B72EB36DC2B28192839E4DD6163A5D81312C14" * but that breaks the keygrip. The new value is recovered in - * the function _gcry_ecc_fill_in_curve. + * the function _gcry_ecc_fill_in_curve. See bug #4712. */ }, { |