cscvs to tla changeset 18

[onak.git] / merge.c

diff --git a/merge.c b/merge.c
index 96e628be0efb79d9c7e438806b629a7d38248944..69543378e283f78fef4af9ee898eda2c57c32695 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -12,6 +12,7 @@
 
 #include "keydb.h"
 #include "keyid.h"
 
 #include "keydb.h"
 #include "keyid.h"

+#include "keyindex.h"

 #include "keystructs.h"
 #include "ll.h"
 #include "mem.h"
 #include "keystructs.h"
 #include "ll.h"
 #include "mem.h"


@@ -19,10 +20,11 @@
 
 /**
  *     compare_packets - Check to see if 2 OpenPGP packets are the same.
 
 /**
  *     compare_packets - Check to see if 2 OpenPGP packets are the same.

- *     @a: The first key to compare.
- *     @b: The second key to compare.
+ *     @a: The first packet to compare.
+ *     @b: The second packet to compare.

  *
  *

- *     Takes 2 keys and returns true if they are the same and false otherwise.
+ *     Takes 2 packets and returns true if they are the same and false
+ *     otherwise.

  */
 bool compare_packets(struct openpgp_packet *a, struct openpgp_packet *b)
 {
  */
 bool compare_packets(struct openpgp_packet *a, struct openpgp_packet *b)
 {


@@ -30,6 +32,19 @@ bool compare_packets(struct openpgp_packet *a, struct openpgp_packet *b)
                !memcmp(a->data, b->data, b->length));
 }
 
                !memcmp(a->data, b->data, b->length));
 }
 

+/**
+ *     compare_signatures - Check to see if 2 OpenPGP signatures are the same.
+ *     @a: The first signature to compare.
+ *     @b: The second signature to compare.
+ *
+ *     Takes 2 signature packets and returns true if they are the same and
+ *     false otherwise.
+ */
+bool compare_signatures(struct openpgp_packet *a, struct openpgp_packet *b)
+{
+       return (sig_keyid(a) == sig_keyid(b));
+}
+

 /**
  *     find_packet - Checks to see if an OpenPGP packet exists in a list.
  *     @packet_list: The list of packets to look in.
 /**
  *     find_packet - Checks to see if an OpenPGP packet exists in a list.
  *     @packet_list: The list of packets to look in.


@@ -53,6 +68,31 @@ bool find_packet(struct openpgp_packet_list *packet_list,
        return found;
 }
 
        return found;
 }
 

+/**
+ *     find_signature - Checks to see if an OpenPGP signature exists in a list.
+ *     @packet_list: The list of packets to look in.
+ *     @packet: The signature to look for.
+ *
+ *     Walks through the packet_list checking to see if the signature given is
+ *     present in it. Returns a pointer to it if it is, NULL otherwise.
+ *
+ */
+struct openpgp_packet_list *find_signature(
+                       struct openpgp_packet_list *packet_list,
+                       struct openpgp_packet *packet)
+{
+       struct openpgp_packet_list *found = NULL;
+
+       while (!found && packet_list != NULL) {
+               if (compare_signatures(packet_list->packet, packet)) {
+                       found = packet_list;
+               }
+               packet_list = packet_list -> next;
+       }
+
+       return found;
+}
+

 /**
  *     get_signed_packet - Gets a signed packet from a list.
  *     @packet_list: The list of packets to look in.
 /**
  *     get_signed_packet - Gets a signed packet from a list.
  *     @packet_list: The list of packets to look in.


@@ -105,7 +145,9 @@ bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
                        if (cur->next == NULL) {
                                *list_end = prev;
                        }
                        if (cur->next == NULL) {
                                *list_end = prev;
                        }

+                       // TODO: Free the removed signed packet...

                }
                }

+               prev = cur;

        }
 
        return found;
        }
 
        return found;


@@ -133,7 +175,13 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old,
        curpacket = new->sigs;
        while (curpacket != NULL) {
                nextpacket = curpacket->next;
        curpacket = new->sigs;
        while (curpacket != NULL) {
                nextpacket = curpacket->next;

-               if (find_packet(old->sigs, curpacket->packet)) {
+               /*
+                * TODO: We should be checking the signature and then
+                * potentially merging/replacing it depending on the subpackets
+                * really. For now this stops us adding the same one twice
+                * however.
+                */ 
+               if (find_signature(old->sigs, curpacket->packet)) {

                        /*
                         * We already have this sig, remove it from the
                         * difference list and free the memory allocated for
                        /*
                         * We already have this sig, remove it from the
                         * difference list and free the memory allocated for


@@ -192,25 +240,29 @@ int merge_signed_packets(struct openpgp_signedpacket_list **old,
                        if (newelem->sigs == NULL) {
                                remove_signed_packet(new,
                                                new_end,
                        if (newelem->sigs == NULL) {
                                remove_signed_packet(new,
                                                new_end,

-                                               curelem->packet);
+                                               newelem->packet);

                        }
                }
        }
 
        /*
                        }
                }
        }
 
        /*

-        * If *new != NULL now then there are UIDs on the new key that weren't
-        * on the old key. Add them.
+        * If *new != NULL now then there might be UIDs on the new key that
+        * weren't on the old key. Walk through them, checking if the UID is
+        * on the old key and if not adding them to it.

         */
        for (curelem = *new; curelem != NULL;
                        curelem = curelem->next) {
         */
        for (curelem = *new; curelem != NULL;
                        curelem = curelem->next) {

-               ADD_PACKET_TO_LIST((*old_end),
+
+               if (find_signed_packet(*old, curelem->packet) == NULL) {
+                       ADD_PACKET_TO_LIST((*old_end),

                                packet_dup(curelem->packet));
                                packet_dup(curelem->packet));

-               if (*old == NULL) {
-                       *old = *old_end;
-               }
-               packet_list_add(&(*old_end)->sigs,
+                       if (*old == NULL) {
+                               *old = *old_end;
+                       }
+                       packet_list_add(&(*old_end)->sigs,

                                &(*old_end)->last_sig,
                                curelem->sigs);
                                &(*old_end)->last_sig,
                                curelem->sigs);

+               }

        }
 
        return 0;
        }
 
        return 0;


@@ -290,7 +342,7 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
                 */
                merge_signed_packets(&a->uids, &a->last_uid, 
                                &b->uids, &b->last_uid);
                 */
                merge_signed_packets(&a->uids, &a->last_uid, 
                                &b->uids, &b->last_uid);

-               merge_signed_packets(&a->subkeys, &a->last_uid,
+               merge_signed_packets(&a->subkeys, &a->last_subkey,

                                &b->subkeys, &b->last_subkey);
 
        }
                                &b->subkeys, &b->last_subkey);
 
        }


@@ -301,6 +353,7 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
 /**
  *     update_keys - Takes a list of public keys and updates them in the DB.
  *     @keys: The keys to update in the DB.
 /**
  *     update_keys - Takes a list of public keys and updates them in the DB.
  *     @keys: The keys to update in the DB.

+ *     @verbose: Should we output more information as we add keys?

  *
  *     Takes a list of keys and adds them to the database, merging them with
  *     the key in the database if it's already present there. The key list is
  *
  *     Takes a list of keys and adds them to the database, merging them with
  *     the key in the database if it's already present there. The key list is


@@ -308,15 +361,23 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
  *     we had before to what we have now (ie the set of data that was added to
  *     the DB). Returns the number of entirely new keys added.
  */
  *     we had before to what we have now (ie the set of data that was added to
  *     the DB). Returns the number of entirely new keys added.
  */

-int update_keys(struct openpgp_publickey **keys)
+int update_keys(struct openpgp_publickey **keys, bool verbose)

 {
        struct openpgp_publickey *curkey = NULL;
        struct openpgp_publickey *oldkey = NULL;
 {
        struct openpgp_publickey *curkey = NULL;
        struct openpgp_publickey *oldkey = NULL;

-       struct  openpgp_publickey *prev = NULL;
+       struct openpgp_publickey *prev = NULL;

        int newkeys = 0;
        int newkeys = 0;

+       bool intrans;

 
        for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
 
        for (curkey = *keys; curkey != NULL; curkey = curkey->next) {

-               fetch_key(get_keyid(curkey), &oldkey);
+               intrans = starttrans();
+               if (verbose) {
+                       fprintf(stderr, "Fetching key 0x%llX, result: %d\n",
+                               get_keyid(curkey),
+                               fetch_key(get_keyid(curkey), &oldkey, intrans));
+               } else {
+                       fetch_key(get_keyid(curkey), &oldkey, intrans);
+               }

 
                /*
                 * If we already have the key stored in the DB then merge it
 
                /*
                 * If we already have the key stored in the DB then merge it


@@ -337,14 +398,22 @@ int update_keys(struct openpgp_publickey **keys)
                                }
                        } else {
                                prev = curkey;
                                }
                        } else {
                                prev = curkey;

-                               store_key(oldkey);
+                               if (verbose) {
+                                       fprintf(stderr, "Merged key; storing updated key.\n");
+                               }
+                               store_key(oldkey, intrans, true);

                        }
                        free_publickey(oldkey);
                        oldkey = NULL;
                } else {
                        }
                        free_publickey(oldkey);
                        oldkey = NULL;
                } else {

-                       store_key(curkey);
+                       if (verbose) {
+                               fprintf(stderr, "Storing completely new key.\n");
+                       }
+                       store_key(curkey, intrans, false);

                        newkeys++;
                }
                        newkeys++;
                }

+               endtrans();
+               intrans = false;

        }
 
        return newkeys;
        }
 
        return newkeys;