2 * merge.c - Routines to merge OpenPGP public keys.
4 * Jonathan McDowell <noodles@earth.li>
6 * Copyright 2002-2004 Project Purple
13 #include "decodekey.h"
16 #include "keystructs.h"
23 * compare_packets - Check to see if 2 OpenPGP packets are the same.
24 * @a: The first packet to compare.
25 * @b: The second packet to compare.
27 * Takes 2 packets and returns true if they are the same and false
30 bool compare_packets(struct openpgp_packet *a, struct openpgp_packet *b)
32 return (a->tag == b->tag && a->length == b->length &&
33 !memcmp(a->data, b->data, b->length));
37 * compare_signatures - Check to see if 2 OpenPGP signatures are the same.
38 * @a: The first signature to compare.
39 * @b: The second signature to compare.
41 * Takes 2 signature packets and returns true if they are the same and
44 bool compare_signatures(struct openpgp_packet *a, struct openpgp_packet *b)
46 return (sig_keyid(a) == sig_keyid(b));
50 * find_packet - Checks to see if an OpenPGP packet exists in a list.
51 * @packet_list: The list of packets to look in.
52 * @packet: The packet to look for.
54 * Walks through the packet_list checking to see if the packet given is
55 * present in it. Returns true if it is.
57 bool find_packet(struct openpgp_packet_list *packet_list,
58 struct openpgp_packet *packet)
62 while (!found && packet_list != NULL) {
63 if (compare_packets(packet_list->packet, packet)) {
66 packet_list = packet_list -> next;
73 * find_signature - Checks to see if an OpenPGP signature exists in a list.
74 * @packet_list: The list of packets to look in.
75 * @packet: The signature to look for.
77 * Walks through the packet_list checking to see if the signature given is
78 * present in it. Returns a pointer to it if it is, NULL otherwise.
81 struct openpgp_packet_list *find_signature(
82 struct openpgp_packet_list *packet_list,
83 struct openpgp_packet *packet)
85 struct openpgp_packet_list *found = NULL;
87 while (!found && packet_list != NULL) {
88 if (compare_signatures(packet_list->packet, packet)) {
91 packet_list = packet_list -> next;
98 * get_signed_packet - Gets a signed packet from a list.
99 * @packet_list: The list of packets to look in.
100 * @packet: The packet to look for.
102 * Walks through the signedpacket_list looking for the supplied packet and
103 * returns it if found. Otherwise returns NULL.
105 struct openpgp_signedpacket_list *find_signed_packet(
106 struct openpgp_signedpacket_list *packet_list,
107 struct openpgp_packet *packet)
109 struct openpgp_signedpacket_list *found = NULL;
111 while (found == NULL && packet_list != NULL) {
112 if (compare_packets(packet_list->packet, packet)) {
115 packet_list = packet_list -> next;
122 * remove_signed_packet - Removes a signed packet from a list.
123 * @packet_list: The list of packets to look in.
124 * @packet: The packet to remove.
126 * Walks through the signedpacket_list looking for the supplied packet and
127 * removes it if found. Assumes the packet can only exist a maximum of
130 bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
131 struct openpgp_signedpacket_list **list_end,
132 struct openpgp_packet *packet)
134 struct openpgp_signedpacket_list *cur = NULL;
135 struct openpgp_signedpacket_list *prev = NULL;
138 for (cur = *packet_list; !found && (cur != NULL); cur = cur->next) {
139 if (compare_packets(cur->packet, packet)) {
142 *packet_list = cur->next;
144 prev->next = cur->next;
146 if (cur->next == NULL) {
150 * TODO: Free the removed signed packet...
160 * merge_packet_sigs - Takes 2 signed packets and merges their sigs.
161 * @old: The old signed packet.
162 * @new: The new signed packet.
164 * Takes 2 signed packet list structures and the sigs of the packets on
165 * the head of these structures. These packets must both be the same and
166 * the fully merged structure is returned in old and the minimal
167 * difference to get from old to new in new.
169 int merge_packet_sigs(struct openpgp_signedpacket_list *old,
170 struct openpgp_signedpacket_list *new)
172 struct openpgp_packet_list *lastpacket = NULL;
173 struct openpgp_packet_list *curpacket = NULL;
174 struct openpgp_packet_list *nextpacket = NULL;
176 log_assert(compare_packets(old->packet, new->packet));
178 curpacket = new->sigs;
179 while (curpacket != NULL) {
180 nextpacket = curpacket->next;
182 * TODO: We should be checking the signature and then
183 * potentially merging/replacing it depending on the subpackets
184 * really. For now this stops us adding the same one twice
187 if (find_signature(old->sigs, curpacket->packet)) {
189 * We already have this sig, remove it from the
190 * difference list and free the memory allocated for
193 if (lastpacket != NULL) {
194 lastpacket->next = curpacket->next;
196 log_assert(curpacket == new->sigs);
197 new->sigs = curpacket->next;
199 curpacket->next = NULL;
200 free_packet_list(curpacket);
202 lastpacket = curpacket;
204 curpacket = nextpacket;
206 new->last_sig = lastpacket;
209 * What's left on new->sigs now are the new signatures, so add them to
212 packet_list_add(&old->sigs, &old->last_sig, new->sigs);
218 * merge_signed_packets - Takes 2 lists of signed packets and merges them.
219 * @old: The old signed packet list.
220 * @new: The new signed packet list.
222 * Takes 2 lists of signed packets and merges them. The complete list of
223 * signed packets & sigs is returned in old and the minimal set of
224 * differences required to get from old to new in new.
226 int merge_signed_packets(struct openpgp_signedpacket_list **old,
227 struct openpgp_signedpacket_list **old_end,
228 struct openpgp_signedpacket_list **new,
229 struct openpgp_signedpacket_list **new_end)
231 struct openpgp_signedpacket_list *curelem = NULL;
232 struct openpgp_signedpacket_list *newelem = NULL;
234 for (curelem = *old; curelem != NULL; curelem = curelem->next) {
235 newelem = find_signed_packet(*new, curelem->packet);
236 if (newelem != NULL) {
237 merge_packet_sigs(curelem, newelem);
240 * If there are no sigs left on the new signed packet
241 * then remove it from the list.
243 if (newelem->sigs == NULL) {
244 remove_signed_packet(new,
252 * If *new != NULL now then there might be UIDs on the new key that
253 * weren't on the old key. Walk through them, checking if the UID is
254 * on the old key and if not adding them to it.
256 for (curelem = *new; curelem != NULL;
257 curelem = curelem->next) {
259 if (find_signed_packet(*old, curelem->packet) == NULL) {
260 ADD_PACKET_TO_LIST((*old_end),
261 packet_dup(curelem->packet));
265 packet_list_add(&(*old_end)->sigs,
266 &(*old_end)->last_sig,
275 * merge_keys - Takes 2 public keys and merges them.
276 * @a: The old key. The merged key is returned in this structure.
277 * @b: The new key. The changed from old to new keys are returned in this
280 * This function takes 2 keys and merges them. It then returns the merged
281 * key in a and the difference between this new key and the original a
282 * in b (ie newb contains the minimum amount of detail necessary to
283 * convert olda to newa). The intention is that olda is provided from
284 * internal storage and oldb from the remote user. newa is then stored in
285 * internal storage and newb is sent to all our keysync peers.
287 int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
289 int rc = 0; /* Return code */
290 struct openpgp_packet_list *curpacket = NULL;
291 struct openpgp_packet_list *lastpacket = NULL;
292 struct openpgp_packet_list *nextpacket = NULL;
294 if (a == NULL || b == NULL) {
299 } else if (get_keyid(a) != get_keyid(b)) {
301 * Key IDs are different.
306 * Key IDs are the same, so I guess we have to merge them.
308 curpacket = b->revocations;
309 while (curpacket != NULL) {
310 nextpacket = curpacket->next;
311 if (find_packet(a->revocations, curpacket->packet)) {
313 * We already have this revocation, remove it
314 * from the difference list and free the memory
318 if (lastpacket != NULL) {
319 lastpacket->next = curpacket->next;
321 log_assert(curpacket == b->revocations);
322 b->revocations = curpacket->next;
324 curpacket->next = NULL;
325 free_packet_list(curpacket);
328 lastpacket = curpacket;
330 curpacket = nextpacket;
332 b->last_revocation = lastpacket;
335 * Anything left on b->revocations doesn't exist on
336 * a->revocations, so add them to the list.
338 packet_list_add(&a->revocations,
343 * Merge uids (signed list).
344 * Merge subkeys (signed list).
346 merge_signed_packets(&a->uids, &a->last_uid,
347 &b->uids, &b->last_uid);
348 merge_signed_packets(&a->subkeys, &a->last_subkey,
349 &b->subkeys, &b->last_subkey);