diff options
| author | Werner Koch <[email protected]> | 2021-04-23 18:45:25 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2021-04-23 18:45:25 +0000 |
| commit | 3cbc66410d62ad2f7e559095753a2385fe644d07 (patch) | |
| tree | 7cab62485a38df245da74eb01cd315a1cd23ea6f /g10/trustdb.c | |
| parent | agent,w32: Silence the get_peercred failed diagnostic (diff) | |
| download | gnupg-3cbc66410d62ad2f7e559095753a2385fe644d07.tar.gz gnupg-3cbc66410d62ad2f7e559095753a2385fe644d07.zip | |
gpg: Replace an obsolete trustdb function.
* 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.
Diffstat (limited to 'g10/trustdb.c')
| -rw-r--r-- | g10/trustdb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/trustdb.c b/g10/trustdb.c index a313a423c..0b9625ea6 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -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; } } |