cscvs to tla changeset 134

[onak.git] / keyindex.c

diff --git a/keyindex.c b/keyindex.c
index 180c3127965764a855f7c2f30e86285f542f22be..9210cc8cfc535e69a3cdc02cb52471ff13fecfbe 100644 (file)
--- a/keyindex.c
+++ b/keyindex.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
- * $Id: keyindex.c,v 1.10 2003/06/04 22:11:40 noodles Exp $
+ * $Id: keyindex.c,v 1.15 2004/05/27 01:25:37 noodles Exp $
  */
 
 #include <assert.h>
@@ -63,20 +63,29 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
        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];
+       int  imgindx = 0;
 
        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) {
-                       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);
@@ -184,6 +193,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
        int                                      type = 0;
        int                                      length = 0;
        char                                     buf[1024];
+       uint64_t                                 keyid;
 
        if (html) {
                puts("<pre>");
@@ -213,11 +223,12 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                                keys->publickey->data[0]);
                }
                
+               keyid = (get_keyid(keys) & 0xFFFFFFFF),
                printf("pub  %5d%c/%08X %04d/%02d/%02d ",
                        length,
                        (type == 1) ? 'R' : ((type == 16) ? 'g' : 
                                ((type == 17) ? 'D' : '?')),
-                       (uint32_t) (get_keyid(keys) & 0xFFFFFFFF),
+                       (uint32_t) keyid,
                        created->tm_year + 1900,
                        created->tm_mon + 1,
                        created->tm_mday);
@@ -227,7 +238,10 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                        snprintf(buf, 1023, "%.*s",
                                (int) curuid->packet->length,
                                curuid->packet->data);
-                       printf("%s\n", (html) ? txt2html(buf) : buf);
+                       printf("%s%s\n", 
+                               (html) ? txt2html(buf) : buf,
+                               (keys->revocations == NULL) ? "" :
+                                       " *** REVOKED ***");
                        if (fingerprint) {
                                display_fingerprint(keys);
                        }
@@ -236,14 +250,18 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                        }
                        curuid = curuid->next;
                } else {
-                       putchar('\n');
+                       printf("%s\n", 
+                               (keys->revocations == NULL) ? "" :
+                                       "*** 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;
        }
@@ -272,8 +290,6 @@ int mrkey_index(struct openpgp_publickey *keys)
        size_t                                   fplength = 0;
        unsigned char                            fp[20];
 
-
-
        while (keys != NULL) {
                created_time = (keys->publickey->data[1] << 24) +
                                        (keys->publickey->data[2] << 16) +
@@ -291,7 +307,7 @@ int mrkey_index(struct openpgp_publickey *keys)
                                        keys->publickey->data[9];
                        break;
                case 4:
-                       get_fingerprint(keys->publickey, fp, &fplength);
+                       (void) get_fingerprint(keys->publickey, fp, &fplength);
 
                        for (i = 0; i < fplength; i++) {
                                printf("%02X", fp[i]);
@@ -306,10 +322,11 @@ int mrkey_index(struct openpgp_publickey *keys)
                                keys->publickey->data[0]);
                }
 
-               printf(":%d:%d:%d::\n",
+               printf(":%d:%d:%ld::%s\n",
                        type,
                        length,
-                       created_time);
+                       created_time,
+                       (keys->revocations == NULL) ? "" : "r");
        
                for (curuid = keys->uids; curuid != NULL;
                         curuid = curuid->next) {