cscvs to tla changeset 105

[onak.git] / keyindex.c

diff --git a/keyindex.c b/keyindex.c
index 8277866d5ab31d4d2b038005303d00de5ef92689..464a7baaecd76d1eacbbb7726d2264851b265229 100644 (file)
--- a/keyindex.c
+++ b/keyindex.c
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
+ *
+ * $Id: keyindex.c,v 1.12 2003/06/08 21:11:01 noodles Exp $
  */
 
 #include <assert.h>
@@ -225,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);
-                       printf("%s\n", (html) ? txt2html(buf) : buf);
+                       printf("%s%s\n", 
+                               (html) ? txt2html(buf) : buf,
+                               (keys->revocations == NULL) ? "" :
+                                       " *** REVOKED ***");
                        if (fingerprint) {
                                display_fingerprint(keys);
                        }
@@ -234,7 +239,9 @@ 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);
                        }
@@ -252,3 +259,72 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 
        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:
+                       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->revocations == NULL) ? "" : "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;
+}