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

gpg: Change keydb_search to not return legacy keys.

Browse source 
* g10/keyring.c (keyring_search): Take new argument, ignore_legacy.
If set, skip any legacy keys.  Update callers.
* g10/keydb.c (keydb_search): Skip any legacy keys.
(keydb_search_first): Don't skip legacy keys.  Treat them
as an error.
(keydb_search_next): Likewise.
(keydb_search_fpr): Likewise.
* g10/export.c (do_export_stream): Likewise.
* g10/getkey.c (lookup): Likewise.
(have_secret_key_with_kid): Likewise.
* g10/keylist.c (list_all): Likewise.
(keyring_rebuild_cache): Likewise.
* g10/keyserver.c (keyidlist): Likewise.
* g10/trustdb.c (validate_key_list): Likewise.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
This commit is contained in:
Neal H. Walfield 2015-11-17 14:38:03 +01:00
parent 848726f5c0
commit 58e4a492e2
8 changed files with 34 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

7
g10/keyserver.c
View file

@ -1229,21 +1229,16 @@ keyidlist(strlist_t users,KEYDB_SEARCH_DESC **klist,int *count,int fakev3)
for (;;)
{
rc = keydb_search (kdbhd, desc, ndesc, NULL);
if (rc && gpg_err_code (rc) != GPG_ERR_LEGACY_KEY)
if (rc)
break; /* ready. */
if (!users)
desc[0].mode = KEYDB_SEARCH_MODE_NEXT;
if (gpg_err_code (rc) == GPG_ERR_LEGACY_KEY)
continue;
/* read the keyblock */
rc = keydb_get_keyblock (kdbhd, &keyblock );
if( rc )
{
if (gpg_err_code (rc) == GPG_ERR_LEGACY_KEY)
continue;
log_error (_("error reading keyblock: %s\n"), gpg_strerror (rc) );
goto leave;
}