cscvs to tla changeset 22

[onak.git] / keyindex.c

diff --git a/keyindex.c b/keyindex.c
index 2c4e24c1dd020c32a934e862a2e2b7002e427a55..a7218b218557af5689cb9e57bfe26c8836e2e41b 100644 (file)
--- a/keyindex.c
+++ b/keyindex.c
@@ -9,6 +9,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>

+#include <stdint.h>

 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>


@@ -22,157 +23,38 @@
 #include "ll.h"
 #include "stats.h"
 
 #include "ll.h"
 #include "stats.h"
 

-int parse_subpackets(unsigned char *data, bool html)
-{
-       int offset = 0;
-       int length = 0;
-       int packetlen = 0;
-       char *uid;
-
-       assert(data != NULL);
-
-       length = (data[0] << 8) + data[1] + 2;
-
-       offset = 2;
-       while (offset < length) {
-               packetlen = data[offset++];
-               if (packetlen > 191 && packetlen < 255) {
-                       packetlen = ((packetlen - 192) << 8) +
-                                       data[offset++] + 192;
-               } else if (packetlen == 255) {
-                       packetlen = data[offset++];
-                       packetlen <<= 8;
-                       packetlen = data[offset++];
-                       packetlen <<= 8;
-                       packetlen = data[offset++];
-                       packetlen <<= 8;
-                       packetlen = data[offset++];
-               }
-               switch (data[offset]) {
-               case 2:
-                       /*
-                        * Signature creation time. Might want to output this?
-                        */
-                       break;
-               case 16:
-                       uid = keyid2uid((data[offset+packetlen - 4] << 24) +
-                                       (data[offset+packetlen - 3] << 16) +
-                                       (data[offset+packetlen - 2] << 8) +
-                                       data[offset+packetlen - 1]);
-                       if (html && uid != NULL) {
-                               printf("sig        <a href=\"lookup?op=get&"
-                                       "search=%02X%02X%02X%02X\">"
-                                       "%02X%02X%02X%02X</a>             "
-                                       "<a href=\"lookup?op=vindex&"
-                                       "search=0x%02X%02X%02X%02X\">"
-                                       "%s</a>\n",
-                                       data[offset+packetlen - 4],
-                                       data[offset+packetlen - 3],
-                                       data[offset+packetlen - 2],
-                                       data[offset+packetlen - 1],
-                                       data[offset+packetlen - 4],
-                                       data[offset+packetlen - 3],
-                                       data[offset+packetlen - 2],
-                                       data[offset+packetlen - 1],
-
-                                       data[offset+packetlen - 4],
-                                       data[offset+packetlen - 3],
-                                       data[offset+packetlen - 2],
-                                       data[offset+packetlen - 1],
-                                       txt2html(uid));
-                       } else if (html && uid == NULL) {
-                               printf("sig        "
-                                       "%02X%02X%02X%02X             "
-                                       "[User id not found]\n",
-                                       data[offset+packetlen - 4],
-                                       data[offset+packetlen - 3],
-                                       data[offset+packetlen - 2],
-                                       data[offset+packetlen - 1]);
-                       } else {
-                               printf("sig        %02X%02X%02X%02X"
-                                               "             %s\n",
-                                       data[offset+packetlen - 4],
-                                       data[offset+packetlen - 3],
-                                       data[offset+packetlen - 2],
-                                       data[offset+packetlen - 1],
-                                       (uid != NULL) ? uid :
-                                       "[User id not found]");
-                       }
-                       break;
-               default:
-                       /*
-                        * We don't care about unrecognized packets unless bit
-                        * 7 is set in which case we prefer an error than
-                        * ignoring it.
-                        */
-                       assert(!(data[offset] & 0x80));
-               }
-               offset += packetlen;
-       }
-
-       return length;
-}
-

 int list_sigs(struct openpgp_packet_list *sigs, bool html)
 {
        int length = 0;
 int list_sigs(struct openpgp_packet_list *sigs, bool html)
 {
        int length = 0;

-       char *uid;
+       char *uid = NULL;
+       uint64_t sigid = 0;

 
        while (sigs != NULL) {
 
        while (sigs != NULL) {

-               switch (sigs->packet->data[0]) {
-               case 2:
-               case 3:
-                       uid = keyid2uid((sigs->packet->data[11] << 24) +
-                                       (sigs->packet->data[12] << 16) +
-                                       (sigs->packet->data[13] << 8) +
-                                       sigs->packet->data[14]);
-                       if (html && uid != NULL) {
-                               printf("sig        <a href=\"lookup?op=get&"
-                                       "search=%02X%02X%02X%02X\">"
-                                       "%02X%02X%02X%02X</a>             "
-                                       "<a href=\"lookup?op=vindex&"
-                                       "search=0x%02X%02X%02X%02X\">"
-                                       "%s</a>\n",
-                                       sigs->packet->data[11],
-                                       sigs->packet->data[12],
-                                       sigs->packet->data[13],
-                                       sigs->packet->data[14],
-                                       sigs->packet->data[11],
-                                       sigs->packet->data[12],
-                                       sigs->packet->data[13],
-                                       sigs->packet->data[14],
-
-                                       sigs->packet->data[11],
-                                       sigs->packet->data[12],
-                                       sigs->packet->data[13],
-                                       sigs->packet->data[14],
-                                       txt2html(uid));
-                       } else if (html && uid == NULL) {
-                               printf("sig        %02X%02X%02X%02X"
-                                       "             "
-                                       "[User id not found]\n",
-                                       sigs->packet->data[11],
-                                       sigs->packet->data[12],
-                                       sigs->packet->data[13],
-                                       sigs->packet->data[14]);
-                       } else {
-                               printf("sig        %02X%02X%02X%02X"
-                                               "             %s\n",
-                                       sigs->packet->data[11],
-                                       sigs->packet->data[12],
-                                       sigs->packet->data[13],
-                                       sigs->packet->data[14],
-                                       (uid != NULL) ? uid :
-                                       "[User id not found]");
-                       }
-                       break;
-               case 4:
-                       length = parse_subpackets(&sigs->packet->data[4], html);
-                       parse_subpackets(&sigs->packet->data[length + 4], html);
-                       break;
-               default:
-                       printf("sig        [Unknown packet version %d]",
-                                       sigs->packet->data[0]);
+               sigid = sig_keyid(sigs->packet);
+               uid = keyid2uid(sigid);
+               if (html && uid != NULL) {
+                       printf("sig         <a href=\"lookup?op=get&"
+                               "search=%08llX\">%08llX</a>             "
+                               "<a href=\"lookup?op=vindex&search=0x%08llX\">"
+                               "%s</a>\n",
+                               sigid & 0xFFFFFFFF,
+                               sigid & 0xFFFFFFFF,
+                               sigid & 0xFFFFFFFF,
+                               txt2html(uid));
+               } else if (html && uid == NULL) {
+                       printf("sig         %08llX             "
+                               "[User id not found]\n",
+                               sigid & 0xFFFFFFFF);
+               } else {
+                       printf("sig         %08llX"
+                               "             %s\n",
+                               sigid & 0xFFFFFFFF,
+                               (uid != NULL) ? uid :
+                               "[User id not found]");
+               }
+               if (uid != NULL) {
+                       free(uid);
+                       uid = NULL;

                }
                sigs = sigs->next;
        }
                }
                sigs = sigs->next;
        }


@@ -189,10 +71,10 @@ int list_uids(struct openpgp_signedpacket_list *uids, bool verbose, bool html)
                        snprintf(buf, 1023, "%.*s",
                                (int) uids->packet->length,
                                uids->packet->data);
                        snprintf(buf, 1023, "%.*s",
                                (int) uids->packet->length,
                                uids->packet->data);

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

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

-                       printf("uid                            "
+                       printf("uid                             "

                                "[photo id]\n");
                }
                if (verbose) {
                                "[photo id]\n");
                }
                if (verbose) {


@@ -227,7 +109,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
        if (html) {
                puts("<pre>");
        }
        if (html) {
                puts("<pre>");
        }

-       puts("Type  bits/keyID    Date       User ID");
+       puts("Type   bits/keyID    Date       User ID");

        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) +


@@ -252,7 +134,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                                keys->publickey->data[0]);
                }
                
                                keys->publickey->data[0]);
                }
                

-               printf("pub  %4d%c/%08X %04d/%02d/%02d ",
+               printf("pub  %5d%c/%08X %04d/%02d/%02d ",

                        length,
                        (type == 1) ? 'R' : ((type == 17) ? 'D' : '?'),
                        (uint32_t) (get_keyid(keys) & 0xFFFFFFFF),
                        length,
                        (type == 1) ? 'R' : ((type == 17) ? 'D' : '?'),
                        (uint32_t) (get_keyid(keys) & 0xFFFFFFFF),


@@ -267,7 +149,6 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                                curuid->packet->data);
                        printf("%s\n", (html) ? txt2html(buf) : buf);
                        if (verbose) {
                                curuid->packet->data);
                        printf("%s\n", (html) ? txt2html(buf) : buf);
                        if (verbose) {

-

                                list_sigs(curuid->sigs, html);
                        }
                        curuid = curuid->next;
                                list_sigs(curuid->sigs, html);
                        }
                        curuid = curuid->next;


@@ -289,8 +170,16 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
        return 0;
 }
 
        return 0;
 }
 

-
-int get_subpackets_keyid(unsigned char *data, uint64_t *keyid)
+/*
+ *     parse_subpackets - Parse the subpackets of a Type 4 signature.
+ *     @data: The subpacket data.
+ *      @keyid: A pointer to where we should return the keyid.
+ *
+ *     This function parses the subkey data of a Type 4 signature and fills
+ *     in the supplied variables. It also returns the length of the data
+ *     processed.
+ */
+int parse_subpackets(unsigned char *data, uint64_t *keyid)

 {
        int offset = 0;
        int length = 0;
 {
        int offset = 0;
        int length = 0;


@@ -321,12 +210,37 @@ int get_subpackets_keyid(unsigned char *data, uint64_t *keyid)
                         * Signature creation time. Might want to output this?
                         */
                        break;
                         * Signature creation time. Might want to output this?
                         */
                        break;

+               case 0x83:
+                       /*
+                        * Signature expiration time. Might want to output this?
+                        */
+                       break;

                case 16:
                case 16:

-                       *keyid = (data[offset+packetlen - 4] << 24) +
-                               (data[offset+packetlen - 3] << 16) +
-                               (data[offset+packetlen - 2] << 8) +
-                               data[offset+packetlen - 1];
-                       *keyid &= 0xFFFFFFFF;
+                       *keyid = data[offset+packetlen - 8];
+                       *keyid <<= 8;
+                       *keyid += data[offset+packetlen - 7];
+                       *keyid <<= 8;
+                       *keyid += data[offset+packetlen - 6];
+                       *keyid <<= 8;
+                       *keyid += data[offset+packetlen - 5];
+                       *keyid <<= 8;
+                       *keyid += data[offset+packetlen - 4];
+                       *keyid <<= 8;
+                       *keyid += data[offset+packetlen - 3];
+                       *keyid <<= 8;
+                       *keyid += data[offset+packetlen - 2];
+                       *keyid <<= 8;
+                       *keyid += data[offset+packetlen - 1];
+                       break;
+               case 23:
+                       /*
+                        * Key server preferences. Including no-modify.
+                        */
+                       break;
+               case 25:
+                       /*
+                        * Primary UID.
+                        */

                        break;
                default:
                        /*
                        break;
                default:
                        /*


@@ -342,7 +256,6 @@ int get_subpackets_keyid(unsigned char *data, uint64_t *keyid)
        return length;
 }
 
        return length;
 }
 

-

 /**
  *     keysigs - Return the sigs on a given OpenPGP signature list.
  *     @curll: The current linked list. Can be NULL to create a new list.
 /**
  *     keysigs - Return the sigs on a given OpenPGP signature list.
  *     @curll: The current linked list. Can be NULL to create a new list.


@@ -354,24 +267,53 @@ int get_subpackets_keyid(unsigned char *data, uint64_t *keyid)
 struct ll *keysigs(struct ll *curll,
                struct openpgp_packet_list *sigs)
 {
 struct ll *keysigs(struct ll *curll,
                struct openpgp_packet_list *sigs)
 {

-       int length = 0;

        uint64_t keyid = 0;
        
        while (sigs != NULL) {
        uint64_t keyid = 0;
        
        while (sigs != NULL) {

+               keyid = sig_keyid(sigs->packet);
+               sigs = sigs->next;
+               curll = lladd(curll, createandaddtohash(keyid));
+       }
+
+       return curll;
+}
+
+/**
+ *     sig_keyid - Return the keyid for a given OpenPGP signature packet.
+ *     @packet: The signature packet.
+ *
+ *     Returns the keyid for the supplied signature packet.
+ */
+uint64_t sig_keyid(struct openpgp_packet *packet)
+{
+       int length = 0;
+       uint64_t keyid = 0;
+       
+       if (packet != NULL) {

                keyid = 0;
                keyid = 0;

-               switch (sigs->packet->data[0]) {
+               switch (packet->data[0]) {

                case 2:
                case 3:
                case 2:
                case 3:

-                       keyid = sigs->packet->data[11] << 24;
-                       keyid += (sigs->packet->data[12] << 16);
-                       keyid += (sigs->packet->data[13] << 8);
-                       keyid += sigs->packet->data[14];
-                       keyid &= 0xFFFFFFFF;
+                       keyid = packet->data[7];
+                       keyid <<= 8;
+                       keyid += packet->data[8];
+                       keyid <<= 8;
+                       keyid += packet->data[9];
+                       keyid <<= 8;
+                       keyid += packet->data[10];
+                       keyid <<= 8;
+                       keyid += packet->data[11];
+                       keyid <<= 8;
+                       keyid += packet->data[12];
+                       keyid <<= 8;
+                       keyid += packet->data[13];
+                       keyid <<= 8;
+                       keyid += packet->data[14];

                        break;
                case 4:
                        break;
                case 4:

-                       length = get_subpackets_keyid(&sigs->packet->data[4],
+                       length = parse_subpackets(&packet->data[4],

                                        &keyid);
                                        &keyid);

-                       get_subpackets_keyid(&sigs->packet->data[length + 4],
+                       parse_subpackets(&packet->data[length + 4],

                                        &keyid);
                        /*
                         * Don't bother to look at the unsigned packets.
                                        &keyid);
                        /*
                         * Don't bother to look at the unsigned packets.


@@ -380,9 +322,63 @@ struct ll *keysigs(struct ll *curll,
                default:
                        break;
                }
                default:
                        break;
                }

-               sigs = sigs->next;
-               curll = lladd(curll, createandaddtohash(keyid));

        }
 
        }
 

-       return curll;
+       return keyid;
+}
+
+/*
+ * TODO: Abstract out; all our linked lists should be generic and then we can
+ * llsize them.
+ */
+int spsize(struct openpgp_signedpacket_list *list)
+{
+       int size = 0;
+       struct openpgp_signedpacket_list *cur;
+
+       for (cur = list; cur != NULL; cur = cur->next, size++) ;
+
+       return size;
+}
+
+/**
+ *     keyuids - Takes a key and returns an array of its UIDs
+ *     @key: The key to get the uids of.
+ *     @primary: A pointer to store the primary UID in.
+ *
+ *     keyuids takes a public key structure and builds an array of the UIDs 
+ *     on the key. It also attempts to work out the primary UID and returns a
+ *     separate pointer to that particular element of the array.
+ */
+char **keyuids(struct openpgp_publickey *key, char **primary)
+{
+       struct openpgp_signedpacket_list *curuid = NULL;
+       char buf[1024];
+       char **uids = NULL;
+       int count = 0;
+
+       if (key != NULL && key->uids != NULL) {
+               uids = malloc((spsize(key->uids) + 1) * sizeof (char *));
+       
+               curuid = key->uids;
+               while (curuid != NULL) {
+                       buf[0] = 0;
+                       if (curuid->packet->tag == 13) {
+                               snprintf(buf, 1023, "%.*s",
+                                               (int) curuid->packet->length,
+                                               curuid->packet->data);
+                               uids[count++] = strdup(buf);
+                       }
+                       curuid = curuid -> next;
+               }
+               uids[count] = NULL;
+       }
+       /*
+        * TODO: Parse subpackets for real primary ID (v4 keys)
+        */
+       if (primary != NULL) {
+               *primary = uids[0];
+       }
+
+       return uids;

 }
 }