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
|
@ -188,7 +188,7 @@ echo 'This is one line' >z
|
|||
for msg in $tests; do
|
||||
info "checking: $msg"
|
||||
eval "(IFS=; echo \"\$$msg\")" >x
|
||||
$GPG -o y --yes x || error "decryption of $msg failed"
|
||||
PINENTRY_USER_DATA=ecc $GPG -o y --yes x || error "decryption of $msg failed"
|
||||
cmp y z || error "$msg: mismatch"
|
||||
done
|
||||
|
||||
|
@ -204,7 +204,7 @@ for i in $plain_files $data_files ; do
|
|||
for k in $mainkeyids ; do
|
||||
info "file: $i key: $k"
|
||||
$GPG ${opt_always} -e -o x --yes -r $k $i
|
||||
$GPG -o y --yes x
|
||||
PINENTRY_USER_DATA=ecc $GPG -o y --yes x
|
||||
cmp $i y || error "$i,$k: mismatch"
|
||||
done
|
||||
done
|
||||
|
@ -217,7 +217,7 @@ info "Checking ECC signing and verifiction."
|
|||
for i in $plain_files $data_files ; do
|
||||
for k in $mainkeyids ; do
|
||||
info "file: $i key: $k"
|
||||
$GPG -s -o x --yes -u $k $i
|
||||
PINENTRY_USER_DATA=ecc $GPG -s -o x --yes -u $k $i
|
||||
$GPG -o y --yes x || error "verify of $i,$k failed"
|
||||
cmp $i y || error "$i,$k: mismatch"
|
||||
done
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue