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

gpg: Replace an obsolete trustdb function.

Browse source 
* g10/trustdb.c (tdb_register_trusted_keyid): Make static.
(tdb_register_trusted_key): Replace register_trusted_keyid by
tdb_register_trusted_key.
* g10/keygen.c (do_generate_keypair): Ditto.
* g10/trust.c (register_trusted_keyid): Remove.
This commit is contained in:
Werner Koch 2021-04-23 20:45:25 +02:00
parent 0b875aa11a
commit 3cbc66410d
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
4 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
g10/trustdb.c
View file

@ -232,7 +232,7 @@ release_key_array ( struct key_array *keys )
* before initializing the validation module.
* FIXME: Should be replaced by a function to add those keys to the trustdb.
*/
void
static void
tdb_register_trusted_keyid (u32 *keyid)
{
struct key_item *k;
@ -257,21 +257,21 @@ tdb_register_trusted_key (const char *string)
{
if (desc.mode == KEYDB_SEARCH_MODE_LONG_KID)
{
register_trusted_keyid (desc.u.kid);
tdb_register_trusted_keyid (desc.u.kid);
return;
}
if (desc.mode == KEYDB_SEARCH_MODE_FPR && desc.fprlen == 20)
{
kid[0] = buf32_to_u32 (desc.u.fpr+12);
kid[1] = buf32_to_u32 (desc.u.fpr+16);
register_trusted_keyid (kid);
tdb_register_trusted_keyid (kid);
return;
}
if (desc.mode == KEYDB_SEARCH_MODE_FPR && desc.fprlen == 32)
{
kid[0] = buf32_to_u32 (desc.u.fpr);
kid[1] = buf32_to_u32 (desc.u.fpr+4);
register_trusted_keyid (kid);
tdb_register_trusted_keyid (kid);
return;
}
}