X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/1a72b8d85895fc9ffba0d8f6a9240634ce6ee8dc..f0822345a23524444df900e19b58c0b930e76cbf:/keyindex.c

diff --git a/keyindex.c b/keyindex.c
index d2094d5..869befd 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("<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++;
@@ -184,6 +184,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.
@@ -195,7 +220,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;
@@ -289,6 +314,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);
 			}