X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.h;h=770da9eee3f331fdcd00e25ddd0dcc765d7cef45;hb=5d25774c5cd9f80709f852f79bce26d582fad360;hp=bbefcc3e3bf3f0deb27ef7433d2c045af18cfd1f;hpb=394938c479925750ffe56c28d281945ba4003a14;p=onak.git

diff --git a/merge.h b/merge.h
index bbefcc3..770da9e 100644
--- a/merge.h
+++ b/merge.h
@@ -3,13 +3,23 @@
  *
  * Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 Project Purple
+ * Copyright 2002-2004 Project Purple
  */
 
 #ifndef __MERGE_H__
 
 #include "keystructs.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 0 if they are the same, -1 if a is
+ *      less than b, or 1 if a is greater than b.
+ */
+int compare_packets(struct openpgp_packet *a, struct openpgp_packet *b);
+
 /**
  *	merge_keys - Takes 2 public keys and merges them.
  *	@a: The old key. The merged key is returned in this structure.
@@ -25,18 +35,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.
- *
- *	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);
-
 /**
  *	get_signed_packet - Gets a signed packet from a list.
  *	@packet_list: The list of packets to look in.