0.3.5 release.

[onak.git] / merge.h

diff --git a/merge.h b/merge.h
index 3ec64f3ed98b824e5263e7b86b4e5eacec81a78b..cabbc1886a35db8e26654690ba065b51f4185db7 100644 (file)
--- a/merge.h
+++ b/merge.h
@@ -3,9 +3,7 @@
  *
  * Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 Project Purple
- *
- * $Id: merge.h,v 1.5 2003/06/04 20:57:11 noodles Exp $
+ * Copyright 2002-2004 Project Purple
  */
 
 #ifndef __MERGE_H__
@@ -28,15 +26,28 @@
 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.
+ *     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 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.
+ *     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 update_keys(struct openpgp_publickey **keys);
+int merge_packet_sigs(struct openpgp_signedpacket_list *old,
+                       struct openpgp_signedpacket_list *new);
 
 #endif