aboutsummaryrefslogtreecommitdiffstats
path: root/common/openpgp-oid.c
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2014-04-08 02:59:39 +0000
committerNIIBE Yutaka <[email protected]>2014-04-08 02:59:39 +0000
commit40c3b0741e593d0658dda0c707c4f32e80648dd1 (patch)
treeb1e481f47635cce781d8531af56ef69d161b7d3f /common/openpgp-oid.c
parentagent: EdDSA support for SSH. (diff)
downloadgnupg-40c3b0741e593d0658dda0c707c4f32e80648dd1.tar.gz
gnupg-40c3b0741e593d0658dda0c707c4f32e80648dd1.zip
g10: EdDSA support.
* g10/keyid.c (keygrip_from_pk): Compute keygrip of EdDSA key. * g10/keygen.c (generate_subkeypair): Ed25519 is for EdDSA. * common/openpgp-oid.c (oid_ed25519): Update.
Diffstat (limited to 'common/openpgp-oid.c')
-rw-r--r--common/openpgp-oid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/openpgp-oid.c b/common/openpgp-oid.c
index a2a3617b6..94a2296b6 100644
--- a/common/openpgp-oid.c
+++ b/common/openpgp-oid.c
@@ -39,7 +39,7 @@
/* The OID for Curve Ed25519 in OpenPGP format. */
static const char oid_ed25519[] =
- { 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x97, 0x55, 0x01, 0x05, 0x01 };
+ { 0x09, 0x2b, 0x06, 0x01, 0x04, 0x01, 0xda, 0x47, 0x0f, 0x01 };
/* Helper for openpgp_oid_from_str. */