diff options
| author | NIIBE Yutaka <[email protected]> | 2024-10-08 06:25:41 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2024-10-08 06:25:41 +0000 |
| commit | 57dce1ee62c2b900b852877c1c9754126b87ed0f (patch) | |
| tree | 59e06ebe2703c30d6026dea4f4bb6fa9f6e96e4b /common/openpgp-fpr.c | |
| parent | common,gpg,scd,sm: Use openpgp_oid_or_name_to_curve to get curve. (diff) | |
| download | gnupg-57dce1ee62c2b900b852877c1c9754126b87ed0f.tar.gz gnupg-57dce1ee62c2b900b852877c1c9754126b87ed0f.zip | |
common,gpg,scd,sm: Fix for Curve25519 OID supporting new and old.
* common/util.h (openpgp_curve_to_oid): Add new argument to select OID
by OpenPGP version.
* common/openpgp-oid.c (openpgp_curve_to_oid): Implement returning
selected OID for Curve25519.
* common/openpgp-fpr.c (compute_openpgp_fpr_ecc): Follow the change,
selecting by the version.
* g10/export.c (match_curve_skey_pk): Likewise.
(transfer_format_to_openpgp): Likewise.
* g10/gpg.c (list_config): Likewise, print new OID.
* g10/keygen.c (ecckey_from_sexp): Likewise, selecting by the version.
* sm/encrypt.c (ecdh_encrypt): Likewise, don't care.
* sm/minip12.c (build_ecc_key_sequence): Likewise, new OID.
* scd/app-openpgp.c (ecdh_params, gen_challenge): Likewise, don't
care.
(ecc_read_pubkey, change_keyattr_from_string, ecc_writekey): Likewise,
old OID.
--
GnuPG-bug-id: 7316
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'common/openpgp-fpr.c')
| -rw-r--r-- | common/openpgp-fpr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/openpgp-fpr.c b/common/openpgp-fpr.c index 7860d3872..699eee9ee 100644 --- a/common/openpgp-fpr.c +++ b/common/openpgp-fpr.c @@ -231,7 +231,8 @@ compute_openpgp_fpr_ecc (int keyversion, unsigned long timestamp, unsigned char nbits_q[2]; unsigned int n; - curveoidstr = openpgp_curve_to_oid (curvename, &curvebits, &pgpalgo); + curveoidstr = openpgp_curve_to_oid (curvename, &curvebits, &pgpalgo, + (keyversion > 4)); err = openpgp_oid_from_str (curveoidstr, &curveoid); if (err) goto leave; |