From 83c2d2396cc9fa6bdd887a560830fc0f48b01b08 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 12 Sep 2014 11:31:49 +0200 Subject: gpg: Use algorithm id 22 for EdDSA. * common/openpgpdefs.h (PUBKEY_ALGO_EDDSA): Change to 22. * g10/keygen.c (ask_curve): Reword the Curve25519 warning note. -- In the hope that the IETF will eventually assign 22 for EdDSA using the draft-koch-eddsa-for-openpgp-01 specs we start using this number. --- g10/keygen.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'g10') diff --git a/g10/keygen.c b/g10/keygen.c index c2c31d52e..92337bb75 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -2198,12 +2198,8 @@ ask_curve (int *algo, int both) { if (curves[idx].fix_curve) { - log_info ("WARNING: Curve25519 is an experimental algorithm" - " and not yet standardized.\n"); - log_info (" The key format will eventually change" - " and render this key unusable!\n"); - log_info (" You also need a recent development version" - " of Libgcrypt.\n"); + log_info ("WARNING: Curve25519 is not yet part of the" + " OpenPGP standard.\n"); if (!cpr_get_answer_is_yes("experimental_curve.override", "Use this curve anyway? (y/N) ") ) -- cgit v1.2.3