security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

common,gpg,scd,sm: Fix for Curve25519 OID supporting new and old.

Browse source 
* 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 <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2024-10-08 15:25:41 +09:00
parent f5703994d4
commit 57dce1ee62
No known key found for this signature in database
GPG key ID: 640114AF89DE6054
9 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scd/app-openpgp.c
View file

@ -1759,7 +1759,7 @@ ecdh_params (const char *curve)
{
unsigned int nbits;
openpgp_curve_to_oid (curve, &nbits, NULL);
openpgp_curve_to_oid (curve, &nbits, NULL, -1);
/* See RFC-6637 for those constants.
0x03: Number of bytes
@ -1801,7 +1801,7 @@ ecc_read_pubkey (app_t app, ctrl_t ctrl, int meta_update,
}
curve = app->app_local->keyattr[keyno].ecc.curve;
oidstr = openpgp_curve_to_oid (curve, NULL, NULL);
oidstr = openpgp_curve_to_oid (curve, NULL, NULL, 0);
err = openpgp_oid_from_str (oidstr, &oid);
if (err)
return err;
@ -4194,7 +4194,7 @@ change_keyattr_from_string (app_t app, ctrl_t ctrl,
else
{
nbits = 0;
oidstr = openpgp_curve_to_oid (keyalgo, NULL, &algo);
oidstr = openpgp_curve_to_oid (keyalgo, NULL, &algo, 0);
if (!oidstr)
{
err = gpg_error (GPG_ERR_INV_DATA);
@ -4244,7 +4244,7 @@ change_keyattr_from_string (app_t app, ctrl_t ctrl,
else if (algo == PUBKEY_ALGO_ECDH || algo == PUBKEY_ALGO_ECDSA
|| algo == PUBKEY_ALGO_EDDSA)
{
oidstr = openpgp_curve_to_oid (string+n, NULL, NULL);
oidstr = openpgp_curve_to_oid (string+n, NULL, NULL, 0);
if (!oidstr)
{
err = gpg_error (GPG_ERR_INV_DATA);
@ -4821,7 +4821,7 @@ ecc_writekey (app_t app, ctrl_t ctrl,
ecdh_param_len = 4;
}
oidstr = openpgp_curve_to_oid (curve, &n, NULL);
oidstr = openpgp_curve_to_oid (curve, &n, NULL, 0);
ecc_d_fixed_len = (n+7)/8;
err = openpgp_oid_from_str (oidstr, &oid);
if (err)
@ -5552,7 +5552,7 @@ gen_challenge (app_t app, const void **r_data, size_t *r_datalen)
{
unsigned int n;
openpgp_curve_to_oid (app->app_local->keyattr[2].ecc.curve, &n, NULL);
openpgp_curve_to_oid (app->app_local->keyattr[2].ecc.curve, &n, NULL, -1);
/* No hash algo header, and appropriate length of random octets,
determined by field size of the curve. */
datalen = (n+7)/8;