*
* 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.
*/
int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b);
+/**
+ * get_signed_packet - Gets a signed packet from a list.
+ * @packet_list: The list of packets to look in.
+ * @packet: The packet to look for.
+ *
+ * Walks through the signedpacket_list looking for the supplied packet and
+ * returns it if found. Otherwise returns NULL.
+ */
+struct openpgp_signedpacket_list *find_signed_packet(
+ struct openpgp_signedpacket_list *packet_list,
+ struct openpgp_packet *packet);
+
+/**
+ * merge_packet_sigs - Takes 2 signed packets and merges their sigs.
+ * @old: The old signed packet.
+ * @new: The new signed packet.
+ *
+ * Takes 2 signed packet list structures and the sigs of the packets on
+ * the head of these structures. These packets must both be the same and
+ * the fully merged structure is returned in old and the minimal
+ * difference to get from old to new in new.
+ */
+int merge_packet_sigs(struct openpgp_signedpacket_list *old,
+ struct openpgp_signedpacket_list *new);
+
#endif