X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/936be87217c58254edc92aa63178fa0461f67150..0419ca8378046fbf42cb837dcbb54682ef7495c6:/keyindex.c?ds=sidebyside

diff --git a/keyindex.c b/keyindex.c
index 0cc9edd..4eedf1f 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -2,6 +2,19 @@
  * keyindex.c - Routines to list an OpenPGP key.
  *
  * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <inttypes.h>
@@ -20,6 +33,7 @@
 #include "keystructs.h"
 #include "log.h"
 #include "onak-conf.h"
+#include "openpgp.h"
 
 int list_sigs(struct openpgp_packet_list *sigs, bool html)
 {
@@ -78,13 +92,13 @@ 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="
@@ -115,7 +129,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) +
@@ -143,8 +157,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,
@@ -174,10 +189,36 @@ void display_fingerprint(struct openpgp_publickey *key)
 			(i % 2 == 0)) {
 			printf(" ");
 		}
-		printf("%02X", fp[i]);
-		if ((i * 2) == length) {
+		if (length == 20 && (i * 2) == length) {
+			/* Extra space in the middle of a SHA1 fingerprint */
 			printf(" ");
 		}
+		printf("%02X", fp[i]);
+	}
+	printf("\n");
+
+	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");
 
@@ -195,7 +236,7 @@ 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;
@@ -237,16 +278,16 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 		keyid = get_keyid(keys);
 
 		switch (type) {
-		case 1:
+		case OPENPGP_PKALGO_RSA:
 			typech = 'R';
 			break;
-		case 16:
+		case OPENPGP_PKALGO_ELGAMAL:
 			typech = 'g';
 			break;
-		case 17:
+		case OPENPGP_PKALGO_DSA:
 			typech = 'D';
 			break;
-		case 20:
+		case OPENPGP_PKALGO_ELGAMAL_SIGN:
 			typech = 'G';
 			break;
 		default:
@@ -276,7 +317,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);
@@ -289,6 +331,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);
 			}
@@ -378,7 +423,7 @@ int mrkey_index(struct openpgp_publickey *keys)
 		for (curuid = keys->uids; curuid != NULL;
 			 curuid = curuid->next) {
 		
-			if (curuid->packet->tag == 13) {
+			if (curuid->packet->tag == OPENPGP_PACKET_UID) {
 				printf("uid:");
 				for (i = 0; i < (int) curuid->packet->length;
 						i++) {