diff options
| author | NIIBE Yutaka <[email protected]> | 2019-10-15 11:54:10 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2019-10-15 11:54:10 +0000 |
| commit | 2906636b929f08fdf342560834d920e8e8153458 (patch) | |
| tree | c04264bc182c404ab216736e486277bc5171d6ed | |
| parent | gpg: Extend --quick-gen-key for creating keys from a card. (diff) | |
| download | gnupg-2906636b929f08fdf342560834d920e8e8153458.tar.gz gnupg-2906636b929f08fdf342560834d920e8e8153458.zip | |
Revert "gpg: The first key should be in candidates."
This reverts commit 66eb953f43800a91c4280ae8fd49f6dc8cf74578.
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | g10/getkey.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index a51ba5f98..6635b5b54 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -1442,8 +1442,6 @@ get_best_pubkey_byname (ctrl_t ctrl, enum get_pubkey_modes mode, int is_mbox = is_valid_mailbox (name); int wkd_tried = 0; - log_assert (ret_keyblock != NULL); - if (retctx) *retctx = NULL; @@ -1506,10 +1504,7 @@ get_best_pubkey_byname (ctrl_t ctrl, enum get_pubkey_modes mode, struct pubkey_cmp_cookie new = { 0 }; kbnode_t new_keyblock; - copy_public_key (&new.key, (*ret_keyblock)->pkt->pkt.public_key); - new_keyblock = clone_kbnode (*ret_keyblock); - - do + while (getkey_next (ctrl, ctx, &new.key, &new_keyblock) == 0) { int diff = pubkey_cmp (ctrl, name, &best, &new, new_keyblock); release_kbnode (new_keyblock); @@ -1534,8 +1529,6 @@ get_best_pubkey_byname (ctrl_t ctrl, enum get_pubkey_modes mode, } new.uid = NULL; } - while (getkey_next (ctrl, ctx, &new.key, &new_keyblock) == 0); - getkey_end (ctrl, ctx); ctx = NULL; free_user_id (best.uid); |