security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

sm: Print the serial number of a cert also in decimal.

Browse Source 
* sm/certdump.c: Include membuf.h.
(gpgsm_print_serial_decimal): New.
* sm/keylist.c (list_cert_raw): Print s/n also in decimal
(list_cert_std): Ditto.
--

Many CA's print the serial number in decimal on their cards.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2020-06-26 12:59:02 +02:00
parent 2429e85598
commit 208a901973
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 89 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
sm/certdump.c
View File

@ -38,7 +38,7 @@
#include "keydb.h"
#include "../common/i18n.h"
#include "../common/membuf.h"
struct dn_array_s {
char *key;
@ -95,6 +95,85 @@ gpgsm_print_serial (estream_t fp, ksba_const_sexp_t sn)
}
/* Print the first element of an S-Expression in decimal notation
* assuming it is a non-negative integer. */
void
gpgsm_print_serial_decimal (estream_t fp, ksba_const_sexp_t sn)
{
const char *p = (const char *)sn;
unsigned long n, i;
char *endp;
gcry_mpi_t a, r, ten;
#if GCRYPT_VERSION_NUMBER >= 0x010900 /* >= 1.9.0 */
unsigned int dd;
#else
unsigned char numbuf[10];
#endif
if (!p)
es_fputs (_("none"), fp);
else if (*p != '(')
es_fputs ("[Internal error - not an S-expression]", fp);
else
{
p++;
n = strtoul (p, &endp, 10);
p = endp;
if (*p++ != ':')
es_fputs ("[Internal Error - invalid S-expression]", fp);
else if (gcry_mpi_scan (&a, GCRYMPI_FMT_USG, p, n, NULL))
es_fputs ("[Internal Error - can't convert to decimal]", fp);
else
{
membuf_t mb = MEMBUF_ZERO;
char *buf;
int c;
ten = gcry_mpi_set_ui (NULL, 10);
r = gcry_mpi_new (0);
do
{
gcry_mpi_div (a, r, a, ten, 0);
#if GCRYPT_VERSION_NUMBER >= 0x010900 /* >= 1.9.0 */
gcry_mpi_get_ui (&dd, r);
put_membuf_printf (&mb, "%u", dd);
#else
*numbuf = 0; /* Need to clear because USB format prints
* an empty string for a value of 0. */
gcry_mpi_print (GCRYMPI_FMT_USG, numbuf, 10, NULL, r);
put_membuf_printf (&mb, "%u", (unsigned int)*numbuf);
#endif
}
while (gcry_mpi_cmp_ui (a, 0));
/* Make sure we have at least an empty string, get it,
* reverse it, and print it. */
put_membuf (&mb, "", 1);
buf = get_membuf (&mb, NULL);
if (!buf)
es_fputs ("[Internal Error - out of core]", fp);
else
{
n = strlen (buf);
for (i=0; i < n/2; i++)
{
c = buf[i];
buf[i] = buf[n-1-i];
buf[n-1-i] = c;
}
es_fputs (buf, fp);
xfree (buf);
}
gcry_mpi_release (r);
gcry_mpi_release (ten);
gcry_mpi_release (a);
}
}
}
/* Dump the serial number or any other simple S-expression. */
void
gpgsm_dump_serial (ksba_const_sexp_t sn)

1
sm/gpgsm.h
View File

@ -299,6 +299,7 @@ char *gpgsm_get_certid (ksba_cert_t cert);
/*-- certdump.c --*/
const void *gpgsm_get_serial (ksba_const_sexp_t sn, size_t *r_length);
void gpgsm_print_serial (estream_t fp, ksba_const_sexp_t p);
void gpgsm_print_serial_decimal (estream_t fp, ksba_const_sexp_t sn);
void gpgsm_print_time (estream_t fp, ksba_isotime_t t);
void gpgsm_print_name2 (FILE *fp, const char *string, int translate);
void gpgsm_print_name (FILE *fp, const char *string);

10
sm/keylist.c
View File

@ -780,8 +780,11 @@ list_cert_raw (ctrl_t ctrl, KEYDB_HANDLE hd,
sexp = ksba_cert_get_serial (cert);
es_fputs (" S/N: ", fp);
gpgsm_print_serial (fp, sexp);
ksba_free (sexp);
es_putc ('\n', fp);
es_fputs (" (dec): ", fp);
gpgsm_print_serial_decimal (fp, sexp);
es_putc ('\n', fp);
ksba_free (sexp);
dn = ksba_cert_get_issuer (cert, 0);
es_fputs (" Issuer: ", fp);
@ -1159,8 +1162,11 @@ list_cert_std (ctrl_t ctrl, ksba_cert_t cert, estream_t fp, int have_secret,
sexp = ksba_cert_get_serial (cert);
es_fputs (" S/N: ", fp);
gpgsm_print_serial (fp, sexp);
ksba_free (sexp);
es_putc ('\n', fp);
es_fputs (" (dec): ", fp);
gpgsm_print_serial_decimal (fp, sexp);
es_putc ('\n', fp);
ksba_free (sexp);
dn = ksba_cert_get_issuer (cert, 0);
es_fputs (" Issuer: ", fp);