cscvs to tla changeset 99

[onak.git] / keyindex.c

diff --git a/keyindex.c b/keyindex.c
index 180c3127965764a855f7c2f30e86285f542f22be..464a7baaecd76d1eacbbb7726d2264851b265229 100644 (file)
--- a/keyindex.c
+++ b/keyindex.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * Copyright 2002 Project Purple
  *

- * $Id: keyindex.c,v 1.10 2003/06/04 22:11:40 noodles Exp $
+ * $Id: keyindex.c,v 1.12 2003/06/08 21:11:01 noodles Exp $

  */
 
 #include <assert.h>
  */
 
 #include <assert.h>


@@ -227,7 +227,10 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                        snprintf(buf, 1023, "%.*s",
                                (int) curuid->packet->length,
                                curuid->packet->data);
                        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);
                        }
                        if (fingerprint) {
                                display_fingerprint(keys);
                        }


@@ -236,7 +239,9 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                        }
                        curuid = curuid->next;
                } else {
                        }
                        curuid = curuid->next;
                } else {

-                       putchar('\n');
+                       printf("%s\n", 
+                               (keys->revocations == NULL) ? "" :
+                                       "*** REVOKED ***");

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


@@ -272,8 +277,6 @@ int mrkey_index(struct openpgp_publickey *keys)
        size_t                                   fplength = 0;
        unsigned char                            fp[20];
 
        size_t                                   fplength = 0;
        unsigned char                            fp[20];
 

-
-

        while (keys != NULL) {
                created_time = (keys->publickey->data[1] << 24) +
                                        (keys->publickey->data[2] << 16) +
        while (keys != NULL) {
                created_time = (keys->publickey->data[1] << 24) +
                                        (keys->publickey->data[2] << 16) +


@@ -306,10 +309,11 @@ int mrkey_index(struct openpgp_publickey *keys)
                                keys->publickey->data[0]);
                }
 
                                keys->publickey->data[0]);
                }
 

-               printf(":%d:%d:%d::\n",
+               printf(":%d:%d:%ld::%s\n",

                        type,
                        length,
                        type,
                        length,

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

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