mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
gpg: Finish experimental support for Ed25519.
* agent/cvt-openpgp.c (try_do_unprotect_arg_s): Add field "curve". (get_keygrip): Add and use arg CURVE. (convert_secret_key): Ditto. (convert_transfer_key): Ditto. (get_npkey_nskey): New. (prepare_unprotect): Replace gcrypt functions by get_npkey_nskey. Allow opaque MPIs. (do_unprotect): Use CURVE instead of parameters. (convert_from_openpgp_main): Ditto. (convert_to_openpgp): Simplify. * g10/import.c (one_mpi_from_pkey): Remove. (transfer_secret_keys): Rewrite to use the curve instead of the parameters. * g10/parse-packet.c (parse_key): Mark protected MPIs with USER1 flag. * common/openpgp-oid.c (openpgp_curve_to_oid): Allow the use of "NIST P-256" et al. * g10/keygen.c (ask_curve): Add arg ALGO. (generate_keypair): Rewrite the ECC key logic. * tests/openpgp/ecc.test: Provide the "ecc" passphrase.
This commit is contained in:
parent
bdb9c2b314
commit
8fee6c1ce6
7 changed files with 231 additions and 229 deletions
|
@ -280,17 +280,20 @@ openpgp_curve_to_oid (const char *name, unsigned int *r_nbits)
|
|||
oidstr = "1.3.6.1.4.1.11591.15.1";
|
||||
nbits = 255;
|
||||
}
|
||||
else if (!strcmp (name, "nistp256"))
|
||||
else if (!strcmp (name, "nistp256") || !strcmp (name, "NIST P-256"))
|
||||
{
|
||||
/* Libgcrypt uses "NIST P-256" as standard name for this curve
|
||||
and thus the key generation returns this value. Thus we
|
||||
allow both strings. */
|
||||
oidstr = "1.2.840.10045.3.1.7";
|
||||
nbits = 256;
|
||||
}
|
||||
else if (!strcmp (name, "nistp384"))
|
||||
else if (!strcmp (name, "nistp384") || !strcmp (name, "NIST P-384"))
|
||||
{
|
||||
oidstr = "1.3.132.0.34";
|
||||
nbits = 384;
|
||||
}
|
||||
else if (!strcmp (name, "nistp521"))
|
||||
else if (!strcmp (name, "nistp521") || !strcmp (name, "NIST P-521"))
|
||||
{
|
||||
oidstr = "1.3.132.0.35";
|
||||
nbits = 521;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue