* Jonathan McDowell <noodles@earth.li>
*
* Copyright 2002 Project Purple
+ *
+ * $Id: merge.c,v 1.10 2003/06/04 20:57:11 noodles Exp $
*/
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
+#include "decodekey.h"
#include "keydb.h"
#include "keyid.h"
#include "keystructs.h"
#include "ll.h"
+#include "log.h"
#include "mem.h"
#include "merge.h"
/**
* 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)
{
!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.
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.
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
/**
* 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
* 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)
+int update_keys(struct openpgp_publickey **keys)
{
struct openpgp_publickey *curkey = NULL;
struct openpgp_publickey *oldkey = NULL;
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);
- }
+ logthing(LOGTHING_INFO,
+ "Fetching key 0x%llX, result: %d",
+ get_keyid(curkey),
+ fetch_key(get_keyid(curkey), &oldkey, intrans));
/*
* If we already have the key stored in the DB then merge it
*keys = curkey->next;
} else {
prev->next = curkey->next;
- prev = curkey->next;
+ curkey->next = NULL;
+ free_publickey(curkey);
+ curkey = prev;
}
} else {
prev = curkey;
- if (verbose) {
- fprintf(stderr, "Merged key; storing updated key.\n");
- }
+ logthing(LOGTHING_INFO,
+ "Merged key; storing updated key.");
store_key(oldkey, intrans, true);
}
free_publickey(oldkey);
oldkey = NULL;
} else {
- if (verbose) {
- fprintf(stderr, "Storing completely new key.\n");
- }
+ logthing(LOGTHING_INFO,
+ "Storing completely new key.");
store_key(curkey, intrans, false);
newkeys++;
}
projects / onak.git / blobdiff