Conflict resolution for keychain syncing

摘要

Some embodiments provide a program that synchronizes a keychain stored on a device with a set of other devices. The keychain includes a set of keychain items. The program receives (1) a list of keychain items for updating the keychain stored on the device and (2) data representing the keychain items specified in the list of keychain items. For each keychain item in the list of keychain items, the program updates the keychain stored on the device with the data that represents the keychain item.

主权项

1. A non-transitory machine-readable medium storing a program which when executed by at least one processing unit of a first device in a set of peer devices synchronizes a keychain stored on the first device with a set of keychains stored on other devices in the set of peer devices, each keychain comprising a set of keychain items, the set of peer devices communicatively coupled to one another in a peer-to-peer network through a set of network storage devices, the program comprising sets of instructions for:
receiving, from the set of network storage devices, a first keychain item for updating the keychain stored on the first device; determining whether a first unique identifier associated with the first keychain item matches a second unique identifier associated with a second keychain item in the keychain stored on the first device; resolving, when the second unique identifier is determined to match the first unique identifier, a conflict between the first and second keychain items and updating the second keychain item based on the resolution, wherein the first keychain item is associated with a first conflict resolver and the second keychain item is associated with a second conflict resolver; and wherein the resolving comprises utilizing the second conflict resolver to resolve the conflict between the first and second keychain items in response to the second conflict resolver being a same conflict resolver or a more recently updated conflict resolver than the first conflict resolver.