diff options
| author | Werner Koch <wk@gnupg.org> | 2014-09-12 11:31:49 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-09-12 11:31:49 +0200 |
| commit | 83c2d2396cc9fa6bdd887a560830fc0f48b01b08 (patch) | |
| tree | 319c0be35aa62d49787a9d723438f082f65643d0 /common | |
| parent | build: Require libgpg-error 1.15 (diff) | |
| download | gnupg2-83c2d2396cc9fa6bdd887a560830fc0f48b01b08.tar.xz gnupg2-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 'common')
| -rw-r--r-- | common/openpgpdefs.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; |