X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/0211c730256c9bbaf10a569c88f7df0ef882311e..3839a6a5eb45a07065cef61b2bfe2c7f317c7b44:/keyindex.c

diff --git a/keyindex.c b/keyindex.c
index 6aab5d3..45606f0 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>
@@ -40,7 +53,7 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
 		}
 		if (html && uid != NULL) {
 			printf("%s         <a href=\"lookup?op=get&"
-				"search=%016" PRIX64 "\">%08" PRIX64
+				"search=0x%016" PRIX64 "\">%08" PRIX64
 				"</a>             "
 				"<a href=\"lookup?op=vindex&search=0x%016"
 				PRIX64 "\">%s</a>\n",
@@ -176,10 +189,11 @@ 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");
 
@@ -283,7 +297,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 
 		if (html) {
 			printf("pub  %5d%c/<a href=\"lookup?op=get&"
-				"search=%016" PRIX64 "\">%08" PRIX64
+				"search=0x%016" PRIX64 "\">%08" PRIX64
 				"</a> %04d/%02d/%02d ",
 				length,
 				typech,