diff options
| author | David Shaw <[email protected]> | 2003-01-03 21:41:53 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-01-03 21:41:53 +0000 |
| commit | e247a0b3e0d0895eda987b0d237794265ae27b68 (patch) | |
| tree | 11822fcd9dc48a9754edb8e65153e3a99355236d /g10/keyring.c | |
| parent | * keydb.c (keydb_add_resource): Don't assume that try_make_homedir (diff) | |
| download | gnupg-e247a0b3e0d0895eda987b0d237794265ae27b68.tar.gz gnupg-e247a0b3e0d0895eda987b0d237794265ae27b68.zip | |
* import.c (import_one): Only do the work to create the status display for
interactive import if status is enabled.
* keyring.c (keyring_search): skipfnc didn't work properly with non-keyid
searches. Noted by Stefan Bellon.
* getkey.c (merge_selfsigs_main): Remove some unused code and make sure
that the pk selfsigversion member accounts for 1F direct sigs.
Diffstat (limited to '')
| -rw-r--r-- | g10/keyring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/keyring.c b/g10/keyring.c index 405167122..caa8df8b5 100644 --- a/g10/keyring.c +++ b/g10/keyring.c @@ -866,6 +866,7 @@ keyring_search (KEYRING_HANDLE hd, KEYDB_SEARCH_DESC *desc, size_t ndesc) PKT_user_id *uid = NULL; PKT_public_key *pk = NULL; PKT_secret_key *sk = NULL; + u32 aki[2]; /* figure out what information we need */ need_uid = need_words = need_keyid = need_fpr = any_skip = 0; @@ -968,7 +969,6 @@ keyring_search (KEYRING_HANDLE hd, KEYDB_SEARCH_DESC *desc, size_t ndesc) { byte afp[MAX_FINGERPRINT_LEN]; size_t an; - u32 aki[2]; if (pkt.pkttype == PKT_PUBLIC_KEY || pkt.pkttype == PKT_SECRET_KEY) { |