dirmngr: Indicate that serial numbers are hexadecimal.

* dirmngr/misc.c (hexify_data): Add arg with_prefix.  Adjust all
callers.
* dirmngr/crlcache.c (cache_isvalid): Print "0x" in front of the S/N.
--

GnuPG-bug-id: 1147
Signed-off-by: 's avatarWerner Koch <wk@gnupg.org>
parent 77bceb29
......@@ -1345,12 +1345,13 @@ cache_isvalid (ctrl_t ctrl, const char *issuer_hash,
if (n != 16)
{
log_error (_("WARNING: invalid cache record length for S/N "));
log_printf ("0x");
log_printhex ("", sn, snlen);
}
else if (opt.verbose)
{
unsigned char record[16];
char *tmp = hexify_data (sn, snlen);
char *tmp = hexify_data (sn, snlen, 1);
if (cdb_read (cdb, record, n, cdb_datapos (cdb)))
log_error (_("problem reading cache record for S/N %s: %s\n"),
......@@ -1366,7 +1367,7 @@ cache_isvalid (ctrl_t ctrl, const char *issuer_hash,
{
if (opt.verbose)
{
char *serialno = hexify_data (sn, snlen);
char *serialno = hexify_data (sn, snlen, 1);
log_info (_("S/N %s is valid, it is not listed in the CRL\n"),
serialno );
xfree (serialno);
......@@ -2095,7 +2096,7 @@ crl_cache_insert (ctrl_t ctrl, const char *url, ksba_reader_t reader)
err = gpg_error (GPG_ERR_CHECKSUM);
goto leave;
}
checksum = hexify_data (md5buf, 16);
checksum = hexify_data (md5buf, 16, 0);
}
......
......@@ -59,17 +59,23 @@ hashify_data( const char* data, size_t len )
{
unsigned char buf[20];
gcry_md_hash_buffer (GCRY_MD_SHA1, buf, data, len);
return hexify_data( buf, 20 );
return hexify_data (buf, 20, 0);
}
char*
hexify_data( const unsigned char* data, size_t len )
hexify_data (const unsigned char* data, size_t len, int with_prefix)
{
int i;
char* result = xmalloc( sizeof( char ) * (2*len+1));
char *result = xmalloc (2*len + (with_prefix?2:0) + 1);
char *p;
if (with_prefix)
p = stpcpy (result, "0x");
else
p = result;
for( i = 0; i < 2*len; i+=2 )
sprintf( result+i, "%02X", *data++);
for (i = 0; i < 2*len; i+=2 )
snprintf (p+i, 3, "%02X", *data++);
return result;
}
......
......@@ -28,7 +28,7 @@ size_t unhexify (unsigned char *result, const char *string);
char* hashify_data( const char* data, size_t len );
/* Returns data as a hex string. */
char* hexify_data( const unsigned char* data, size_t len );
char* hexify_data (const unsigned char* data, size_t len, int with_prefix);
/* Returns the serial number as a hex string. */
char* serial_hex ( ksba_sexp_t serial );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment