Escape colons and similar in MRHKP output

[onak.git] / keyindex.c

diff --git a/keyindex.c b/keyindex.c
index a4cc90b78710fb4ee417d30352df0e62407a9adf..fead60b0163d4dc51813e2865d93d7b110aefc83 100644 (file)
--- 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>
@@ -41,21 +39,22 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
                }
                if (html && uid != NULL) {
                        printf("%s         <a href=\"lookup?op=get&"
-                               "search=%016llX\">%08llX</a>             "
-                               "<a href=\"lookup?op=vindex&search=0x%016llX\">"
-                               "%s</a>\n",
+                               "search=%016" PRIX64 "\">%08" PRIX64
+                               "</a>             "
+                               "<a href=\"lookup?op=vindex&search=0x%016"
+                               PRIX64 "\">%s</a>\n",
                                sig,
                                sigid,
                                sigid & 0xFFFFFFFF,
                                sigid,
                                txt2html(uid));
                } else if (html && uid == NULL) {
-                       printf("%s         %08llX             "
+                       printf("%s         %08" PRIX64 "             "
                                "[User id not found]\n",
                                sig,
                                sigid & 0xFFFFFFFF);
                } else {
-                       printf("%s         %08llX"
+                       printf("%s         %08" PRIX64
                                "             %s\n",
                                sig,
                                sigid & 0xFFFFFFFF,
@@ -88,9 +87,11 @@ 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%llX&idx=%d\" alt=\"[photo id]\">\n",
-                                               keyid,
-                                               imgindx);
+                               printf("<img src=\"lookup?op=photo&search=0x%"
+                                       PRIX64 "&idx=%d\" alt=\"[photo id]\">"
+                                       "\n",
+                                       keyid,
+                                       imgindx);
                                imgindx++;
                        } else {
                                printf("[photo id]\n");
@@ -236,7 +237,8 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 
                if (html) {
                        printf("pub  %5d%c/<a href=\"lookup?op=get&"
-                               "search=%016llX\">%08llX</a> %04d/%02d/%02d ",
+                               "search=%016" PRIX64 "\">%08" PRIX64
+                               "</a> %04d/%02d/%02d ",
                                length,
                                (type == 1) ? 'R' : ((type == 16) ? 'g' : 
                                        ((type == 17) ? 'D' : '?')),
@@ -246,7 +248,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                                created->tm_mon + 1,
                                created->tm_mday);
                } else {
-                       printf("pub  %5d%c/%08llX %04d/%02d/%02d ",
+                       printf("pub  %5d%c/%08" PRIX64 " %04d/%02d/%02d ",
                                length,
                                (type == 1) ? 'R' : ((type == 16) ? 'g' : 
                                        ((type == 17) ? 'D' : '?')),
@@ -263,7 +265,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                                curuid->packet->data);
                        if (html) {
                                printf("<a href=\"lookup?op=vindex&"
-                                       "search=0x%016llX\">",
+                                       "search=0x%016" PRIX64 "\">",
                                        keyid);
                        }
                        printf("%s%s%s\n", 
@@ -316,6 +318,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) +
@@ -328,7 +331,7 @@ int mrkey_index(struct openpgp_publickey *keys)
                switch (keys->publickey->data[0]) {
                case 2:
                case 3:
-                       printf("%016llX", get_keyid(keys));
+                       printf("%016" PRIX64, get_keyid(keys));
                        type = keys->publickey->data[7];
                        length = (keys->publickey->data[8] << 8) +
                                        keys->publickey->data[9];
@@ -359,9 +362,20 @@ int mrkey_index(struct openpgp_publickey *keys)
                         curuid = curuid->next) {
                
                        if (curuid->packet->tag == 13) {
-                               printf("uid:%.*s\n",
-                                       (int) curuid->packet->length,
-                                       curuid->packet->data);
+                               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;