X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/d27407c824b63bd0b9c78479453c3ce4799afac8..bccee9f66efda51a5e900ea57b5a130f2e99faf1:/keyindex.c
diff --git a/keyindex.c b/keyindex.c
index fead60b..0cc9edd 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -87,9 +87,9 @@ int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids,
} else if (uids->packet->tag == 17) {
printf(" ");
if (html) {
- printf(""
- "\n",
+ printf("\n",
keyid,
imgindx);
imgindx++;
@@ -201,6 +201,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
struct tm *created = NULL;
time_t created_time = 0;
int type = 0;
+ char typech;
int length = 0;
char buf[1024];
uint64_t keyid;
@@ -235,13 +236,30 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
keyid = get_keyid(keys);
+ switch (type) {
+ case 1:
+ typech = 'R';
+ break;
+ case 16:
+ typech = 'g';
+ break;
+ case 17:
+ typech = 'D';
+ break;
+ case 20:
+ typech = 'G';
+ break;
+ default:
+ typech = '?';
+ break;
+ }
+
if (html) {
printf("pub %5d%c/%08" PRIX64
" %04d/%02d/%02d ",
length,
- (type == 1) ? 'R' : ((type == 16) ? 'g' :
- ((type == 17) ? 'D' : '?')),
+ typech,
keyid,
keyid & 0xFFFFFFFF,
created->tm_year + 1900,
@@ -250,8 +268,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
} else {
printf("pub %5d%c/%08" PRIX64 " %04d/%02d/%02d ",
length,
- (type == 1) ? 'R' : ((type == 16) ? 'g' :
- ((type == 17) ? 'D' : '?')),
+ typech,
keyid & 0xFFFFFFFF,
created->tm_year + 1900,
created->tm_mon + 1,