diff options
| author | Werner Koch <[email protected]> | 2014-09-12 09:31:49 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-09-12 09:31:49 +0000 |
| commit | 83c2d2396cc9fa6bdd887a560830fc0f48b01b08 (patch) | |
| tree | 319c0be35aa62d49787a9d723438f082f65643d0 /g10/keygen.c | |
| parent | build: Require libgpg-error 1.15 (diff) | |
| download | gnupg-83c2d2396cc9fa6bdd887a560830fc0f48b01b08.tar.gz gnupg-83c2d2396cc9fa6bdd887a560830fc0f48b01b08.zip | |
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.
Diffstat (limited to '')
| -rw-r--r-- | g10/keygen.c | 8 |
1 files changed, 2 insertions, 6 deletions
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) ") ) |