X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.c;h=d2d2beb1ace4f87471cdb5b9396323f9fb3389f8;hb=1dd29bb2bbc96e62fa2ba611d8871c7c4084ef75;hp=8bfbd09eb227c41dbeea3c0afbf1de9f44824157;hpb=e02c731dfbb288c736f2cd09a9b6df0507c59ddd;p=onak.git diff --git a/merge.c b/merge.c index 8bfbd09..d2d2beb 100644 --- a/merge.c +++ b/merge.c @@ -6,23 +6,26 @@ * Copyright 2002 Project Purple */ -#include #include #include +#include +#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) { @@ -30,6 +33,19 @@ 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. @@ -53,6 +69,31 @@ bool find_packet(struct openpgp_packet_list *packet_list, 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. @@ -105,7 +146,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; } @@ -130,12 +173,18 @@ 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) { 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 @@ -144,7 +193,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; @@ -269,7 +318,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; @@ -307,7 +356,6 @@ 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. - * @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 @@ -315,7 +363,7 @@ 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. */ -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; @@ -325,13 +373,10 @@ int update_keys(struct openpgp_publickey **keys, bool verbose) 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 @@ -348,21 +393,21 @@ int update_keys(struct openpgp_publickey **keys, bool verbose) *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++; }