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

gpg: Fix short key ID for v5key.

* g10/keyid.c (keyid_from_pk): Return keyid[0] for v5key.
* g10/keyring.c (keyring_search): Handle short key ID for v5key.

--

GnuPG-bug-id: 5000
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-08-07 12:41:47 +09:00
parent 646a30fd39
commit 20982bbd75
2 changed files with 8 additions and 3 deletions

View file

@ -567,7 +567,10 @@ keyid_from_pk (PKT_public_key *pk, u32 *keyid)
keyid[0] = pk->keyid[0];
keyid[1] = pk->keyid[1];
return keyid[1]; /*FIXME:shortkeyid is different for v5*/
if (pk->fprlen == 32)
return keyid[0];
else
return keyid[1];
}