From 57dce1ee62c2b900b852877c1c9754126b87ed0f Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 8 Oct 2024 15:25:41 +0900 Subject: 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 --- sm/encrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sm/encrypt.c') diff --git a/sm/encrypt.c b/sm/encrypt.c index 202bbb92f..98d3024ad 100644 --- a/sm/encrypt.c +++ b/sm/encrypt.c @@ -218,7 +218,7 @@ ecdh_encrypt (DEK dek, gcry_sexp_t s_pkey, gcry_sexp_t *r_encval) * canonical numerical OID. We also use this to get the size of the * curve which we need to figure out a suitable hash algo. We * should have a Libgcrypt function to do this; see bug report #4926. */ - curve = openpgp_curve_to_oid (curvebuf, &curvebits, NULL); + curve = openpgp_curve_to_oid (curvebuf, &curvebits, NULL, -1); if (!curve) { err = gpg_error (GPG_ERR_UNKNOWN_CURVE); -- cgit v1.2.3