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 b81ec61e68e793ab11da013452c192b2ccb37c1f..a4cc90b78710fb4ee417d30352df0e62407a9adf 100644 (file)
--- a/keyindex.c
+++ b/keyindex.c
@@ -3,12 +3,9 @@
  *
  * Jonathan McDowell <noodles@earth.li>
  *
  *
  * Jonathan McDowell <noodles@earth.li>
  *

- * Copyright 2002 Project Purple
- *
- * $Id: keyindex.c,v 1.13 2003/10/11 21:52:18 noodles Exp $
+ * 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>


@@ -24,31 +21,43 @@
 #include "keyindex.h"
 #include "keystructs.h"
 #include "log.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]");


@@ -63,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);


@@ -184,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>");


@@ -213,24 +232,44 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                                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%s\n", 
+                       if (html) {
+                               printf("<a href=\"lookup?op=vindex&"
+                                       "search=0x%016llX\">",
+                                       keyid);
+                       }
+                       printf("%s%s%s\n", 

                                (html) ? txt2html(buf) : buf,
                                (html) ? txt2html(buf) : buf,

-                               (keys->revocations == NULL) ? "" :
-                                       " *** REVOKED ***");
+                               (html) ? "</a>" : "",
+                               (keys->revoked) ? " *** REVOKED ***" : "");

                        if (fingerprint) {
                                display_fingerprint(keys);
                        }
                        if (fingerprint) {
                                display_fingerprint(keys);
                        }


@@ -240,15 +279,16 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                        curuid = curuid->next;
                } else {
                        printf("%s\n", 
                        curuid = curuid->next;
                } else {
                        printf("%s\n", 

-                               (keys->revocations == NULL) ? "" :
-                                       "*** REVOKED ***");
+                               (keys->revoked) ? "*** REVOKED ***": "");

                        if (fingerprint) {
                                display_fingerprint(keys);
                        }
                }
 
                        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;
        }


@@ -313,7 +353,7 @@ int mrkey_index(struct openpgp_publickey *keys)
                        type,
                        length,
                        created_time,
                        type,
                        length,
                        created_time,

-                       (keys->revocations == NULL) ? "" : "r");
+                       (keys->revoked) ? "r" : "");

        
                for (curuid = keys->uids; curuid != NULL;
                         curuid = curuid->next) {
        
                for (curuid = keys->uids; curuid != NULL;
                         curuid = curuid->next) {