mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* verify.c (strtimestamp_r, gpgsm_verify):
* sign.c (gpgsm_sign): * keylist.c (print_time, list_cert_std, list_cert_colon): * certdump.c (gpgsm_print_time, gpgsm_dump_time, gpgsm_dump_cert): * certchain.c (gpgsm_validate_chain): Changed to use ksba_isotime_t.
This commit is contained in:
parent
c8fb3836fb
commit
dd808fa15b
8 changed files with 79 additions and 84 deletions
23
sm/keylist.c
23
sm/keylist.c
|
@ -101,14 +101,12 @@ print_capabilities (KsbaCert cert, FILE *fp)
|
|||
|
||||
|
||||
static void
|
||||
print_time (time_t t, FILE *fp)
|
||||
print_time (gnupg_isotime_t t, FILE *fp)
|
||||
{
|
||||
if (!t)
|
||||
if (!t || !*t)
|
||||
;
|
||||
else if ( t == (time_t)(-1) )
|
||||
putc ('?', fp);
|
||||
else
|
||||
fprintf (fp, "%lu", (unsigned long)t);
|
||||
else
|
||||
fputs (t, fp);
|
||||
}
|
||||
|
||||
|
||||
|
@ -153,6 +151,7 @@ list_cert_colon (KsbaCert cert, FILE *fp, int have_secret)
|
|||
char *p;
|
||||
KsbaSexp sexp;
|
||||
char *fpr;
|
||||
ksba_isotime_t t;
|
||||
|
||||
fputs (have_secret? "crs:":"crt:", fp);
|
||||
trustletter = 0;
|
||||
|
@ -177,9 +176,11 @@ list_cert_colon (KsbaCert cert, FILE *fp, int have_secret)
|
|||
fpr+24);
|
||||
|
||||
/* we assume --fixed-list-mode for gpgsm */
|
||||
print_time ( ksba_cert_get_validity (cert, 0), fp);
|
||||
ksba_cert_get_validity (cert, 0, t);
|
||||
print_time (t, fp);
|
||||
putc (':', fp);
|
||||
print_time ( ksba_cert_get_validity (cert, 1), fp);
|
||||
ksba_cert_get_validity (cert, 1, t);
|
||||
print_time ( t, fp);
|
||||
putc (':', fp);
|
||||
/* field 8, serial number: */
|
||||
if ((sexp = ksba_cert_get_serial (cert)))
|
||||
|
@ -280,7 +281,7 @@ list_cert_std (KsbaCert cert, FILE *fp, int have_secret)
|
|||
KsbaError kerr;
|
||||
KsbaSexp sexp;
|
||||
char *dn;
|
||||
time_t t;
|
||||
ksba_isotime_t t;
|
||||
int idx;
|
||||
int is_ca, chainlen;
|
||||
unsigned int kusage;
|
||||
|
@ -318,11 +319,11 @@ list_cert_std (KsbaCert cert, FILE *fp, int have_secret)
|
|||
putc ('\n', fp);
|
||||
}
|
||||
|
||||
t = ksba_cert_get_validity (cert, 0);
|
||||
ksba_cert_get_validity (cert, 0, t);
|
||||
fputs (" validity: ", fp);
|
||||
gpgsm_print_time (fp, t);
|
||||
fputs (" through ", fp);
|
||||
t = ksba_cert_get_validity (cert, 1);
|
||||
ksba_cert_get_validity (cert, 1, t);
|
||||
gpgsm_print_time (fp, t);
|
||||
putc ('\n', fp);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue