mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* base64.c (base64_reader_cb): Try to detect an S/MIME body part.
* certdump.c (print_sexp): Renamed to gpgsm_dump_serial, made global. (print_time): Renamed to gpgsm_dump_time, made global. (gpgsm_dump_serial): Take a real S-Expression as argument and print the first item. * keylist.c (list_cert_colon): Ditto. * keydb.c (keydb_search_issuer_sn): Ditto. * decrypt.c (print_integer_sexp): Removed and made callers use gpgsm_dump_serial. * verify.c (print_time): Removed, made callers use gpgsm_dump_time.
This commit is contained in:
parent
3341f8a55d
commit
5f116e9540
8 changed files with 101 additions and 83 deletions
23
sm/decrypt.c
23
sm/decrypt.c
|
@ -50,27 +50,6 @@ struct decrypt_filter_parm_s {
|
|||
};
|
||||
|
||||
|
||||
static void
|
||||
print_integer_sexp (unsigned char *p)
|
||||
{
|
||||
unsigned long len;
|
||||
|
||||
if (!p)
|
||||
log_printf ("none");
|
||||
else
|
||||
{
|
||||
len = gcry_sexp_canon_len (p, 0, NULL, NULL);
|
||||
if (!len)
|
||||
log_printf ("invalid encoding");
|
||||
else
|
||||
{
|
||||
for (; len && *p != ':'; len--, p++)
|
||||
;
|
||||
for (p++; len; len--, p++)
|
||||
log_printf ("%02X", *p);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* decrypt the session key and fill in the parm structure. The
|
||||
algo and the IV is expected to be already in PARM. */
|
||||
|
@ -370,7 +349,7 @@ gpgsm_decrypt (CTRL ctrl, int in_fd, FILE *out_fp)
|
|||
log_debug ("recp %d - issuer: `%s'\n",
|
||||
recp, issuer? issuer:"[NONE]");
|
||||
log_debug ("recp %d - serial: ", recp);
|
||||
print_integer_sexp (serial);
|
||||
gpgsm_dump_serial (serial);
|
||||
log_printf ("\n");
|
||||
|
||||
keydb_search_reset (kh);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue