Always put a leading 0x on keyids in HTML output links

[onak.git] / keyindex.c

diff --git a/keyindex.c b/keyindex.c
index eee2e8a6f867415c3651c5c5d57f0b00424d00ae..45606f0d50fb5f1e206736ebf84dca60ed657074 100644 (file)
--- a/keyindex.c
+++ b/keyindex.c
@@ -53,7 +53,7 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
                }
                if (html && uid != NULL) {
                        printf("%s         <a href=\"lookup?op=get&"
                }
                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",
                                "</a>             "
                                "<a href=\"lookup?op=vindex&search=0x%016"
                                PRIX64 "\">%s</a>\n",


@@ -189,10 +189,11 @@ void display_fingerprint(struct openpgp_publickey *key)
                        (i % 2 == 0)) {
                        printf(" ");
                }
                        (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(" ");
                }

+               printf("%02X", fp[i]);

        }
        printf("\n");
 
        }
        printf("\n");
 


@@ -296,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&"
 
                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,
                                "</a> %04d/%02d/%02d ",
                                length,
                                typech,