mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
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
This commit is contained in:
parent
33aaa37e5b
commit
615d2e4fb1
5 changed files with 29 additions and 7 deletions
21
sm/minip12.c
21
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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue