mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +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
49
sm/verify.c
49
sm/verify.c
|
@ -84,49 +84,6 @@ store_cert (KsbaCert cert)
|
|||
|
||||
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
print_time (time_t t)
|
||||
{
|
||||
|
||||
if (!t)
|
||||
log_printf ("none");
|
||||
else if ( t == (time_t)(-1) )
|
||||
log_printf ("error");
|
||||
else
|
||||
{
|
||||
struct tm *tp;
|
||||
|
||||
tp = gmtime (&t);
|
||||
log_printf ("%04d-%02d-%02d %02d:%02d:%02d",
|
||||
1900+tp->tm_year, tp->tm_mon+1, tp->tm_mday,
|
||||
tp->tm_hour, tp->tm_min, tp->tm_sec);
|
||||
assert (!tp->tm_isdst);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
static void
|
||||
|
@ -307,7 +264,7 @@ gpgsm_verify (CTRL ctrl, int in_fd, int data_fd)
|
|||
break;
|
||||
log_debug ("signer %d - issuer: `%s'\n", signer, issuer? issuer:"[NONE]");
|
||||
log_debug ("signer %d - serial: ", signer);
|
||||
print_integer_sexp (serial);
|
||||
gpgsm_dump_serial (serial);
|
||||
log_printf ("\n");
|
||||
|
||||
err = ksba_cms_get_signing_time (cms, signer, &sigtime);
|
||||
|
@ -317,7 +274,7 @@ gpgsm_verify (CTRL ctrl, int in_fd, int data_fd)
|
|||
sigtime = (time_t)-1;
|
||||
}
|
||||
log_debug ("signer %d - sigtime: ", signer);
|
||||
print_time (sigtime);
|
||||
gpgsm_dump_time (sigtime);
|
||||
log_printf ("\n");
|
||||
|
||||
|
||||
|
@ -341,7 +298,7 @@ gpgsm_verify (CTRL ctrl, int in_fd, int data_fd)
|
|||
log_error ("no signature value available\n");
|
||||
goto next_signer;
|
||||
}
|
||||
log_debug ("signer %d - signature: `%s'\n", signer, sigval);
|
||||
log_debug ("signer %d - signature available", signer);
|
||||
|
||||
/* Find the certificate of the signer */
|
||||
keydb_search_reset (kh);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue