Make failure to load backend fatal.

[onak.git] / merge.c

diff --git a/merge.c b/merge.c
index 69543378e283f78fef4af9ee898eda2c57c32695..43795966d848cf41e14f42be5127106c667b185b 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -3,18 +3,19 @@
  *
  * Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 Project Purple
+ * Copyright 2002-2005 Project Purple
  */
 
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
+#include "decodekey.h"
 #include "keydb.h"
 #include "keyid.h"
-#include "keyindex.h"
 #include "keystructs.h"
 #include "ll.h"
+#include "log.h"
 #include "mem.h"
 #include "merge.h"
 
@@ -42,7 +43,16 @@ bool compare_packets(struct openpgp_packet *a, struct openpgp_packet *b)
  */
 bool compare_signatures(struct openpgp_packet *a, struct openpgp_packet *b)
 {
-       return (sig_keyid(a) == sig_keyid(b));
+       if (a->data[0] != b->data[0]) {
+               /* Different signature versions, so not the same */
+               return false;
+       } else if (a->data[0] == 4 && a->data[1] != b->data[1]) {
+               /* Type 4 signature, but different types */
+               return false;
+       /* TODO: Check signature time? */
+       } else {
+               return (sig_keyid(a) == sig_keyid(b));
+       }
 }
 
 /**
@@ -145,7 +155,9 @@ bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
                        if (cur->next == NULL) {
                                *list_end = prev;
                        }
-                       // TODO: Free the removed signed packet...
+                       /*
+                        * TODO: Free the removed signed packet...
+                        */
                }
                prev = cur;
        }
@@ -170,7 +182,7 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old,
        struct openpgp_packet_list      *curpacket = NULL;
        struct openpgp_packet_list      *nextpacket = NULL;
 
-       assert(compare_packets(old->packet, new->packet));
+       log_assert(compare_packets(old->packet, new->packet));
 
        curpacket = new->sigs;
        while (curpacket != NULL) {
@@ -190,7 +202,7 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old,
                        if (lastpacket != NULL) {
                                lastpacket->next = curpacket->next;
                        } else {
-                               assert(curpacket == new->sigs);
+                               log_assert(curpacket == new->sigs);
                                new->sigs = curpacket->next;
                        }
                        curpacket->next = NULL;
@@ -315,7 +327,7 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
                                if (lastpacket != NULL) {
                                        lastpacket->next = curpacket->next;
                                } else {
-                                       assert(curpacket == b->revocations);
+                                       log_assert(curpacket == b->revocations);
                                        b->revocations = curpacket->next;
                                }
                                curpacket->next = NULL;
@@ -349,72 +361,3 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
 
        return rc;
 }
-
-/**
- *     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
- *     update to contain the minimum set of updates required to get from what
- *     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, bool verbose)
-{
-       struct openpgp_publickey *curkey = NULL;
-       struct openpgp_publickey *oldkey = NULL;
-       struct openpgp_publickey *prev = NULL;
-       int newkeys = 0;
-       bool intrans;
-
-       for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
-               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
-                * with the new one that's been supplied. Otherwise the key
-                * we've just got is the one that goes in the DB and also the
-                * one that we send out.
-                */
-               if (oldkey != NULL) {
-                       merge_keys(oldkey, curkey);
-                       if (curkey->revocations == NULL &&
-                                       curkey->uids == NULL &&
-                                       curkey->subkeys == NULL) {
-                               if (prev == NULL) {
-                                       *keys = curkey->next;
-                               } else {
-                                       prev->next = curkey->next;
-                                       prev = curkey->next;
-                               }
-                       } else {
-                               prev = curkey;
-                               if (verbose) {
-                                       fprintf(stderr, "Merged key; storing updated key.\n");
-                               }
-                               store_key(oldkey, intrans, true);
-                       }
-                       free_publickey(oldkey);
-                       oldkey = NULL;
-               } else {
-                       if (verbose) {
-                               fprintf(stderr, "Storing completely new key.\n");
-                       }
-                       store_key(curkey, intrans, false);
-                       newkeys++;
-               }
-               endtrans();
-               intrans = false;
-       }
-
-       return newkeys;
-}