aboutsummaryrefslogtreecommitdiffstats
path: root/g10/import.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2017-07-27 09:37:00 +0000
committerWerner Koch <[email protected]>2017-07-27 09:38:57 +0000
commitfcb62fe20f45290bf95703ec3bf4d0b361fa4339 (patch)
treee7a017dc3c7b6e627f7128e6f9d797de4f584365 /g10/import.c
parentg10: Make sure exactly one fingerprint is output with --quick-gen-key. (diff)
downloadgnupg-fcb62fe20f45290bf95703ec3bf4d0b361fa4339.tar.gz
gnupg-fcb62fe20f45290bf95703ec3bf4d0b361fa4339.zip
gpg: Avoid output to the tty during import.
* g10/key-check.c (key_check_all_keysigs): Add arg mode and change all output calls to use it. * g10/keyedit.c (keyedit_print_one_sig): Add arg fp and chnage all output calls to use it. (keyedit_menu): Adjust for changes. * g10/gpgcompose.c (keyedit_print_one_sig): Add dummy arg fp. * g10/import.c (import_one): Call key_check_all_keysigs with output to the log stream. -- Fixes-commit: 404fa8211b6188a0abe83ef43a4b44d528c0b035 GnuPG-bug-id: 3288 Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/import.c')
-rw-r--r--g10/import.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/import.c b/g10/import.c
index 6e8322587..813662537 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -1701,7 +1701,7 @@ import_one (ctrl_t ctrl,
keystr_from_pk(pk));
if ((options & IMPORT_REPAIR_KEYS))
- key_check_all_keysigs (ctrl, keyblock, 0, 0);
+ key_check_all_keysigs (ctrl, 1, keyblock, 0, 0);
if (chk_self_sigs (ctrl, keyblock, keyid, &non_self))
return 0; /* Invalid keyblock - error already printed. */