#include "mbox-util.h"
-static void list_all (int, int);
-static void list_one (strlist_t names, int secret, int mark_secret);
+static void list_all (ctrl_t, int, int);
+static void list_one (ctrl_t ctrl,
+ strlist_t names, int secret, int mark_secret);
static void locate_one (ctrl_t ctrl, strlist_t names);
static void print_card_serialno (const char *serialno);
};
-static void list_keyblock (kbnode_t keyblock, int secret, int has_secret,
+static void list_keyblock (ctrl_t ctrl,
+ kbnode_t keyblock, int secret, int has_secret,
int fpr, struct keylist_context *listctx);
if (locate_mode)
locate_one (ctrl, list);
else if (!list)
- list_all (0, opt.with_secret);
+ list_all (ctrl, 0, opt.with_secret);
else
- list_one (list, 0, opt.with_secret);
+ list_one (ctrl, list, 0, opt.with_secret);
}
check_trustdb_stale ();
if (!list)
- list_all (1, 0);
+ list_all (ctrl, 1, 0);
else /* List by user id */
- list_one (list, 1, 0);
+ list_one (ctrl, list, 1, 0);
}
void
MARK_SECRET is true secret keys are indicated in a public key
listing. */
static void
-list_all (int secret, int mark_secret)
+list_all (ctrl_t ctrl, int secret, int mark_secret)
{
KEYDB_HANDLE hd;
KBNODE keyblock = NULL;
}
}
merge_keys_and_selfsig (keyblock);
- list_keyblock (keyblock, secret, any_secret, opt.fingerprint,
+ list_keyblock (ctrl, keyblock, secret, any_secret, opt.fingerprint,
&listctx);
}
release_kbnode (keyblock);
static void
-list_one (strlist_t names, int secret, int mark_secret)
+list_one (ctrl_t ctrl, strlist_t names, int secret, int mark_secret)
{
int rc = 0;
KBNODE keyblock = NULL;
if (rc)
{
log_error ("error reading key: %s\n", gpg_strerror (rc));
- get_pubkey_end (ctx);
+ getkey_end (ctx);
return;
}
es_putc ('-', es_stdout);
es_putc ('\n', es_stdout);
}
- list_keyblock (keyblock, secret, mark_secret, opt.fingerprint, &listctx);
+ list_keyblock (ctrl,
+ keyblock, secret, mark_secret, opt.fingerprint, &listctx);
release_kbnode (keyblock);
}
while (!getkey_next (ctx, NULL, &keyblock));
{
do
{
- list_keyblock (keyblock, 0, 0, opt.fingerprint, &listctx);
+ list_keyblock (ctrl, keyblock, 0, 0, opt.fingerprint, &listctx);
release_kbnode (keyblock);
}
- while (ctx && !get_pubkey_next (ctx, NULL, &keyblock));
- get_pubkey_end (ctx);
+ while (ctx && !getkey_next (ctx, NULL, &keyblock));
+ getkey_end (ctx);
ctx = NULL;
}
}
/* Print IPGP cert records instead of a standard key listing. */
static void
-list_keyblock_pka (kbnode_t keyblock)
+list_keyblock_pka (ctrl_t ctrl, kbnode_t keyblock)
{
kbnode_t kbctx;
kbnode_t node;
PKT_public_key *pk;
char pkstrbuf[PUBKEY_STRING_SIZE];
char *hexfpr;
+ char *hexkeyblock = NULL;
+ unsigned int hexkeyblocklen;
+ const char *s;
/* Get the keyid from the keyblock. */
node = find_kbnode (keyblock, PKT_PUBLIC_KEY);
pk = node->pkt->pkt.public_key;
- es_fprintf (es_stdout, ";; pub %s/%s %s\n;; ",
+ /* First print an overview of the key with all userids. */
+ es_fprintf (es_stdout, ";; pub %s/%s %s\n;;",
pubkey_string (pk, pkstrbuf, sizeof pkstrbuf),
keystr_from_pk (pk), datestr_from_pk (pk));
print_fingerprint (NULL, pk, 10);
+ for (kbctx = NULL; (node = walk_kbnode (keyblock, &kbctx, 0));)
+ {
+ if (node->pkt->pkttype == PKT_USER_ID)
+ {
+ PKT_user_id *uid = node->pkt->pkt.user_id;
+
+ if (pk && (uid->is_expired || uid->is_revoked)
+ && !(opt.list_options & LIST_SHOW_UNUSABLE_UIDS))
+ continue;
+
+ es_fputs (";; uid ", es_stdout);
+ print_utf8_buffer (es_stdout, uid->name, uid->len);
+ es_putc ('\n', es_stdout);
+ }
+ }
+
+
hexfpr = hexfingerprint (pk);
+ if (opt.print_dane_records)
+ {
+ kbnode_t dummy_keyblock;
+ void *data;
+ size_t datalen;
+ gpg_error_t err;
+
+ /* We do not have an export fucntion which allows to pass a
+ keyblock, thus we need to search the key again. */
+ err = export_pubkey_buffer (ctrl, hexfpr,
+ EXPORT_DANE_FORMAT,
+ &dummy_keyblock, &data, &datalen);
+ release_kbnode (dummy_keyblock);
+ if (!err)
+ {
+ hexkeyblocklen = datalen;
+ hexkeyblock = bin2hex (data, datalen, NULL);
+ if (!hexkeyblock)
+ err = gpg_error_from_syserror ();
+ xfree (data);
+ ascii_strlwr (hexkeyblock);
+ }
+ if (err)
+ log_error (_("skipped \"%s\": %s\n"), hexfpr, gpg_strerror (err));
+
+ }
for (kbctx = NULL; (node = walk_kbnode (keyblock, &kbctx, 0));)
{
&& !(opt.list_options & LIST_SHOW_UNUSABLE_UIDS))
continue;
- es_fputs (";; uid ", es_stdout);
- print_utf8_buffer (es_stdout, uid->name, uid->len);
- es_putc ('\n', es_stdout);
mbox = mailbox_from_userid (uid->name);
if (mbox && (p = strchr (mbox, '@')))
{
- char hashbuf[20];
+ char hashbuf[32];
char *hash;
unsigned int len;
*p++ = 0;
- es_fprintf (es_stdout, "$ORIGIN _pka.%s.\n", p);
- gcry_md_hash_buffer (GCRY_MD_SHA1, hashbuf, mbox, strlen (mbox));
- hash = zb32_encode (hashbuf, 8*20);
- if (hash)
+ if (opt.print_pka_records)
{
- len = strlen (hexfpr)/2;
- es_fprintf (es_stdout,
- "%s TYPE37 \\# %u 0006 0000 00 %02X %s\n",
- hash, 6 + len, len, hexfpr);
- xfree (hash);
+ es_fprintf (es_stdout, "$ORIGIN _pka.%s.\n; %s\n; ",
+ p, hexfpr);
+ print_utf8_buffer (es_stdout, uid->name, uid->len);
+ es_putc ('\n', es_stdout);
+ gcry_md_hash_buffer (GCRY_MD_SHA1, hashbuf,
+ mbox, strlen (mbox));
+ hash = zb32_encode (hashbuf, 8*20);
+ if (hash)
+ {
+ len = strlen (hexfpr)/2;
+ es_fprintf (es_stdout,
+ "%s TYPE37 \\# %u 0006 0000 00 %02X %s\n",
+ hash, 6 + len, len, hexfpr);
+ xfree (hash);
+ }
+ }
+ if (opt.print_dane_records && hexkeyblock)
+ {
+ es_fprintf (es_stdout, "$ORIGIN _openpgpkey.%s.\n; %s\n; ",
+ p, hexfpr);
+ print_utf8_buffer (es_stdout, uid->name, uid->len);
+ es_putc ('\n', es_stdout);
+ gcry_md_hash_buffer (GCRY_MD_SHA256, hashbuf,
+ mbox, strlen (mbox));
+ hash = bin2hex (hashbuf, 28, NULL);
+ if (hash)
+ {
+ ascii_strlwr (hash);
+ es_fprintf (es_stdout, "%s TYPE61 \\# %u (\n",
+ hash, hexkeyblocklen);
+ xfree (hash);
+ s = hexkeyblock;
+ for (;;)
+ {
+ es_fprintf (es_stdout, "\t%.64s\n", s);
+ if (strlen (s) < 64)
+ break;
+ s += 64;
+ }
+ es_fputs ("\t)\n", es_stdout);
+ }
}
}
xfree (mbox);
}
es_putc ('\n', es_stdout);
+ xfree (hexkeyblock);
xfree (hexfpr);
}
}
static void
-list_keyblock (KBNODE keyblock, int secret, int has_secret, int fpr,
+list_keyblock (ctrl_t ctrl,
+ KBNODE keyblock, int secret, int has_secret, int fpr,
struct keylist_context *listctx)
{
reorder_keyblock (keyblock);
- if (opt.print_pka_records)
- list_keyblock_pka (keyblock);
+ if (opt.print_pka_records || opt.print_dane_records)
+ list_keyblock_pka (ctrl, keyblock);
else if (opt.with_colons)
list_keyblock_colon (keyblock, secret, has_secret, fpr);
else
/* Public function used by keygen to list a keyblock. */
void
-list_keyblock_direct (kbnode_t keyblock, int secret, int has_secret, int fpr)
+list_keyblock_direct (ctrl_t ctrl,
+ kbnode_t keyblock, int secret, int has_secret, int fpr)
{
struct keylist_context listctx;
memset (&listctx, 0, sizeof (listctx));
- list_keyblock (keyblock, secret, has_secret, fpr, &listctx);
+ list_keyblock (ctrl, keyblock, secret, has_secret, fpr, &listctx);
keylist_context_release (&listctx);
}
projects / platform / upstream / gpg2.git / blobdiff