X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.h;h=bbefcc3e3bf3f0deb27ef7433d2c045af18cfd1f;hb=5ace83529b1fd3e46db32357c8716be51d921449;hp=5abbeca15bdb3ae477ed6fd5b7069fba5bd3708b;hpb=4b8483ae278577a3adc8d84da81d77019704466f;p=onak.git

diff --git a/merge.h b/merge.h
index 5abbeca..bbefcc3 100644
--- a/merge.h
+++ b/merge.h
@@ -25,4 +25,41 @@
  */
 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.
+ *	@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