security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

sm: Silence some output on --quiet

Browse Source 
* 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:
Werner Koch 2021-02-24 08:40:06 +01:00
parent 33aaa37e5b
commit 615d2e4fb1
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
5 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sm/encrypt.c
View File

@ -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);

6
sm/gpgsm.c
View File

@ -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);
}

3
sm/import.c
View File

@ -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. */

21
sm/minip12.c
View File

@ -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)

3
sm/minip12.h
View File

@ -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),