X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/8b4052ad6015aa9f54c9c824f28655f230d09d8d..5538c5782135666d73f7615a37ea9689afa07dcd:/keyindex.c
diff --git a/keyindex.c b/keyindex.c
index 2e3d2c6..d6d62e0 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -220,23 +220,43 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
keys->publickey->data[0]);
}
- keyid = (get_keyid(keys) & 0xFFFFFFFF),
- printf("pub %5d%c/%08X %04d/%02d/%02d ",
- length,
- (type == 1) ? 'R' : ((type == 16) ? 'g' :
- ((type == 17) ? 'D' : '?')),
- (uint32_t) keyid,
- created->tm_year + 1900,
- created->tm_mon + 1,
- created->tm_mday);
+ keyid = (get_keyid(keys) & 0xFFFFFFFF);
+
+ if (html) {
+ printf("pub %5d%c/%08X %04d/%02d/%02d ",
+ length,
+ (type == 1) ? 'R' : ((type == 16) ? 'g' :
+ ((type == 17) ? 'D' : '?')),
+ (uint32_t) keyid,
+ (uint32_t) keyid,
+ created->tm_year + 1900,
+ created->tm_mon + 1,
+ created->tm_mday);
+ } else {
+ printf("pub %5d%c/%08X %04d/%02d/%02d ",
+ length,
+ (type == 1) ? 'R' : ((type == 16) ? 'g' :
+ ((type == 17) ? 'D' : '?')),
+ (uint32_t) keyid,
+ created->tm_year + 1900,
+ created->tm_mon + 1,
+ created->tm_mday);
+ }
curuid = keys->uids;
if (curuid != NULL && curuid->packet->tag == 13) {
snprintf(buf, 1023, "%.*s",
(int) curuid->packet->length,
curuid->packet->data);
- printf("%s%s\n",
+ if (html) {
+ printf("",
+ (uint32_t) keyid);
+ }
+ printf("%s%s%s\n",
(html) ? txt2html(buf) : buf,
+ (html) ? "" : "",
(keys->revocations == NULL) ? "" :
" *** REVOKED ***");
if (fingerprint) {