diff options
| author | Neal H. Walfield <[email protected]> | 2015-11-17 13:38:03 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2015-11-17 13:53:05 +0000 |
| commit | 58e4a492e2c8e908d16135486ed601f602f1e38d (patch) | |
| tree | e45496bf0d8c6a2e890a3de6ae42772b951d58f3 /g10/keyring.h | |
| parent | gpg: Correctly handle an error. (diff) | |
| download | gnupg-58e4a492e2c8e908d16135486ed601f602f1e38d.tar.gz gnupg-58e4a492e2c8e908d16135486ed601f602f1e38d.zip | |
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 <[email protected]>
Diffstat (limited to 'g10/keyring.h')
| -rw-r--r-- | g10/keyring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/keyring.h b/g10/keyring.h index d97bd4c21..14d9f426f 100644 --- a/g10/keyring.h +++ b/g10/keyring.h @@ -39,7 +39,7 @@ int keyring_insert_keyblock (KEYRING_HANDLE hd, KBNODE kb); int keyring_delete_keyblock (KEYRING_HANDLE hd); int keyring_search_reset (KEYRING_HANDLE hd); int keyring_search (KEYRING_HANDLE hd, KEYDB_SEARCH_DESC *desc, - size_t ndesc, size_t *descindex); + size_t ndesc, size_t *descindex, int skip_legacy); int keyring_rebuild_cache (void *token,int noisy); #endif /*GPG_KEYRING_H*/ |