X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keyindex.c;h=e4649ba041fd0ed2f914a06189224ac143456264;hb=1921fa44cfae203ae40e853ee9ecedb206fa9413;hp=d6d62e0e39ee31a25ab4d24718b7ecbd1f6d2215;hpb=7969830aa1b588dce09752db3ac5a3d780397d48;p=onak.git

diff --git a/keyindex.c b/keyindex.c
index d6d62e0..e4649ba 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -3,7 +3,7 @@
  *
  * Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 Project Purple
+ * Copyright 2002-2005 Project Purple
  */
 
 #include <inttypes.h>
@@ -21,31 +21,44 @@
 #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\">"
-				"%s</a>\n",
-				sigid & 0xFFFFFFFF,
-				sigid & 0xFFFFFFFF,
+			printf("%s         <a href=\"lookup?op=get&"
+				"search=%016" PRIx64 "\">%08" PRIx64
+				"</a>             "
+				"<a href=\"lookup?op=vindex&search=0x%016"
+				PRIx64 "\">%s</a>\n",
+				sig,
+				sigid,
 				sigid & 0xFFFFFFFF,
+				sigid,
 				txt2html(uid));
 		} else if (html && uid == NULL) {
-			printf("sig         %08llX             "
+			printf("%s         %08" PRIx64 "             "
 				"[User id not found]\n",
+				sig,
 				sigid & 0xFFFFFFFF);
 		} else {
-			printf("sig         %08llX"
+			printf("%s         %08" PRIx64
 				"             %s\n",
+				sig,
 				sigid & 0xFFFFFFFF,
 				(uid != NULL) ? uid :
 				"[User id not found]");
@@ -76,9 +89,11 @@ int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids,
 		} else if (uids->packet->tag == 17) {
 			printf("                                ");
 			if (html) {
-				printf("<img src=\"lookup?op=photo&search=0x%llX&idx=%d\" alt=\"[photo id]\">\n",
-						keyid,
-						imgindx);
+				printf("<img src=\"lookup?op=photo&search=0x%"
+					PRIx64 "&idx=%d\" alt=\"[photo id]\">"
+					"\n",
+					keyid,
+					imgindx);
 				imgindx++;
 			} else {
 				printf("[photo id]\n");
@@ -220,25 +235,26 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 				keys->publickey->data[0]);
 		}
 		
-		keyid = (get_keyid(keys) & 0xFFFFFFFF);
+		keyid = get_keyid(keys);
 
 		if (html) {
 			printf("pub  %5d%c/<a href=\"lookup?op=get&"
-				"search=%08X\">%08X</a> %04d/%02d/%02d ",
+				"search=%016" PRIx64 "\">%08" PRIx64
+				"</a> %04d/%02d/%02d ",
 				length,
 				(type == 1) ? 'R' : ((type == 16) ? 'g' : 
 					((type == 17) ? 'D' : '?')),
-				(uint32_t) keyid,
-				(uint32_t) keyid,
+				keyid,
+				keyid & 0xFFFFFFFF,
 				created->tm_year + 1900,
 				created->tm_mon + 1,
 				created->tm_mday);
 		} else {
-			printf("pub  %5d%c/%08X %04d/%02d/%02d ",
+			printf("pub  %5d%c/%08" PRIx64 " %04d/%02d/%02d ",
 				length,
 				(type == 1) ? 'R' : ((type == 16) ? 'g' : 
 					((type == 17) ? 'D' : '?')),
-				(uint32_t) keyid,
+				keyid & 0xFFFFFFFF,
 				created->tm_year + 1900,
 				created->tm_mon + 1,
 				created->tm_mday);
@@ -251,14 +267,13 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 				curuid->packet->data);
 			if (html) {
 				printf("<a href=\"lookup?op=vindex&"
-					"search=0x%08X\">",
-					(uint32_t) keyid);
+					"search=0x%016" PRIx64 "\">",
+					keyid);
 			}
 			printf("%s%s%s\n", 
 				(html) ? txt2html(buf) : buf,
 				(html) ? "</a>" : "",
-				(keys->revocations == NULL) ? "" :
-					" *** REVOKED ***");
+				(keys->revoked) ? " *** REVOKED ***" : "");
 			if (fingerprint) {
 				display_fingerprint(keys);
 			}
@@ -268,8 +283,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 			curuid = curuid->next;
 		} else {
 			printf("%s\n", 
-				(keys->revocations == NULL) ? "" :
-					"*** REVOKED ***");
+				(keys->revoked) ? "*** REVOKED ***": "");
 			if (fingerprint) {
 				display_fingerprint(keys);
 			}
@@ -318,7 +332,7 @@ int mrkey_index(struct openpgp_publickey *keys)
 		switch (keys->publickey->data[0]) {
 		case 2:
 		case 3:
-			printf("%016llX", get_keyid(keys));
+			printf("%016" PRIx64, get_keyid(keys));
 			type = keys->publickey->data[7];
 			length = (keys->publickey->data[8] << 8) +
 					keys->publickey->data[9];
@@ -343,7 +357,7 @@ int mrkey_index(struct openpgp_publickey *keys)
 			type,
 			length,
 			created_time,
-			(keys->revocations == NULL) ? "" : "r");
+			(keys->revoked) ? "r" : "");
 	
 		for (curuid = keys->uids; curuid != NULL;
 			 curuid = curuid->next) {