Add man page for keyd, even though it's not currently recommended for

[onak.git] / keyindex.c

diff --git a/keyindex.c b/keyindex.c
index 5911cac81736ae53f9b66bca1348ff59edda6b74..a4cc90b78710fb4ee417d30352df0e62407a9adf 100644 (file)
--- a/keyindex.c
+++ b/keyindex.c
@@ -3,10 +3,9 @@
  *
  * Jonathan McDowell <noodles@earth.li>
  *
  *
  * Jonathan McDowell <noodles@earth.li>
  *

- * Copyright 2002 Project Purple
+ * Copyright 2002-2005 Project Purple

  */
 
  */
 

-#include <assert.h>

 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>


@@ -21,31 +20,44 @@
 #include "keyid.h"
 #include "keyindex.h"
 #include "keystructs.h"
 #include "keyid.h"
 #include "keyindex.h"
 #include "keystructs.h"

+#include "log.h"
+#include "onak-conf.h"

 
 int list_sigs(struct openpgp_packet_list *sigs, bool html)
 {
        char *uid = NULL;
        uint64_t sigid = 0;
 
 int list_sigs(struct openpgp_packet_list *sigs, bool html)
 {
        char *uid = NULL;
        uint64_t sigid = 0;

+       char *sig = NULL;

 
        while (sigs != NULL) {
                sigid = sig_keyid(sigs->packet);
 
        while (sigs != NULL) {
                sigid = sig_keyid(sigs->packet);

-               uid = keyid2uid(sigid);
+               uid = config.dbbackend->keyid2uid(sigid);
+               if (sigs->packet->data[0] == 4 &&
+                               sigs->packet->data[1] == 0x30) {
+                       /* It's a Type 4 sig revocation */
+                       sig = "rev";
+               } else {
+                       sig = "sig";
+               }

                if (html && uid != NULL) {
                if (html && uid != NULL) {

-                       printf("sig         <a href=\"lookup?op=get&"
-                               "search=%08llX\">%08llX</a>             "
-                               "<a href=\"lookup?op=vindex&search=0x%08llX\">"
+                       printf("%s         <a href=\"lookup?op=get&"
+                               "search=%016llX\">%08llX</a>             "
+                               "<a href=\"lookup?op=vindex&search=0x%016llX\">"

                                "%s</a>\n",
                                "%s</a>\n",

+                               sig,
+                               sigid,

                                sigid & 0xFFFFFFFF,
                                sigid & 0xFFFFFFFF,

-                               sigid & 0xFFFFFFFF,
-                               sigid & 0xFFFFFFFF,
+                               sigid,

                                txt2html(uid));
                } else if (html && uid == NULL) {
                                txt2html(uid));
                } else if (html && uid == NULL) {

-                       printf("sig         %08llX             "
+                       printf("%s         %08llX             "

                                "[User id not found]\n",
                                "[User id not found]\n",

+                               sig,

                                sigid & 0xFFFFFFFF);
                } else {
                                sigid & 0xFFFFFFFF);
                } else {

-                       printf("sig         %08llX"
+                       printf("%s         %08llX"

                                "             %s\n",
                                "             %s\n",

+                               sig,

                                sigid & 0xFFFFFFFF,
                                (uid != NULL) ? uid :
                                "[User id not found]");
                                sigid & 0xFFFFFFFF,
                                (uid != NULL) ? uid :
                                "[User id not found]");


@@ -60,20 +72,29 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
        return 0;
 }
 
        return 0;
 }
 

-int list_uids(struct openpgp_signedpacket_list *uids, bool verbose, bool html)
+int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids,
+               bool verbose, bool html)

 {
        char buf[1024];
 {
        char buf[1024];

+       int  imgindx = 0;

 
        while (uids != NULL) {
                if (uids->packet->tag == 13) {
                        snprintf(buf, 1023, "%.*s",
                                (int) uids->packet->length,
                                uids->packet->data);
 
        while (uids != NULL) {
                if (uids->packet->tag == 13) {
                        snprintf(buf, 1023, "%.*s",
                                (int) uids->packet->length,
                                uids->packet->data);

-                       printf("uid                             %s\n",
+                       printf("                                %s\n",

                                (html) ? txt2html(buf) : buf);
                } else if (uids->packet->tag == 17) {
                                (html) ? txt2html(buf) : buf);
                } else if (uids->packet->tag == 17) {

-                       printf("uid                             "
-                               "[photo id]\n");
+                       printf("                                ");
+                       if (html) {
+                               printf("<img src=\"lookup?op=photo&search=0x%llX&idx=%d\" alt=\"[photo id]\">\n",
+                                               keyid,
+                                               imgindx);
+                               imgindx++;
+                       } else {
+                               printf("[photo id]\n");
+                       }

                }
                if (verbose) {
                        list_sigs(uids->sigs, html);
                }
                if (verbose) {
                        list_sigs(uids->sigs, html);


@@ -114,7 +135,8 @@ int list_subkeys(struct openpgp_signedpacket_list *subkeys, bool verbose,
                                        subkeys->packet->data[7];
                                break;
                        default:
                                        subkeys->packet->data[7];
                                break;
                        default:

-                               fprintf(stderr, "Unknown key type: %d\n",
+                               logthing(LOGTHING_ERROR,
+                                       "Unknown key type: %d",

                                        subkeys->packet->data[0]);
                        }
                
                                        subkeys->packet->data[0]);
                        }
                


@@ -138,6 +160,29 @@ int list_subkeys(struct openpgp_signedpacket_list *subkeys, bool verbose,
        return 0;
 }
 
        return 0;
 }
 

+void display_fingerprint(struct openpgp_publickey *key)
+{
+       int             i = 0;
+       size_t          length = 0;
+       unsigned char   fp[20];
+
+       get_fingerprint(key->publickey, fp, &length);
+       printf("      Key fingerprint =");
+       for (i = 0; i < length; i++) {
+               if ((length == 16) ||
+                       (i % 2 == 0)) {
+                       printf(" ");
+               }
+               printf("%02X", fp[i]);
+               if ((i * 2) == length) {
+                       printf(" ");
+               }
+       }
+       printf("\n");
+
+       return;
+}
+

 /**
  *     key_index - List a set of OpenPGP keys.
  *     @keys: The keys to display.
 /**
  *     key_index - List a set of OpenPGP keys.
  *     @keys: The keys to display.


@@ -157,6 +202,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
        int                                      type = 0;
        int                                      length = 0;
        char                                     buf[1024];
        int                                      type = 0;
        int                                      length = 0;
        char                                     buf[1024];

+       uint64_t                                 keyid;

 
        if (html) {
                puts("<pre>");
 
        if (html) {
                puts("<pre>");


@@ -182,35 +228,67 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                                        keys->publickey->data[7];
                        break;
                default:
                                        keys->publickey->data[7];
                        break;
                default:

-                       fprintf(stderr, "Unknown key type: %d\n",
+                       logthing(LOGTHING_ERROR, "Unknown key type: %d",

                                keys->publickey->data[0]);
                }
                
                                keys->publickey->data[0]);
                }
                

-               printf("pub  %5d%c/%08X %04d/%02d/%02d ",
-                       length,
-                       (type == 1) ? 'R' : ((type == 16) ? 'g' : 
-                               ((type == 17) ? 'D' : '?')),
-                       (uint32_t) (get_keyid(keys) & 0xFFFFFFFF),
-                       created->tm_year + 1900,
-                       created->tm_mon + 1,
-                       created->tm_mday);
+               keyid = get_keyid(keys);
+
+               if (html) {
+                       printf("pub  %5d%c/<a href=\"lookup?op=get&"
+                               "search=%016llX\">%08llX</a> %04d/%02d/%02d ",
+                               length,
+                               (type == 1) ? 'R' : ((type == 16) ? 'g' : 
+                                       ((type == 17) ? 'D' : '?')),
+                               keyid,
+                               keyid & 0xFFFFFFFF,
+                               created->tm_year + 1900,
+                               created->tm_mon + 1,
+                               created->tm_mday);
+               } else {
+                       printf("pub  %5d%c/%08llX %04d/%02d/%02d ",
+                               length,
+                               (type == 1) ? 'R' : ((type == 16) ? 'g' : 
+                                       ((type == 17) ? 'D' : '?')),
+                               keyid & 0xFFFFFFFF,
+                               created->tm_year + 1900,
+                               created->tm_mon + 1,
+                               created->tm_mday);
+               }

 
                curuid = keys->uids;
                if (curuid != NULL && curuid->packet->tag == 13) {
                        snprintf(buf, 1023, "%.*s",
                                (int) curuid->packet->length,
                                curuid->packet->data);
 
                curuid = keys->uids;
                if (curuid != NULL && curuid->packet->tag == 13) {
                        snprintf(buf, 1023, "%.*s",
                                (int) curuid->packet->length,
                                curuid->packet->data);

-                       printf("%s\n", (html) ? txt2html(buf) : buf);
+                       if (html) {
+                               printf("<a href=\"lookup?op=vindex&"
+                                       "search=0x%016llX\">",
+                                       keyid);
+                       }
+                       printf("%s%s%s\n", 
+                               (html) ? txt2html(buf) : buf,
+                               (html) ? "</a>" : "",
+                               (keys->revoked) ? " *** REVOKED ***" : "");
+                       if (fingerprint) {
+                               display_fingerprint(keys);
+                       }

                        if (verbose) {
                                list_sigs(curuid->sigs, html);
                        }
                        curuid = curuid->next;
                } else {
                        if (verbose) {
                                list_sigs(curuid->sigs, html);
                        }
                        curuid = curuid->next;
                } else {

-                       putchar('\n');
+                       printf("%s\n", 
+                               (keys->revoked) ? "*** REVOKED ***": "");
+                       if (fingerprint) {
+                               display_fingerprint(keys);
+                       }

                }
 
                }
 

-               list_uids(curuid, verbose, html);
-               list_subkeys(keys->subkeys, verbose, html);
+               list_uids(keyid, curuid, verbose, html);
+               if (verbose) {
+                       list_subkeys(keys->subkeys, verbose, html);
+               }

 
                keys = keys->next;
        }
 
                keys = keys->next;
        }


@@ -221,3 +299,72 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 
        return 0;
 }
 
        return 0;
 }

+
+/**
+ *     mrkey_index - List a set of OpenPGP keys in the MRHKP format.
+ *     @keys: The keys to display.
+ *
+ *     This function takes a list of OpenPGP public keys and displays a
+ *     machine readable list of them.
+ */
+int mrkey_index(struct openpgp_publickey *keys)
+{
+       struct openpgp_signedpacket_list        *curuid = NULL;
+       time_t                                   created_time = 0;
+       int                                      type = 0;
+       int                                      length = 0;
+       int                                      i = 0;
+       size_t                                   fplength = 0;
+       unsigned char                            fp[20];
+
+       while (keys != NULL) {
+               created_time = (keys->publickey->data[1] << 24) +
+                                       (keys->publickey->data[2] << 16) +
+                                       (keys->publickey->data[3] << 8) +
+                                       keys->publickey->data[4];
+
+               printf("pub:");
+
+               switch (keys->publickey->data[0]) {
+               case 2:
+               case 3:
+                       printf("%016llX", get_keyid(keys));
+                       type = keys->publickey->data[7];
+                       length = (keys->publickey->data[8] << 8) +
+                                       keys->publickey->data[9];
+                       break;
+               case 4:
+                       (void) get_fingerprint(keys->publickey, fp, &fplength);
+
+                       for (i = 0; i < fplength; i++) {
+                               printf("%02X", fp[i]);
+                       }
+
+                       type = keys->publickey->data[5];
+                       length = (keys->publickey->data[6] << 8) +
+                                       keys->publickey->data[7];
+                       break;
+               default:
+                       logthing(LOGTHING_ERROR, "Unknown key type: %d",
+                               keys->publickey->data[0]);
+               }
+
+               printf(":%d:%d:%ld::%s\n",
+                       type,
+                       length,
+                       created_time,
+                       (keys->revoked) ? "r" : "");
+       
+               for (curuid = keys->uids; curuid != NULL;
+                        curuid = curuid->next) {
+               
+                       if (curuid->packet->tag == 13) {
+                               printf("uid:%.*s\n",
+                                       (int) curuid->packet->length,
+                                       curuid->packet->data);
+                       }
+               }
+               keys = keys->next;
+       }
+       return 0;
+}