diff options
author | Werner Koch <wk@gnupg.org> | 2021-02-24 08:40:06 +0100 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2021-02-24 08:40:06 +0100 |
commit | 615d2e4fb15859320ea0ebec1bb457c692c57f0a (patch) | |
tree | 34c7f56a8298204e4265008263625de01334139a | |
parent | 33aaa37e5bc0beb75305cdf9d8be850daccaee5e (diff) | |
download | gnupg-615d2e4fb15859320ea0ebec1bb457c692c57f0a.tar.gz |
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
-rw-r--r-- | sm/encrypt.c | 3 | ||||
-rw-r--r-- | sm/gpgsm.c | 6 | ||||
-rw-r--r-- | sm/import.c | 3 | ||||
-rw-r--r-- | sm/minip12.c | 21 | ||||
-rw-r--r-- | sm/minip12.h | 3 |
5 files changed, 29 insertions, 7 deletions
diff --git a/sm/encrypt.c b/sm/encrypt.c index fbd88b6cd..92ca341f5 100644 --- a/sm/encrypt.c +++ b/sm/encrypt.c @@ -840,7 +840,8 @@ gpgsm_encrypt (ctrl_t ctrl, certlist_t recplist, int data_fd, estream_t out_fp) goto leave; } audit_log (ctrl->audit, AUDIT_ENCRYPTION_DONE); - log_info ("encrypted data created\n"); + if (!opt.quiet) + log_info ("encrypted data created\n"); leave: ksba_cms_release (cms); 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); } diff --git a/sm/import.c b/sm/import.c index 8e5634182..3d08254c8 100644 --- a/sm/import.c +++ b/sm/import.c @@ -881,7 +881,8 @@ parse_p12 (ctrl_t ctrl, ksba_reader_t reader, struct stats_s *stats) log_error ("can't calculate keygrip\n"); goto leave; } - log_printhex (grip, 20, "keygrip:"); + if (DBG_X509) + log_printhex (grip, 20, "keygrip:"); /* Convert to canonical encoding using a function which pads it to a multiple of 64 bits. We need this padding for AESWRAP. */ diff --git a/sm/minip12.c b/sm/minip12.c index 26d77f426..a7537f06f 100644 --- a/sm/minip12.c +++ b/sm/minip12.c @@ -142,6 +142,16 @@ struct tag_info }; +static int opt_verbose; + + +void +p12_set_verbosity (int verbose) +{ + opt_verbose = verbose; +} + + /* Wrapper around tlv_builder_add_ptr to add an OID. When we * eventually put the whole tlv_builder stuff into Libksba, we can add * such a function there. Right now we don't do this to avoid a @@ -928,8 +938,9 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length, else goto bailout; - log_info ("%lu bytes of %s encrypted text\n",ti.length, - is_pbes2?"AES128":is_3des?"3DES":"RC2"); + if (opt_verbose) + log_info ("%lu bytes of %s encrypted text\n",ti.length, + is_pbes2?"AES128":is_3des?"3DES":"RC2"); plain = gcry_malloc_secure (ti.length); if (!plain) @@ -1026,7 +1037,8 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length, { int len; - log_info ("processing simple keyBag\n"); + if (opt_verbose) + log_info ("processing simple keyBag\n"); /* Fixme: This code is duplicated from parse_bag_data. */ if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_SEQUENCE) @@ -1109,7 +1121,8 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length, } else { - log_info ("processing certBag\n"); + if (opt_verbose) + log_info ("processing certBag\n"); if (parse_tag (&p, &n, &ti)) goto bailout; if (ti.class || ti.tag != TAG_SEQUENCE) diff --git a/sm/minip12.h b/sm/minip12.h index f4fba65ff..84c5f5f79 100644 --- a/sm/minip12.h +++ b/sm/minip12.h @@ -22,6 +22,9 @@ #include <gcrypt.h> + +void p12_set_verbosity (int verbose); + gcry_mpi_t *p12_parse (const unsigned char *buffer, size_t length, const char *pw, void (*certcb)(void*, const unsigned char*, size_t), |