*
* Jonathan McDowell <noodles@earth.li>
*
- * Copyright 2002 Project Purple
- *
- * $Id: merge.h,v 1.6 2004/05/31 14:16:49 noodles Exp $
+ * 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.
*/
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.