security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-18 14:17:03 +01:00
Code Activity

experiment: Fix keygrip and signature for 448.

Browse Source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2021-10-21 15:58:34 +09:00
parent 7965049441
commit cfe3752bd1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g10/keyid.c
View File

@ -1063,11 +1063,12 @@ keygrip_from_pk (PKT_public_key *pk, unsigned char *array)
case PUBKEY_ALGO_ECDSA: case PUBKEY_ALGO_ECDSA:
case PUBKEY_ALGO_ECDH: case PUBKEY_ALGO_ECDH:
{ {
char *curve = openpgp_oid_to_str (pk->pkey[0]); char *curve_oid = openpgp_oid_to_str (pk->pkey[0]);
if (!curve) if (!curve_oid)
err = gpg_error_from_syserror (); err = gpg_error_from_syserror ();
else else
{ {
const char *curve = openpgp_oid_to_curve (curve_oid, 1);
gcry_mpi_t pubkey = openpgp_ecc_parse_key (pk->pubkey_algo, gcry_mpi_t pubkey = openpgp_ecc_parse_key (pk->pubkey_algo,
curve, pk->pkey[1]); curve, pk->pkey[1]);
@ -1078,8 +1079,8 @@ keygrip_from_pk (PKT_public_key *pk, unsigned char *array)
&& openpgp_oid_is_cv25519 (pk->pkey[0]))? && openpgp_oid_is_cv25519 (pk->pkey[0]))?
"(public-key(ecc(curve%s)(flags djb-tweak)(q%m)))": "(public-key(ecc(curve%s)(flags djb-tweak)(q%m)))":
"(public-key(ecc(curve%s)(q%m)))", "(public-key(ecc(curve%s)(q%m)))",
curve, pubkey); curve_oid, pubkey);
xfree (curve); xfree (curve_oid);
gcry_mpi_release (pubkey); gcry_mpi_release (pubkey);
} }
} }

2
g10/sign.c
View File

@ -441,7 +441,7 @@ sos_sig_448 (gcry_mpi_t r, gcry_mpi_t s)
memcpy (p+1, p_r, 57); memcpy (p+1, p_r, 57);
memcpy (p+1+57, p_s, 57); memcpy (p+1+57, p_s, 57);
a = gcry_mpi_set_opaque (NULL, p, 0); a = gcry_mpi_set_opaque (NULL, p, 7+57*2*8);
gcry_mpi_set_flag (a, GCRYMPI_FLAG_USER2); gcry_mpi_set_flag (a, GCRYMPI_FLAG_USER2);
return a; return a;
} }