From 58e4a492e2c8e908d16135486ed601f602f1e38d Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Tue, 17 Nov 2015 14:38:03 +0100 Subject: gpg: Change keydb_search to not return legacy keys. * 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 --- g10/export.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'g10/export.c') diff --git a/g10/export.c b/g10/export.c index 3c2aa5745..1d71c1c46 100644 --- a/g10/export.c +++ b/g10/export.c @@ -940,8 +940,6 @@ do_export_stream (ctrl_t ctrl, iobuf_t out, strlist_t users, int secret, err = keydb_search (kdbhd, desc, ndesc, &descindex); if (!users) desc[0].mode = KEYDB_SEARCH_MODE_NEXT; - if (gpg_err_code (err) == GPG_ERR_LEGACY_KEY) - continue; /* Skip PGP2 keys. */ if (err) break; @@ -949,8 +947,6 @@ do_export_stream (ctrl_t ctrl, iobuf_t out, strlist_t users, int secret, release_kbnode (keyblock); keyblock = NULL; err = keydb_get_keyblock (kdbhd, &keyblock); - if (gpg_err_code (err) == GPG_ERR_LEGACY_KEY) - continue; /* Skip PGP2 keys. */ if (err) { log_error (_("error reading keyblock: %s\n"), gpg_strerror (err)); -- cgit v1.2.3