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-oid.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-oid.c')
| -rw-r--r-- | common/openpgp-oid.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/common/openpgp-oid.c b/common/openpgp-oid.c index 0a7aae000..c4161ece1 100644 --- a/common/openpgp-oid.c +++ b/common/openpgp-oid.c @@ -443,9 +443,11 @@ openpgp_oid_is_cv448 (gcry_mpi_t a) curve names. If R_ALGO is not NULL and a specific ECC algorithm is required for this curve its OpenPGP algorithm number is stored there; otherwise 0 is stored which indicates that ECDSA or ECDH can - be used. */ + be used. SELECTOR specifies which OID should be returned: -1 for + don't care, 0 for old OID, 1 for new OID. */ const char * -openpgp_curve_to_oid (const char *name, unsigned int *r_nbits, int *r_algo) +openpgp_curve_to_oid (const char *name, unsigned int *r_nbits, int *r_algo, + int selector) { int i; unsigned int nbits = 0; @@ -479,6 +481,14 @@ openpgp_curve_to_oid (const char *name, unsigned int *r_nbits, int *r_algo) } } + /* Special handling for Curve25519, where we have two valid OIDs. */ + if (algo && i == 0) + { + /* Select new OID, if wanted. */ + if (selector > 0) + oidstr = oidtable[2].oidstr; + } + if (r_nbits) *r_nbits = nbits; if (r_algo) |