diff options
| author | NIIBE Yutaka <[email protected]> | 2014-04-08 02:59:39 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2014-04-08 02:59:39 +0000 |
| commit | 40c3b0741e593d0658dda0c707c4f32e80648dd1 (patch) | |
| tree | b1e481f47635cce781d8531af56ef69d161b7d3f /g10/keyid.c | |
| parent | agent: EdDSA support for SSH. (diff) | |
| download | gnupg-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 '')
| -rw-r--r-- | g10/keyid.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/g10/keyid.c b/g10/keyid.c index 9ed64a4b5..2883af171 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -813,7 +813,9 @@ keygrip_from_pk (PKT_public_key *pk, unsigned char *array) else { err = gcry_sexp_build (&s_pkey, NULL, - "(public-key(ecc(curve%s)(q%m)))", + pk->pubkey_algo == PUBKEY_ALGO_EDDSA ? + "(public-key(ecc(curve%s)(flags eddsa)(q%m)))" + : "(public-key(ecc(curve%s)(q%m)))", curve, pk->pkey[1]); xfree (curve); } |