Switch debian build system to dh

[onak.git] / merge.c

diff --git a/merge.c b/merge.c
index be97eb4782b32f5550f8f63a6db0db87d858c9ac..353a844e6de9a1d346e7f102d7872b4378206137 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -1,9 +1,20 @@
 /*
  * merge.c - Routines to merge OpenPGP public keys.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2005,2007,2011 Jonathan McDowell <noodles@earth.li>
  *
- * 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, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <stdio.h>
@@ -24,13 +35,26 @@
  *     @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;
 }
 
 /**
@@ -73,7 +97,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;
@@ -122,7 +146,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;
@@ -149,7 +173,7 @@ bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
        bool found = false;
 
        for (cur = *packet_list; !found && (cur != NULL); cur = cur->next) {
-               if (compare_packets(cur->packet, packet)) {
+               if (compare_packets(cur->packet, packet) == 0) {
                        found = true;
                        if (prev == NULL) {
                                *packet_list = cur->next;
@@ -186,7 +210,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));
+       log_assert(compare_packets(old->packet, new->packet) == 0);
 
        curpacket = new->sigs;
        while (curpacket != NULL) {
@@ -303,13 +327,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.
                 */