From fcb62fe20f45290bf95703ec3bf4d0b361fa4339 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 27 Jul 2017 11:37:00 +0200 Subject: 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 --- g10/gpgcompose.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'g10/gpgcompose.c') diff --git a/g10/gpgcompose.c b/g10/gpgcompose.c index f38d75579..2b42bfbf9 100644 --- a/g10/gpgcompose.c +++ b/g10/gpgcompose.c @@ -3065,11 +3065,13 @@ show_basic_key_info (ctrl_t ctrl, KBNODE keyblock) } int -keyedit_print_one_sig (ctrl_t ctrl, int rc, kbnode_t keyblock, kbnode_t node, +keyedit_print_one_sig (ctrl_t ctrl, estream_t fp, + int rc, kbnode_t keyblock, kbnode_t node, int *inv_sigs, int *no_key, int *oth_err, int is_selfsig, int print_without_key, int extended) { (void) ctrl; + (void) fp; (void) rc; (void) keyblock; (void) node; -- cgit