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

kbxutil: Print algo number and fold similar lines.

Browse Source 
* kbx/keybox-defs.h (_keybox_openpgp_key_info): Add field ALGO.
* kbx/keybox-openpgp.c (parse_key): Store algo.
* kbx/kbxutil.c (dump_openpgp_key): Print algo number.
* kbx/keybox-dump.c (_keybox_dump_blob): Print identical Sig-Expire
value lines with a range of indices.
This commit is contained in:
Werner Koch 2012-12-28 13:45:41 +01:00
parent 91e61d5253
commit f7495f1004
4 changed files with 49 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kbx/kbxutil.c
View File

@ -332,7 +332,8 @@ dump_fpr (const unsigned char *buffer, size_t len)
static void static void
dump_openpgp_key (keybox_openpgp_info_t info, const unsigned char *image) dump_openpgp_key (keybox_openpgp_info_t info, const unsigned char *image)
{ {
printf ("pub %02X%02X%02X%02X", printf ("pub %2d %02X%02X%02X%02X",
info->primary.algo,
info->primary.keyid[4], info->primary.keyid[5], info->primary.keyid[4], info->primary.keyid[5],
info->primary.keyid[6], info->primary.keyid[7] ); info->primary.keyid[6], info->primary.keyid[7] );
dump_fpr (info->primary.fpr, info->primary.fprlen); dump_fpr (info->primary.fpr, info->primary.fprlen);
@ -344,7 +345,8 @@ dump_openpgp_key (keybox_openpgp_info_t info, const unsigned char *image)
k = &info->subkeys; k = &info->subkeys;
do do
{ {
printf ("sub %02X%02X%02X%02X", printf ("sub %2d %02X%02X%02X%02X",
k->algo,
k->keyid[4], k->keyid[5], k->keyid[4], k->keyid[5],
k->keyid[6], k->keyid[7] ); k->keyid[6], k->keyid[7] );
dump_fpr (k->fpr, k->fprlen); dump_fpr (k->fpr, k->fprlen);

1
kbx/keybox-defs.h
View File

@ -111,6 +111,7 @@ struct keybox_handle {
struct _keybox_openpgp_key_info struct _keybox_openpgp_key_info
{ {
struct _keybox_openpgp_key_info *next; struct _keybox_openpgp_key_info *next;
int algo;
unsigned char keyid[8]; unsigned char keyid[8];
int fprlen; /* Either 16 or 20 */ int fprlen; /* Either 16 or 20 */
unsigned char fpr[20]; unsigned char fpr[20];

25
kbx/keybox-dump.c
View File

@ -291,11 +291,29 @@ _keybox_dump_blob (KEYBOXBLOB blob, FILE *fp)
fprintf (fp, "Sig-Info-Length: %lu\n", siginfolen ); fprintf (fp, "Sig-Info-Length: %lu\n", siginfolen );
/* fixme: check bounds */ /* fixme: check bounds */
p += 4; p += 4;
{
int in_range = 0;
ulong first = 0;
for (n=0; n < nsigs; n++, p += siginfolen) for (n=0; n < nsigs; n++, p += siginfolen)
{ {
ulong sflags; ulong sflags;
sflags = get32 (p); sflags = get32 (p);
if (!in_range && !sflags)
{
in_range = 1;
first = n;
continue;
}
if (in_range && !sflags)
continue;
if (in_range)
{
fprintf (fp, "Sig-Expire[%lu-%lu]: [not checked]\n", first, n-1);
in_range = 0;
}
fprintf (fp, "Sig-Expire[%lu]: ", n ); fprintf (fp, "Sig-Expire[%lu]: ", n );
if (!sflags) if (!sflags)
fputs ("[not checked]", fp); fputs ("[not checked]", fp);
@ -311,7 +329,12 @@ _keybox_dump_blob (KEYBOXBLOB blob, FILE *fp)
fputs ("a time"/*strtimestamp( sflags )*/, fp ); fputs ("a time"/*strtimestamp( sflags )*/, fp );
putc ('\n', fp ); putc ('\n', fp );
} }
if (in_range)
{
fprintf (fp, "Sig-Expire[%lu-%lu]: [not checked]\n", first, n-1);
in_range = 0;
}
}
fprintf (fp, "Ownertrust: %d\n", p[0] ); fprintf (fp, "Ownertrust: %d\n", p[0] );
fprintf (fp, "All-Validity: %d\n", p[1] ); fprintf (fp, "All-Validity: %d\n", p[1] );
p += 4; p += 4;

2
kbx/keybox-openpgp.c
View File

@ -223,6 +223,8 @@ parse_key (const unsigned char *data, size_t datalen,
return gpg_error (GPG_ERR_UNKNOWN_ALGORITHM); return gpg_error (GPG_ERR_UNKNOWN_ALGORITHM);
} }
ki->algo = algorithm;
for (i=0; i < npkey; i++ ) for (i=0; i < npkey; i++ )
{ {
unsigned int nbits, nbytes; unsigned int nbits, nbytes;