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. --- common/openpgpdefs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common') diff --git a/common/openpgpdefs.h b/common/openpgpdefs.h index ac1af3788..c81109a9e 100644 --- a/common/openpgpdefs.h +++ b/common/openpgpdefs.h @@ -122,8 +122,8 @@ typedef enum PUBKEY_ALGO_ECDH = 18, /* RFC-6637 */ PUBKEY_ALGO_ECDSA = 19, /* RFC-6637 */ PUBKEY_ALGO_ELGAMAL = 20, /* Elgamal encrypt+sign (legacy). */ - - PUBKEY_ALGO_EDDSA = 105 /* EdDSA (cf. Ed25519) (experimental). */ + /* 21 reserved by OpenPGP. */ + PUBKEY_ALGO_EDDSA = 22 /* EdDSA (not yet assigned). */ } pubkey_algo_t; -- cgit v1.2.3