X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keyindex.c;h=6aab5d3c73da891faeebe6d3262d3420a464fead;hb=0211c730256c9bbaf10a569c88f7df0ef882311e;hp=c708aa48642aada710f8589de1ae40883958c865;hpb=e21d57328129d20ebef11143909ebc58bc0affce;p=onak.git

diff --git a/keyindex.c b/keyindex.c
index c708aa4..6aab5d3 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -1,9 +1,7 @@
 /*
  * keyindex.c - Routines to list an OpenPGP key.
  *
- * Jonathan McDowell <noodles@earth.li>
- *
- * Copyright 2002-2005 Project Purple
+ * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>
  */
 
 #include <inttypes.h>
@@ -22,6 +20,7 @@
 #include "keystructs.h"
 #include "log.h"
 #include "onak-conf.h"
+#include "openpgp.h"
 
 int list_sigs(struct openpgp_packet_list *sigs, bool html)
 {
@@ -80,18 +79,18 @@ int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids,
 	int  imgindx = 0;
 
 	while (uids != NULL) {
-		if (uids->packet->tag == 13) {
+		if (uids->packet->tag == OPENPGP_PACKET_UID) {
 			snprintf(buf, 1023, "%.*s",
 				(int) uids->packet->length,
 				uids->packet->data);
 			printf("                                %s\n",
 				(html) ? txt2html(buf) : buf);
-		} else if (uids->packet->tag == 17) {
+		} else if (uids->packet->tag == OPENPGP_PACKET_UAT) {
 			printf("                                ");
 			if (html) {
-				printf("<img src=\"lookup?op=photo&search=0x%"
-					PRIX64 "&idx=%d\" alt=\"[photo id]\">"
-					"\n",
+				printf("<img src=\"lookup?op=photo&search="
+					"0x%016" PRIX64 "&idx=%d\" alt=\""
+					"[photo id]\">\n",
 					keyid,
 					imgindx);
 				imgindx++;
@@ -117,7 +116,7 @@ int list_subkeys(struct openpgp_signedpacket_list *subkeys, bool verbose,
 	int	 	length = 0;
 
 	while (subkeys != NULL) {
-		if (subkeys->packet->tag == 14) {
+		if (subkeys->packet->tag == OPENPGP_PACKET_PUBLICSUBKEY) {
 
 			created_time = (subkeys->packet->data[1] << 24) +
 					(subkeys->packet->data[2] << 16) +
@@ -145,8 +144,9 @@ int list_subkeys(struct openpgp_signedpacket_list *subkeys, bool verbose,
 		
 			printf("sub  %5d%c/%08X %04d/%02d/%02d\n",
 				length,
-				(type == 1) ? 'R' : ((type == 16) ? 'g' : 
-					((type == 17) ? 'D' : '?')),
+				(type == OPENPGP_PKALGO_RSA) ? 'R' :
+				((type == OPENPGP_PKALGO_ELGAMAL) ? 'g' :
+				((type == OPENPGP_PKALGO_DSA) ? 'D' : '?')),
 				(uint32_t) (get_packetid(subkeys->packet) &
 					    0xFFFFFFFF),
 				created->tm_year + 1900,
@@ -186,6 +186,31 @@ void display_fingerprint(struct openpgp_publickey *key)
 	return;
 }
 
+void display_skshash(struct openpgp_publickey *key, bool html)
+{
+	int		i = 0;
+	struct skshash	hash;
+
+	get_skshash(key, &hash);
+	printf("      Key hash = ");
+	if (html) {
+		printf("<a href=\"lookup?op=hget&search=");
+		for (i = 0; i < sizeof(hash.hash); i++) {
+			printf("%02X", hash.hash[i]);
+		}
+		printf("\">");
+	}
+	for (i = 0; i < sizeof(hash.hash); i++) {
+		printf("%02X", hash.hash[i]);
+	}
+	if (html) {
+		printf("</a>");
+	}
+	printf("\n");
+
+	return;
+}
+
 /**
  *	key_index - List a set of OpenPGP keys.
  *	@keys: The keys to display.
@@ -197,12 +222,13 @@ void display_fingerprint(struct openpgp_publickey *key)
  *	of them. Useful for debugging or the keyserver Index function.
  */
 int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
-			bool html)
+			bool skshash, bool html)
 {
 	struct openpgp_signedpacket_list	*curuid = NULL;
 	struct tm				*created = NULL;
 	time_t					 created_time = 0;
 	int					 type = 0;
+	char					 typech;
 	int					 length = 0;
 	char					 buf[1024];
 	uint64_t				 keyid;
@@ -237,13 +263,30 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 		
 		keyid = get_keyid(keys);
 
+		switch (type) {
+		case OPENPGP_PKALGO_RSA:
+			typech = 'R';
+			break;
+		case OPENPGP_PKALGO_ELGAMAL:
+			typech = 'g';
+			break;
+		case OPENPGP_PKALGO_DSA:
+			typech = 'D';
+			break;
+		case OPENPGP_PKALGO_ELGAMAL_SIGN:
+			typech = 'G';
+			break;
+		default:
+			typech = '?';
+			break;
+		}
+
 		if (html) {
 			printf("pub  %5d%c/<a href=\"lookup?op=get&"
 				"search=%016" PRIX64 "\">%08" PRIX64
 				"</a> %04d/%02d/%02d ",
 				length,
-				(type == 1) ? 'R' : ((type == 16) ? 'g' : 
-					((type == 17) ? 'D' : '?')),
+				typech,
 				keyid,
 				keyid & 0xFFFFFFFF,
 				created->tm_year + 1900,
@@ -252,8 +295,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,
@@ -261,7 +303,8 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 		}
 
 		curuid = keys->uids;
-		if (curuid != NULL && curuid->packet->tag == 13) {
+		if (curuid != NULL &&
+				curuid->packet->tag == OPENPGP_PACKET_UID) {
 			snprintf(buf, 1023, "%.*s",
 				(int) curuid->packet->length,
 				curuid->packet->data);
@@ -274,6 +317,9 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 				(html) ? txt2html(buf) : buf,
 				(html) ? "</a>" : "",
 				(keys->revoked) ? " *** REVOKED ***" : "");
+			if (skshash) {
+				display_skshash(keys, html);
+			}
 			if (fingerprint) {
 				display_fingerprint(keys);
 			}
@@ -320,6 +366,7 @@ int mrkey_index(struct openpgp_publickey *keys)
 	int					 i = 0;
 	size_t					 fplength = 0;
 	unsigned char				 fp[20];
+	int					 c;
 
 	while (keys != NULL) {
 		created_time = (keys->publickey->data[1] << 24) +
@@ -362,10 +409,21 @@ int mrkey_index(struct openpgp_publickey *keys)
 		for (curuid = keys->uids; curuid != NULL;
 			 curuid = curuid->next) {
 		
-			if (curuid->packet->tag == 13) {
-				printf("uid:%.*s\n",
-					(int) curuid->packet->length,
-					curuid->packet->data);
+			if (curuid->packet->tag == OPENPGP_PACKET_UID) {
+				printf("uid:");
+				for (i = 0; i < (int) curuid->packet->length;
+						i++) {
+					c = curuid->packet->data[i];
+					if (c == '%') {
+						putchar('%');
+						putchar(c);
+					} else if (c == ':' || c > 127) {
+						printf("%%%X", c);
+					} else {
+						putchar(c);
+					}
+				}
+				printf("\n");
 			}
 		}
 		keys = keys->next;