X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/6105d01bd446c4a27638e90ff8fd539e093b3ea2..edae27083dd4a70b1b7b8c968949ffb7dc11c508:/keyindex.c?ds=sidebyside

diff --git a/keyindex.c b/keyindex.c
index 180c312..a4cc90b 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -3,12 +3,9 @@
  *
  * Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 Project Purple
- *
- * $Id: keyindex.c,v 1.10 2003/06/04 22:11:40 noodles Exp $
+ * Copyright 2002-2005 Project Purple
  */
 
-#include <assert.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -24,31 +21,43 @@
 #include "keyindex.h"
 #include "keystructs.h"
 #include "log.h"
+#include "onak-conf.h"
 
 int list_sigs(struct openpgp_packet_list *sigs, bool html)
 {
 	char *uid = NULL;
 	uint64_t sigid = 0;
+	char *sig = NULL;
 
 	while (sigs != NULL) {
 		sigid = sig_keyid(sigs->packet);
-		uid = keyid2uid(sigid);
+		uid = config.dbbackend->keyid2uid(sigid);
+		if (sigs->packet->data[0] == 4 &&
+				sigs->packet->data[1] == 0x30) {
+			/* It's a Type 4 sig revocation */
+			sig = "rev";
+		} else {
+			sig = "sig";
+		}
 		if (html && uid != NULL) {
-			printf("sig         <a href=\"lookup?op=get&"
-				"search=%08llX\">%08llX</a>             "
-				"<a href=\"lookup?op=vindex&search=0x%08llX\">"
+			printf("%s         <a href=\"lookup?op=get&"
+				"search=%016llX\">%08llX</a>             "
+				"<a href=\"lookup?op=vindex&search=0x%016llX\">"
 				"%s</a>\n",
+				sig,
+				sigid,
 				sigid & 0xFFFFFFFF,
-				sigid & 0xFFFFFFFF,
-				sigid & 0xFFFFFFFF,
+				sigid,
 				txt2html(uid));
 		} else if (html && uid == NULL) {
-			printf("sig         %08llX             "
+			printf("%s         %08llX             "
 				"[User id not found]\n",
+				sig,
 				sigid & 0xFFFFFFFF);
 		} else {
-			printf("sig         %08llX"
+			printf("%s         %08llX"
 				"             %s\n",
+				sig,
 				sigid & 0xFFFFFFFF,
 				(uid != NULL) ? uid :
 				"[User id not found]");
@@ -63,20 +72,29 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
 	return 0;
 }
 
-int list_uids(struct openpgp_signedpacket_list *uids, bool verbose, bool html)
+int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids,
+		bool verbose, bool html)
 {
 	char buf[1024];
+	int  imgindx = 0;
 
 	while (uids != NULL) {
 		if (uids->packet->tag == 13) {
 			snprintf(buf, 1023, "%.*s",
 				(int) uids->packet->length,
 				uids->packet->data);
-			printf("uid                             %s\n",
+			printf("                                %s\n",
 				(html) ? txt2html(buf) : buf);
 		} else if (uids->packet->tag == 17) {
-			printf("uid                             "
-				"[photo id]\n");
+			printf("                                ");
+			if (html) {
+				printf("<img src=\"lookup?op=photo&search=0x%llX&idx=%d\" alt=\"[photo id]\">\n",
+						keyid,
+						imgindx);
+				imgindx++;
+			} else {
+				printf("[photo id]\n");
+			}
 		}
 		if (verbose) {
 			list_sigs(uids->sigs, html);
@@ -184,6 +202,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 	int					 type = 0;
 	int					 length = 0;
 	char					 buf[1024];
+	uint64_t				 keyid;
 
 	if (html) {
 		puts("<pre>");
@@ -213,21 +232,44 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 				keys->publickey->data[0]);
 		}
 		
-		printf("pub  %5d%c/%08X %04d/%02d/%02d ",
-			length,
-			(type == 1) ? 'R' : ((type == 16) ? 'g' : 
-				((type == 17) ? 'D' : '?')),
-			(uint32_t) (get_keyid(keys) & 0xFFFFFFFF),
-			created->tm_year + 1900,
-			created->tm_mon + 1,
-			created->tm_mday);
+		keyid = get_keyid(keys);
+
+		if (html) {
+			printf("pub  %5d%c/<a href=\"lookup?op=get&"
+				"search=%016llX\">%08llX</a> %04d/%02d/%02d ",
+				length,
+				(type == 1) ? 'R' : ((type == 16) ? 'g' : 
+					((type == 17) ? 'D' : '?')),
+				keyid,
+				keyid & 0xFFFFFFFF,
+				created->tm_year + 1900,
+				created->tm_mon + 1,
+				created->tm_mday);
+		} else {
+			printf("pub  %5d%c/%08llX %04d/%02d/%02d ",
+				length,
+				(type == 1) ? 'R' : ((type == 16) ? 'g' : 
+					((type == 17) ? 'D' : '?')),
+				keyid & 0xFFFFFFFF,
+				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\n", (html) ? txt2html(buf) : buf);
+			if (html) {
+				printf("<a href=\"lookup?op=vindex&"
+					"search=0x%016llX\">",
+					keyid);
+			}
+			printf("%s%s%s\n", 
+				(html) ? txt2html(buf) : buf,
+				(html) ? "</a>" : "",
+				(keys->revoked) ? " *** REVOKED ***" : "");
 			if (fingerprint) {
 				display_fingerprint(keys);
 			}
@@ -236,14 +278,17 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 			}
 			curuid = curuid->next;
 		} else {
-			putchar('\n');
+			printf("%s\n", 
+				(keys->revoked) ? "*** REVOKED ***": "");
 			if (fingerprint) {
 				display_fingerprint(keys);
 			}
 		}
 
-		list_uids(curuid, verbose, html);
-		list_subkeys(keys->subkeys, verbose, html);
+		list_uids(keyid, curuid, verbose, html);
+		if (verbose) {
+			list_subkeys(keys->subkeys, verbose, html);
+		}
 
 		keys = keys->next;
 	}
@@ -272,8 +317,6 @@ int mrkey_index(struct openpgp_publickey *keys)
 	size_t					 fplength = 0;
 	unsigned char				 fp[20];
 
-
-
 	while (keys != NULL) {
 		created_time = (keys->publickey->data[1] << 24) +
 					(keys->publickey->data[2] << 16) +
@@ -291,7 +334,7 @@ int mrkey_index(struct openpgp_publickey *keys)
 					keys->publickey->data[9];
 			break;
 		case 4:
-			get_fingerprint(keys->publickey, fp, &fplength);
+			(void) get_fingerprint(keys->publickey, fp, &fplength);
 
 			for (i = 0; i < fplength; i++) {
 				printf("%02X", fp[i]);
@@ -306,10 +349,11 @@ int mrkey_index(struct openpgp_publickey *keys)
 				keys->publickey->data[0]);
 		}
 
-		printf(":%d:%d:%d::\n",
+		printf(":%d:%d:%ld::%s\n",
 			type,
 			length,
-			created_time);
+			created_time,
+			(keys->revoked) ? "r" : "");
 	
 		for (curuid = keys->uids; curuid != NULL;
 			 curuid = curuid->next) {