aboutsummaryrefslogtreecommitdiffstats
path: root/sm/gpgsm.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2021-02-24 07:40:06 +0000
committerWerner Koch <[email protected]>2021-02-24 07:40:06 +0000
commit615d2e4fb15859320ea0ebec1bb457c692c57f0a (patch)
tree34c7f56a8298204e4265008263625de01334139a /sm/gpgsm.c
parentscd:p15: Make it code work again for D-Trust cards. (diff)
downloadgnupg-615d2e4fb15859320ea0ebec1bb457c692c57f0a.tar.gz
gnupg-615d2e4fb15859320ea0ebec1bb457c692c57f0a.zip
sm: Silence some output on --quiet
* sm/encrypt.c (gpgsm_encrypt): Take care of --quiet. * sm/gpgsm.c: Include minip12.h. (set_debug): Call p12_set_verbosity. * sm/import.c (parse_p12): Dump keygrip only in debug mode. * sm/minip12.c (opt_verbose, p12_set_verbosity): New. (parse_bag_encrypted_data): Print info messages only in verbose mode. -- GnuPG-bug-id: 4757
Diffstat (limited to 'sm/gpgsm.c')
-rw-r--r--sm/gpgsm.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 49e7e3870..4a466050c 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -46,7 +46,7 @@
#include "../common/asshelp.h"
#include "../common/init.h"
#include "../common/compliance.h"
-
+#include "minip12.h"
#ifndef O_BINARY
#define O_BINARY 0
@@ -768,6 +768,10 @@ set_debug (void)
if (opt.debug)
parse_debug_flag (NULL, &opt.debug, debug_flags);
+
+ /* minip12.c may be used outside of GnuPG, thus we don't have the
+ * opt structure over there. */
+ p12_set_verbosity (opt.verbose);
}