diff options
| author | Werner Koch <[email protected]> | 2012-12-28 12:45:41 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2012-12-28 12:45:41 +0000 |
| commit | f7495f1004071a0ceac394007bb37f88d7a3467f (patch) | |
| tree | acd823d554763ec714a3b024f1ce11ef2c0c587c /kbx/kbxutil.c | |
| parent | gpg: First patches to support a keybox storage backend. (diff) | |
| download | gnupg-f7495f1004071a0ceac394007bb37f88d7a3467f.tar.gz gnupg-f7495f1004071a0ceac394007bb37f88d7a3467f.zip | |
kbxutil: Print algo number and fold similar lines.
* 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.
Diffstat (limited to 'kbx/kbxutil.c')
| -rw-r--r-- | kbx/kbxutil.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index 62e3dbe89..fee55705b 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -332,7 +332,8 @@ dump_fpr (const unsigned char *buffer, size_t len) static void 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[6], info->primary.keyid[7] ); 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; do { - printf ("sub %02X%02X%02X%02X", + printf ("sub %2d %02X%02X%02X%02X", + k->algo, k->keyid[4], k->keyid[5], k->keyid[6], k->keyid[7] ); dump_fpr (k->fpr, k->fprlen); |