X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.c;h=9d03411cde1f3a8eaba108b0fc51c917e152dde5;hb=76f079e5ebdb34acaaa2462a8d915ee06d3c8425;hp=43795966d848cf41e14f42be5127106c667b185b;hpb=abc90dd0602ca116ce61886e962aecd14d4459cc;p=onak.git diff --git a/merge.c b/merge.c index 4379596..9d03411 100644 --- a/merge.c +++ b/merge.c @@ -1,36 +1,59 @@ /* * merge.c - Routines to merge OpenPGP public keys. * - * Jonathan McDowell + * Copyright 2002-2005,2007,2011 Jonathan McDowell * - * Copyright 2002-2005 Project Purple + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . */ +#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" +#include "onak.h" /** * compare_packets - Check to see if 2 OpenPGP packets are the same. * @a: The first packet to compare. * @b: The second packet to compare. * - * Takes 2 packets and returns true if they are the same and false - * otherwise. + * Takes 2 packets and returns 0 if they are the same, -1 if a is + * less than b, or 1 if a is greater than b. */ -bool compare_packets(struct openpgp_packet *a, struct openpgp_packet *b) +int compare_packets(struct openpgp_packet *a, struct openpgp_packet *b) { - return (a->tag == b->tag && a->length == b->length && - !memcmp(a->data, b->data, b->length)); + int ret, len; + + if (a->tag > b->tag) { + ret = 1; + } else if (b->tag > a->tag) { + ret = -1; + } else { + len = (a->length < b->length) ? a->length : b->length; + ret = memcmp(a->data, b->data, len); + if (ret == 0 && a->length != b->length) { + ret = (a->length < b->length) ? -1 : 1; + } + } + + return ret; } /** @@ -43,15 +66,19 @@ bool compare_packets(struct openpgp_packet *a, struct openpgp_packet *b) */ bool compare_signatures(struct openpgp_packet *a, struct openpgp_packet *b) { + uint64_t a_keyid, b_keyid; + time_t a_creation, b_creation; + 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)); + sig_info(a, &a_keyid, &a_creation); + sig_info(b, &b_keyid, &b_creation); + return (a_creation == b_creation) && (a_keyid == b_keyid); } } @@ -69,7 +96,7 @@ bool find_packet(struct openpgp_packet_list *packet_list, bool found = false; while (!found && packet_list != NULL) { - if (compare_packets(packet_list->packet, packet)) { + if (compare_packets(packet_list->packet, packet) == 0) { found = true; } packet_list = packet_list -> next; @@ -118,7 +145,7 @@ struct openpgp_signedpacket_list *find_signed_packet( struct openpgp_signedpacket_list *found = NULL; while (found == NULL && packet_list != NULL) { - if (compare_packets(packet_list->packet, packet)) { + if (compare_packets(packet_list->packet, packet) == 0) { found = packet_list; } packet_list = packet_list -> next; @@ -136,17 +163,15 @@ struct openpgp_signedpacket_list *find_signed_packet( * removes it if found. Assumes the packet can only exist a maximum of * once in the list. */ -bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list, +static void remove_signed_packet(struct openpgp_signedpacket_list **packet_list, struct openpgp_signedpacket_list **list_end, struct openpgp_packet *packet) { struct openpgp_signedpacket_list *cur = NULL; struct openpgp_signedpacket_list *prev = NULL; - bool found = false; - for (cur = *packet_list; !found && (cur != NULL); cur = cur->next) { - if (compare_packets(cur->packet, packet)) { - found = true; + for (cur = *packet_list; cur != NULL; cur = cur->next) { + if (compare_packets(cur->packet, packet) == 0) { if (prev == NULL) { *packet_list = cur->next; } else { @@ -155,14 +180,14 @@ bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list, if (cur->next == NULL) { *list_end = prev; } - /* - * TODO: Free the removed signed packet... - */ + cur->next = NULL; + free_signedpacket_list(cur); + break; } prev = cur; } - return found; + return; } /** @@ -182,7 +207,7 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old, struct openpgp_packet_list *curpacket = NULL; struct openpgp_packet_list *nextpacket = NULL; - log_assert(compare_packets(old->packet, new->packet)); + assert(compare_packets(old->packet, new->packet) == 0); curpacket = new->sigs; while (curpacket != NULL) { @@ -202,7 +227,7 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old, if (lastpacket != NULL) { lastpacket->next = curpacket->next; } else { - log_assert(curpacket == new->sigs); + assert(curpacket == new->sigs); new->sigs = curpacket->next; } curpacket->next = NULL; @@ -299,13 +324,20 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b) struct openpgp_packet_list *curpacket = NULL; struct openpgp_packet_list *lastpacket = NULL; struct openpgp_packet_list *nextpacket = NULL; + uint64_t keya, keyb; if (a == NULL || b == NULL) { /* * Do nothing. */ - rc = 1; - } else if (get_keyid(a) != get_keyid(b)) { + return 1; + } + + if (get_keyid(a, &keya) != ONAK_E_OK) { + return 1; + } else if (get_keyid(b, &keyb) != ONAK_E_OK) { + return 1; + } else if (keya != keyb) { /* * Key IDs are different. */ @@ -314,12 +346,12 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b) /* * Key IDs are the same, so I guess we have to merge them. */ - curpacket = b->revocations; + curpacket = b->sigs; while (curpacket != NULL) { nextpacket = curpacket->next; - if (find_packet(a->revocations, curpacket->packet)) { + if (find_packet(a->sigs, curpacket->packet)) { /* - * We already have this revocation, remove it + * We already have this signature, remove it * from the difference list and free the memory * allocated for it. */ @@ -327,8 +359,8 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b) if (lastpacket != NULL) { lastpacket->next = curpacket->next; } else { - log_assert(curpacket == b->revocations); - b->revocations = curpacket->next; + assert(curpacket == b->sigs); + b->sigs = curpacket->next; } curpacket->next = NULL; free_packet_list(curpacket); @@ -338,15 +370,15 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b) } curpacket = nextpacket; } - b->last_revocation = lastpacket; + b->last_sig = lastpacket; /* - * Anything left on b->revocations doesn't exist on - * a->revocations, so add them to the list. + * Anything left on b->sigs doesn't exist on + * a->sigs, so add them to the list. */ - packet_list_add(&a->revocations, - &a->last_revocation, - b->revocations); + packet_list_add(&a->sigs, + &a->last_sig, + b->sigs); /* * Merge uids (signed list). @@ -359,5 +391,13 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b) } + /* + * If either key was revoked, make sure both the new ones are marked as + * being so. + */ + if (a->revoked || b->revoked) { + a->revoked = b->revoked = true; + } + return rc; }