merge IOSAD-161 sync
authorDirk Zimmermann <dz@pep.security>
Wed, 08 Jan 2020 10:40:56 +0100
branchsync
changeset 430899d387bd6f8d
parent 4296 9b0161ee85d0
parent 4307 2e2b0b1df24d
child 4309 bf381df7e2ee
child 4311 d86602e53471
merge IOSAD-161
     1.1 --- a/build-mac/generated-files-asn1.txt	Tue Jan 07 12:21:43 2020 +0100
     1.2 +++ b/build-mac/generated-files-asn1.txt	Wed Jan 08 10:40:56 2020 +0100
     1.3 @@ -4,6 +4,10 @@
     1.4  $(SRCROOT)/../asn.1/BOOLEAN.h
     1.5  $(SRCROOT)/../asn.1/Beacon.c
     1.6  $(SRCROOT)/../asn.1/Beacon.h
     1.7 +$(SRCROOT)/../asn.1/Command.c
     1.8 +$(SRCROOT)/../asn.1/Command.h
     1.9 +$(SRCROOT)/../asn.1/Commands.c
    1.10 +$(SRCROOT)/../asn.1/Commands.h
    1.11  $(SRCROOT)/../asn.1/CommitAccept.c
    1.12  $(SRCROOT)/../asn.1/CommitAccept.h
    1.13  $(SRCROOT)/../asn.1/CommitAcceptForGroup.c
    1.14 @@ -14,6 +18,8 @@
    1.15  $(SRCROOT)/../asn.1/CommitAcceptRequester.h
    1.16  $(SRCROOT)/../asn.1/CommitReject.c
    1.17  $(SRCROOT)/../asn.1/CommitReject.h
    1.18 +$(SRCROOT)/../asn.1/Distribution.c
    1.19 +$(SRCROOT)/../asn.1/Distribution.h
    1.20  $(SRCROOT)/../asn.1/GroupHandshake.c
    1.21  $(SRCROOT)/../asn.1/GroupHandshake.h
    1.22  $(SRCROOT)/../asn.1/GroupKeyReset.c
    1.23 @@ -38,8 +44,10 @@
    1.24  $(SRCROOT)/../asn.1/Identity.h
    1.25  $(SRCROOT)/../asn.1/IdentityList.c
    1.26  $(SRCROOT)/../asn.1/IdentityList.h
    1.27 -$(SRCROOT)/../asn.1/InitGroupKeyReset.c
    1.28 -$(SRCROOT)/../asn.1/InitGroupKeyReset.h
    1.29 +$(SRCROOT)/../asn.1/InitUnledGroupKeyReset.c
    1.30 +$(SRCROOT)/../asn.1/InitUnledGroupKeyReset.h
    1.31 +$(SRCROOT)/../asn.1/KeyReset.c
    1.32 +$(SRCROOT)/../asn.1/KeyReset.h
    1.33  $(SRCROOT)/../asn.1/KeySync.c
    1.34  $(SRCROOT)/../asn.1/KeySync.h
    1.35  $(SRCROOT)/../asn.1/NativeEnumerated.c
     2.1 --- a/build-mac/generated-files-sync.txt	Tue Jan 07 12:21:43 2020 +0100
     2.2 +++ b/build-mac/generated-files-sync.txt	Wed Jan 08 10:40:56 2020 +0100
     2.3 @@ -7,5 +7,7 @@
     2.4  $(SRCROOT)/../src/Sync_func.h
     2.5  $(SRCROOT)/../src/Sync_impl.c
     2.6  $(SRCROOT)/../src/Sync_impl.h
     2.7 +$(SRCROOT)/../src/distribution_codec.c
     2.8 +$(SRCROOT)/../src/distribution_codec.h
     2.9  $(SRCROOT)/../src/sync_codec.c
    2.10  $(SRCROOT)/../src/sync_codec.h
     3.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Tue Jan 07 12:21:43 2020 +0100
     3.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Wed Jan 08 10:40:56 2020 +0100
     3.3 @@ -18,22 +18,11 @@
     3.4  		1549181222B92EA20091B6D6 /* libiconv.2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 1549180D22B92EA20091B6D6 /* libiconv.2.tbd */; };
     3.5  		154918AB22B940200091B6D6 /* fsm_common.h in Headers */ = {isa = PBXBuildFile; fileRef = 1549189222B9401D0091B6D6 /* fsm_common.h */; };
     3.6  		154918AC22B940200091B6D6 /* status_to_string.h in Headers */ = {isa = PBXBuildFile; fileRef = 1549189322B9401E0091B6D6 /* status_to_string.h */; };
     3.7 -		154918AF22B940200091B6D6 /* KeySync_fsm.h in Headers */ = {isa = PBXBuildFile; fileRef = 1549189622B9401E0091B6D6 /* KeySync_fsm.h */; };
     3.8 -		154918B022B940200091B6D6 /* KeySync_fsm.c in Sources */ = {isa = PBXBuildFile; fileRef = 1549189722B9401E0091B6D6 /* KeySync_fsm.c */; };
     3.9 -		154918B122B940200091B6D6 /* Sync_actions.c in Sources */ = {isa = PBXBuildFile; fileRef = 1549189822B9401E0091B6D6 /* Sync_actions.c */; };
    3.10  		154918B222B940200091B6D6 /* aux_mime_msg.h in Headers */ = {isa = PBXBuildFile; fileRef = 1549189922B9401E0091B6D6 /* aux_mime_msg.h */; };
    3.11 -		154918B322B940200091B6D6 /* Sync_impl.c in Sources */ = {isa = PBXBuildFile; fileRef = 1549189A22B9401E0091B6D6 /* Sync_impl.c */; };
    3.12 -		154918B522B940200091B6D6 /* sync_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 1549189C22B9401E0091B6D6 /* sync_codec.c */; };
    3.13 -		154918B622B940200091B6D6 /* Sync_event.h in Headers */ = {isa = PBXBuildFile; fileRef = 1549189D22B9401F0091B6D6 /* Sync_event.h */; };
    3.14 -		154918B722B940200091B6D6 /* Sync_event.c in Sources */ = {isa = PBXBuildFile; fileRef = 1549189E22B9401F0091B6D6 /* Sync_event.c */; };
    3.15 -		154918B922B940200091B6D6 /* Sync_func.c in Sources */ = {isa = PBXBuildFile; fileRef = 154918A022B9401F0091B6D6 /* Sync_func.c */; };
    3.16  		154918BA22B940200091B6D6 /* resource_id.h in Headers */ = {isa = PBXBuildFile; fileRef = 154918A122B9401F0091B6D6 /* resource_id.h */; };
    3.17  		154918BB22B940200091B6D6 /* aux_mime_msg.c in Sources */ = {isa = PBXBuildFile; fileRef = 154918A222B9401F0091B6D6 /* aux_mime_msg.c */; };
    3.18  		154918BC22B940200091B6D6 /* openpgp_compat.h in Headers */ = {isa = PBXBuildFile; fileRef = 154918A322B9401F0091B6D6 /* openpgp_compat.h */; };
    3.19  		154918BD22B940200091B6D6 /* growing_buf.h in Headers */ = {isa = PBXBuildFile; fileRef = 154918A422B9401F0091B6D6 /* growing_buf.h */; };
    3.20 -		154918BF22B940200091B6D6 /* sync_codec.h in Headers */ = {isa = PBXBuildFile; fileRef = 154918A622B9401F0091B6D6 /* sync_codec.h */; };
    3.21 -		154918C022B940200091B6D6 /* Sync_func.h in Headers */ = {isa = PBXBuildFile; fileRef = 154918A722B940200091B6D6 /* Sync_func.h */; };
    3.22 -		154918C222B940200091B6D6 /* Sync_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 154918A922B940200091B6D6 /* Sync_impl.h */; };
    3.23  		154918C322B940200091B6D6 /* blacklist.h in Headers */ = {isa = PBXBuildFile; fileRef = 154918AA22B940200091B6D6 /* blacklist.h */; };
    3.24  		158FF95B23C49ED600CB1016 /* KeyReset.c in Sources */ = {isa = PBXBuildFile; fileRef = 158FF95223C49ED500CB1016 /* KeyReset.c */; };
    3.25  		158FF95C23C49ED600CB1016 /* KeyReset.h in Headers */ = {isa = PBXBuildFile; fileRef = 158FF95323C49ED500CB1016 /* KeyReset.h */; };
    3.26 @@ -155,6 +144,25 @@
    3.27  		430BCC482015EE800077E998 /* pEp_string.h in Headers */ = {isa = PBXBuildFile; fileRef = 430BCC462015EE800077E998 /* pEp_string.h */; };
    3.28  		430BCC492015EE800077E998 /* pEp_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 430BCC472015EE800077E998 /* pEp_string.c */; };
    3.29  		430D258B1C9ED75A00B94535 /* blacklist.c in Sources */ = {isa = PBXBuildFile; fileRef = 430D258A1C9ED75A00B94535 /* blacklist.c */; };
    3.30 +		43188A9323C4B2DE008EF79C /* sync_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188A8623C4B2DD008EF79C /* sync_codec.c */; };
    3.31 +		43188A9423C4B2DE008EF79C /* Sync_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188A8723C4B2DD008EF79C /* Sync_impl.h */; };
    3.32 +		43188A9523C4B2DE008EF79C /* Sync_event.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188A8823C4B2DD008EF79C /* Sync_event.h */; };
    3.33 +		43188A9623C4B2DE008EF79C /* KeySync_fsm.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188A8923C4B2DD008EF79C /* KeySync_fsm.h */; };
    3.34 +		43188A9823C4B2DE008EF79C /* KeySync_fsm.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188A8B23C4B2DE008EF79C /* KeySync_fsm.c */; };
    3.35 +		43188A9923C4B2DE008EF79C /* Sync_func.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188A8C23C4B2DE008EF79C /* Sync_func.h */; };
    3.36 +		43188A9B23C4B2DE008EF79C /* Sync_func.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188A8E23C4B2DE008EF79C /* Sync_func.c */; };
    3.37 +		43188A9C23C4B2DE008EF79C /* Sync_impl.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188A8F23C4B2DE008EF79C /* Sync_impl.c */; };
    3.38 +		43188A9D23C4B2DE008EF79C /* Sync_event.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188A9023C4B2DE008EF79C /* Sync_event.c */; };
    3.39 +		43188A9E23C4B2DE008EF79C /* sync_codec.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188A9123C4B2DE008EF79C /* sync_codec.h */; };
    3.40 +		43188A9F23C4B2DE008EF79C /* Sync_actions.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188A9223C4B2DE008EF79C /* Sync_actions.c */; };
    3.41 +		43188AA823C4B4B3008EF79C /* keyreset_command.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188AA223C4B4B3008EF79C /* keyreset_command.c */; };
    3.42 +		43188AA923C4B4B3008EF79C /* keyreset_command.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188AA723C4B4B3008EF79C /* keyreset_command.h */; };
    3.43 +		43188AAC23C4B549008EF79C /* Commands.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188AAA23C4B549008EF79C /* Commands.c */; };
    3.44 +		43188AAD23C4B549008EF79C /* Commands.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188AAB23C4B549008EF79C /* Commands.h */; };
    3.45 +		43188AB623C4B6B9008EF79C /* Command.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188AB023C4B6B9008EF79C /* Command.c */; };
    3.46 +		43188AB723C4B6B9008EF79C /* Command.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188AB523C4B6B9008EF79C /* Command.h */; };
    3.47 +		43188AC023C4BBDE008EF79C /* distribution_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188ABE23C4BBDD008EF79C /* distribution_codec.c */; };
    3.48 +		43188AC123C4BBDE008EF79C /* distribution_codec.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188ABF23C4BBDE008EF79C /* distribution_codec.h */; };
    3.49  		431F04B722733A7E00CCE960 /* key_reset.h in Headers */ = {isa = PBXBuildFile; fileRef = 431F04B222733A7E00CCE960 /* key_reset.h */; };
    3.50  		432713B023A10B07007EAD4A /* GroupKeysForNewMember.c in Sources */ = {isa = PBXBuildFile; fileRef = 432713AF23A10B07007EAD4A /* GroupKeysForNewMember.c */; };
    3.51  		432714AB23A10B3B007EAD4A /* GroupKeysUpdate.c in Sources */ = {isa = PBXBuildFile; fileRef = 432714AA23A10B3B007EAD4A /* GroupKeysUpdate.c */; };
    3.52 @@ -260,22 +268,11 @@
    3.53  		1549181322B92EA50091B6D6 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
    3.54  		1549189222B9401D0091B6D6 /* fsm_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fsm_common.h; path = ../src/fsm_common.h; sourceTree = "<group>"; };
    3.55  		1549189322B9401E0091B6D6 /* status_to_string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = status_to_string.h; path = ../src/status_to_string.h; sourceTree = "<group>"; };
    3.56 -		1549189622B9401E0091B6D6 /* KeySync_fsm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KeySync_fsm.h; path = ../src/KeySync_fsm.h; sourceTree = "<group>"; };
    3.57 -		1549189722B9401E0091B6D6 /* KeySync_fsm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = KeySync_fsm.c; path = ../src/KeySync_fsm.c; sourceTree = "<group>"; };
    3.58 -		1549189822B9401E0091B6D6 /* Sync_actions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Sync_actions.c; path = ../src/Sync_actions.c; sourceTree = "<group>"; };
    3.59  		1549189922B9401E0091B6D6 /* aux_mime_msg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aux_mime_msg.h; path = ../src/aux_mime_msg.h; sourceTree = "<group>"; };
    3.60 -		1549189A22B9401E0091B6D6 /* Sync_impl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Sync_impl.c; path = ../src/Sync_impl.c; sourceTree = "<group>"; };
    3.61 -		1549189C22B9401E0091B6D6 /* sync_codec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync_codec.c; path = ../src/sync_codec.c; sourceTree = "<group>"; };
    3.62 -		1549189D22B9401F0091B6D6 /* Sync_event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sync_event.h; path = ../src/Sync_event.h; sourceTree = "<group>"; };
    3.63 -		1549189E22B9401F0091B6D6 /* Sync_event.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Sync_event.c; path = ../src/Sync_event.c; sourceTree = "<group>"; };
    3.64 -		154918A022B9401F0091B6D6 /* Sync_func.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Sync_func.c; path = ../src/Sync_func.c; sourceTree = "<group>"; };
    3.65  		154918A122B9401F0091B6D6 /* resource_id.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = resource_id.h; path = ../src/resource_id.h; sourceTree = "<group>"; };
    3.66  		154918A222B9401F0091B6D6 /* aux_mime_msg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = aux_mime_msg.c; path = ../src/aux_mime_msg.c; sourceTree = "<group>"; };
    3.67  		154918A322B9401F0091B6D6 /* openpgp_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = openpgp_compat.h; path = ../src/openpgp_compat.h; sourceTree = "<group>"; };
    3.68  		154918A422B9401F0091B6D6 /* growing_buf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = growing_buf.h; path = ../src/growing_buf.h; sourceTree = "<group>"; };
    3.69 -		154918A622B9401F0091B6D6 /* sync_codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sync_codec.h; path = ../src/sync_codec.h; sourceTree = "<group>"; };
    3.70 -		154918A722B940200091B6D6 /* Sync_func.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sync_func.h; path = ../src/Sync_func.h; sourceTree = "<group>"; };
    3.71 -		154918A922B940200091B6D6 /* Sync_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sync_impl.h; path = ../src/Sync_impl.h; sourceTree = "<group>"; };
    3.72  		154918AA22B940200091B6D6 /* blacklist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = blacklist.h; path = ../src/blacklist.h; sourceTree = "<group>"; };
    3.73  		158FF95223C49ED500CB1016 /* KeyReset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = KeyReset.c; path = ../asn.1/KeyReset.c; sourceTree = "<group>"; };
    3.74  		158FF95323C49ED500CB1016 /* KeyReset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KeyReset.h; path = ../asn.1/KeyReset.h; sourceTree = "<group>"; };
    3.75 @@ -397,6 +394,25 @@
    3.76  		430BCC462015EE800077E998 /* pEp_string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pEp_string.h; path = ../src/pEp_string.h; sourceTree = "<group>"; };
    3.77  		430BCC472015EE800077E998 /* pEp_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pEp_string.c; path = ../src/pEp_string.c; sourceTree = "<group>"; };
    3.78  		430D258A1C9ED75A00B94535 /* blacklist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = blacklist.c; path = ../src/blacklist.c; sourceTree = "<group>"; };
    3.79 +		43188A8623C4B2DD008EF79C /* sync_codec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync_codec.c; path = ../src/sync_codec.c; sourceTree = "<group>"; };
    3.80 +		43188A8723C4B2DD008EF79C /* Sync_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sync_impl.h; path = ../src/Sync_impl.h; sourceTree = "<group>"; };
    3.81 +		43188A8823C4B2DD008EF79C /* Sync_event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sync_event.h; path = ../src/Sync_event.h; sourceTree = "<group>"; };
    3.82 +		43188A8923C4B2DD008EF79C /* KeySync_fsm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KeySync_fsm.h; path = ../src/KeySync_fsm.h; sourceTree = "<group>"; };
    3.83 +		43188A8B23C4B2DE008EF79C /* KeySync_fsm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = KeySync_fsm.c; path = ../src/KeySync_fsm.c; sourceTree = "<group>"; };
    3.84 +		43188A8C23C4B2DE008EF79C /* Sync_func.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sync_func.h; path = ../src/Sync_func.h; sourceTree = "<group>"; };
    3.85 +		43188A8E23C4B2DE008EF79C /* Sync_func.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Sync_func.c; path = ../src/Sync_func.c; sourceTree = "<group>"; };
    3.86 +		43188A8F23C4B2DE008EF79C /* Sync_impl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Sync_impl.c; path = ../src/Sync_impl.c; sourceTree = "<group>"; };
    3.87 +		43188A9023C4B2DE008EF79C /* Sync_event.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Sync_event.c; path = ../src/Sync_event.c; sourceTree = "<group>"; };
    3.88 +		43188A9123C4B2DE008EF79C /* sync_codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sync_codec.h; path = ../src/sync_codec.h; sourceTree = "<group>"; };
    3.89 +		43188A9223C4B2DE008EF79C /* Sync_actions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Sync_actions.c; path = ../src/Sync_actions.c; sourceTree = "<group>"; };
    3.90 +		43188AA223C4B4B3008EF79C /* keyreset_command.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = keyreset_command.c; path = ../src/keyreset_command.c; sourceTree = "<group>"; };
    3.91 +		43188AA723C4B4B3008EF79C /* keyreset_command.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = keyreset_command.h; path = ../src/keyreset_command.h; sourceTree = "<group>"; };
    3.92 +		43188AAA23C4B549008EF79C /* Commands.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Commands.c; path = ../asn.1/Commands.c; sourceTree = "<group>"; };
    3.93 +		43188AAB23C4B549008EF79C /* Commands.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Commands.h; path = ../asn.1/Commands.h; sourceTree = "<group>"; };
    3.94 +		43188AB023C4B6B9008EF79C /* Command.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Command.c; path = ../asn.1/Command.c; sourceTree = "<group>"; };
    3.95 +		43188AB523C4B6B9008EF79C /* Command.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Command.h; path = ../asn.1/Command.h; sourceTree = "<group>"; };
    3.96 +		43188ABE23C4BBDD008EF79C /* distribution_codec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = distribution_codec.c; path = ../src/distribution_codec.c; sourceTree = "<group>"; };
    3.97 +		43188ABF23C4BBDE008EF79C /* distribution_codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = distribution_codec.h; path = ../src/distribution_codec.h; sourceTree = "<group>"; };
    3.98  		431F04B222733A7E00CCE960 /* key_reset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = key_reset.h; path = ../src/key_reset.h; sourceTree = "<group>"; };
    3.99  		432713AF23A10B07007EAD4A /* GroupKeysForNewMember.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = GroupKeysForNewMember.c; path = ../asn.1/GroupKeysForNewMember.c; sourceTree = "<group>"; };
   3.100  		432714AA23A10B3B007EAD4A /* GroupKeysUpdate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = GroupKeysUpdate.c; path = ../asn.1/GroupKeysUpdate.c; sourceTree = "<group>"; };
   3.101 @@ -507,9 +523,31 @@
   3.102  			name = sequoia4ios;
   3.103  			sourceTree = "<group>";
   3.104  		};
   3.105 +		43188A5523C4A7F8008EF79C /* sync-generated */ = {
   3.106 +			isa = PBXGroup;
   3.107 +			children = (
   3.108 +				43188A8B23C4B2DE008EF79C /* KeySync_fsm.c */,
   3.109 +				43188A8923C4B2DD008EF79C /* KeySync_fsm.h */,
   3.110 +				43188A9223C4B2DE008EF79C /* Sync_actions.c */,
   3.111 +				43188A8623C4B2DD008EF79C /* sync_codec.c */,
   3.112 +				43188A9123C4B2DE008EF79C /* sync_codec.h */,
   3.113 +				43188A9023C4B2DE008EF79C /* Sync_event.c */,
   3.114 +				43188A8823C4B2DD008EF79C /* Sync_event.h */,
   3.115 +				43188A8E23C4B2DE008EF79C /* Sync_func.c */,
   3.116 +				43188A8C23C4B2DE008EF79C /* Sync_func.h */,
   3.117 +				43188A8F23C4B2DE008EF79C /* Sync_impl.c */,
   3.118 +				43188A8723C4B2DD008EF79C /* Sync_impl.h */,
   3.119 +			);
   3.120 +			name = "sync-generated";
   3.121 +			sourceTree = "<group>";
   3.122 +		};
   3.123  		6406CE811CE382F400C14D77 /* asn.1 */ = {
   3.124  			isa = PBXGroup;
   3.125  			children = (
   3.126 +				43188AB023C4B6B9008EF79C /* Command.c */,
   3.127 +				43188AB523C4B6B9008EF79C /* Command.h */,
   3.128 +				43188AAA23C4B549008EF79C /* Commands.c */,
   3.129 +				43188AAB23C4B549008EF79C /* Commands.h */,
   3.130  				158FF95823C49ED600CB1016 /* Distribution.c */,
   3.131  				158FF95523C49ED600CB1016 /* Distribution.h */,
   3.132  				158FF95723C49ED600CB1016 /* GroupKeyReset.h */,
   3.133 @@ -662,6 +700,7 @@
   3.134  				1549181322B92EA50091B6D6 /* libz.dylib */,
   3.135  				64951A1B1BE0FCD800B10E71 /* system.db */,
   3.136  				64DA24121B832EBA000BEE80 /* libetpan.xcodeproj */,
   3.137 +				43188A5523C4A7F8008EF79C /* sync-generated */,
   3.138  				6406CE811CE382F400C14D77 /* asn.1 */,
   3.139  				64A8264B1B455C5600EECAF0 /* srcref */,
   3.140  				644297C01BE11C65002BC73B /* pEpTrustWords */,
   3.141 @@ -683,25 +722,18 @@
   3.142  		64A8264B1B455C5600EECAF0 /* srcref */ = {
   3.143  			isa = PBXGroup;
   3.144  			children = (
   3.145 +				43188ABE23C4BBDD008EF79C /* distribution_codec.c */,
   3.146 +				43188ABF23C4BBDE008EF79C /* distribution_codec.h */,
   3.147 +				43188AA223C4B4B3008EF79C /* keyreset_command.c */,
   3.148 +				43188AA723C4B4B3008EF79C /* keyreset_command.h */,
   3.149  				154918A222B9401F0091B6D6 /* aux_mime_msg.c */,
   3.150  				1549189922B9401E0091B6D6 /* aux_mime_msg.h */,
   3.151  				154918AA22B940200091B6D6 /* blacklist.h */,
   3.152  				1549189222B9401D0091B6D6 /* fsm_common.h */,
   3.153  				154918A422B9401F0091B6D6 /* growing_buf.h */,
   3.154 -				1549189722B9401E0091B6D6 /* KeySync_fsm.c */,
   3.155 -				1549189622B9401E0091B6D6 /* KeySync_fsm.h */,
   3.156  				154918A322B9401F0091B6D6 /* openpgp_compat.h */,
   3.157  				154918A122B9401F0091B6D6 /* resource_id.h */,
   3.158  				1549189322B9401E0091B6D6 /* status_to_string.h */,
   3.159 -				1549189822B9401E0091B6D6 /* Sync_actions.c */,
   3.160 -				1549189C22B9401E0091B6D6 /* sync_codec.c */,
   3.161 -				154918A622B9401F0091B6D6 /* sync_codec.h */,
   3.162 -				1549189E22B9401F0091B6D6 /* Sync_event.c */,
   3.163 -				1549189D22B9401F0091B6D6 /* Sync_event.h */,
   3.164 -				154918A022B9401F0091B6D6 /* Sync_func.c */,
   3.165 -				154918A722B940200091B6D6 /* Sync_func.h */,
   3.166 -				1549189A22B9401E0091B6D6 /* Sync_impl.c */,
   3.167 -				154918A922B940200091B6D6 /* Sync_impl.h */,
   3.168  				159EF42622B6D3E900149C0C /* pgp_sequoia_internal.h */,
   3.169  				159EF42422B6D3E900149C0C /* pgp_sequoia.c */,
   3.170  				159EF42522B6D3E900149C0C /* pgp_sequoia.h */,
   3.171 @@ -789,6 +821,7 @@
   3.172  				154918AB22B940200091B6D6 /* fsm_common.h in Headers */,
   3.173  				15147EF3237E9EA7003989FE /* GroupKeysAndClose.h in Headers */,
   3.174  				15B037E722B2B822002D664C /* GroupTrustThisKey.h in Headers */,
   3.175 +				43188A9523C4B2DE008EF79C /* Sync_event.h in Headers */,
   3.176  				15B037C522B2B822002D664C /* Beacon.h in Headers */,
   3.177  				15B0380622B2B822002D664C /* CommitAcceptForGroup.h in Headers */,
   3.178  				15B037D622B2B822002D664C /* KeySync.h in Headers */,
   3.179 @@ -796,14 +829,14 @@
   3.180  				15B0381222B2B823002D664C /* OwnKeysOfferer.h in Headers */,
   3.181  				15B037ED22B2B822002D664C /* BIT_STRING.h in Headers */,
   3.182  				15B037DC22B2B822002D664C /* constraints.h in Headers */,
   3.183 -				154918B622B940200091B6D6 /* Sync_event.h in Headers */,
   3.184  				15B037F222B2B822002D664C /* constr_SEQUENCE_OF.h in Headers */,
   3.185  				15B0380022B2B822002D664C /* xer_support.h in Headers */,
   3.186 -				154918C022B940200091B6D6 /* Sync_func.h in Headers */,
   3.187 +				43188AC123C4BBDE008EF79C /* distribution_codec.h in Headers */,
   3.188  				15B037CC22B2B822002D664C /* ber_tlv_tag.h in Headers */,
   3.189  				154918BC22B940200091B6D6 /* openpgp_compat.h in Headers */,
   3.190  				154918B222B940200091B6D6 /* aux_mime_msg.h in Headers */,
   3.191  				15B0381422B2B823002D664C /* asn_SEQUENCE_OF.h in Headers */,
   3.192 +				43188A9623C4B2DE008EF79C /* KeySync_fsm.h in Headers */,
   3.193  				158FF95D23C49ED600CB1016 /* InitUnledGroupKeyReset.h in Headers */,
   3.194  				15B037FA22B2B822002D664C /* INTEGER.h in Headers */,
   3.195  				15B037F322B2B822002D664C /* CommitAccept.h in Headers */,
   3.196 @@ -814,32 +847,35 @@
   3.197  				15B037F922B2B822002D664C /* per_support.h in Headers */,
   3.198  				15B037C022B2B822002D664C /* per_opentype.h in Headers */,
   3.199  				15B0380222B2B822002D664C /* ber_tlv_length.h in Headers */,
   3.200 +				43188AAD23C4B549008EF79C /* Commands.h in Headers */,
   3.201  				15B037B622B2B822002D664C /* IdentityList.h in Headers */,
   3.202  				15B037E622B2B822002D664C /* constr_CHOICE.h in Headers */,
   3.203  				646C414F1D510D8800C63EFF /* baseprotocol.h in Headers */,
   3.204 +				43188A9423C4B2DE008EF79C /* Sync_impl.h in Headers */,
   3.205  				15B0381022B2B823002D664C /* CommitAcceptRequester.h in Headers */,
   3.206  				15B0380A22B2B822002D664C /* asn_internal.h in Headers */,
   3.207  				15B037D922B2B822002D664C /* xer_encoder.h in Headers */,
   3.208  				154918C322B940200091B6D6 /* blacklist.h in Headers */,
   3.209  				158FF95C23C49ED600CB1016 /* KeyReset.h in Headers */,
   3.210  				15B037BF22B2B822002D664C /* BOOLEAN.h in Headers */,
   3.211 +				43188AB723C4B6B9008EF79C /* Command.h in Headers */,
   3.212 +				43188A9E23C4B2DE008EF79C /* sync_codec.h in Headers */,
   3.213  				6467888D1CEB3D120001F54C /* map_asn1.h in Headers */,
   3.214  				154918BA22B940200091B6D6 /* resource_id.h in Headers */,
   3.215  				15B037BA22B2B822002D664C /* asn_system.h in Headers */,
   3.216  				15B037E522B2B822002D664C /* constr_SEQUENCE.h in Headers */,
   3.217  				15B037C822B2B822002D664C /* ISO639-1.h in Headers */,
   3.218  				15B037C922B2B822002D664C /* xer_decoder.h in Headers */,
   3.219 +				43188A9923C4B2DE008EF79C /* Sync_func.h in Headers */,
   3.220  				43370834203C075A004E6547 /* sqlite3.h in Headers */,
   3.221  				15147EF1237E9EA7003989FE /* GroupHandshake.h in Headers */,
   3.222  				15B037D522B2B822002D664C /* TID.h in Headers */,
   3.223  				15B037AD22B2B822002D664C /* Rollback.h in Headers */,
   3.224 -				154918BF22B940200091B6D6 /* sync_codec.h in Headers */,
   3.225  				15B037DB22B2B822002D664C /* asn_codecs_prim.h in Headers */,
   3.226  				431F04B722733A7E00CCE960 /* key_reset.h in Headers */,
   3.227  				64A8268C1B455D9D00EECAF0 /* pEpEngine.h in Headers */,
   3.228  				154918AC22B940200091B6D6 /* status_to_string.h in Headers */,
   3.229  				15B037DA22B2B822002D664C /* asn_SET_OF.h in Headers */,
   3.230 -				154918C222B940200091B6D6 /* Sync_impl.h in Headers */,
   3.231  				15147EF0237E9EA7003989FE /* NegotiationRequestGrouped.h in Headers */,
   3.232  				15B037D422B2B822002D664C /* NegotiationRequest.h in Headers */,
   3.233  				430BCC482015EE800077E998 /* pEp_string.h in Headers */,
   3.234 @@ -849,11 +885,11 @@
   3.235  				159EF42922B6D3E900149C0C /* pgp_sequoia_internal.h in Headers */,
   3.236  				15B037BD22B2B822002D664C /* CommitAcceptOfferer.h in Headers */,
   3.237  				15B037CA22B2B822002D664C /* PrintableString.h in Headers */,
   3.238 +				43188AA923C4B4B3008EF79C /* keyreset_command.h in Headers */,
   3.239  				15B037B222B2B822002D664C /* Identity.h in Headers */,
   3.240  				154918BD22B940200091B6D6 /* growing_buf.h in Headers */,
   3.241  				15B037D322B2B822002D664C /* CommitReject.h in Headers */,
   3.242  				15B0380822B2B822002D664C /* asn_codecs.h in Headers */,
   3.243 -				154918AF22B940200091B6D6 /* KeySync_fsm.h in Headers */,
   3.244  				C46EBAEE216E445F0042A6A3 /* base64.h in Headers */,
   3.245  				15B037F722B2B822002D664C /* per_decoder.h in Headers */,
   3.246  				158FF95F23C49ED600CB1016 /* GroupKeysUpdate.h in Headers */,
   3.247 @@ -1033,7 +1069,6 @@
   3.248  				64A826831B455D0800EECAF0 /* platform_unix.c in Sources */,
   3.249  				15B0380D22B2B822002D664C /* CommitReject.c in Sources */,
   3.250  				15B0380B22B2B822002D664C /* NativeInteger.c in Sources */,
   3.251 -				154918B322B940200091B6D6 /* Sync_impl.c in Sources */,
   3.252  				15147EF2237E9EA7003989FE /* GroupKeysAndClose.c in Sources */,
   3.253  				158FF95B23C49ED600CB1016 /* KeyReset.c in Sources */,
   3.254  				43495982239E417300CF1E12 /* GroupKeyReset.c in Sources */,
   3.255 @@ -1048,6 +1083,8 @@
   3.256  				15B037FE22B2B822002D664C /* xer_encoder.c in Sources */,
   3.257  				158FF96323C49ED600CB1016 /* InitUnledGroupKeyReset.c in Sources */,
   3.258  				159EF42722B6D3E900149C0C /* pgp_sequoia.c in Sources */,
   3.259 +				43188A9323C4B2DE008EF79C /* sync_codec.c in Sources */,
   3.260 +				43188AA823C4B4B3008EF79C /* keyreset_command.c in Sources */,
   3.261  				64A8267B1B455D0800EECAF0 /* etpan_mime.c in Sources */,
   3.262  				15B037AC22B2B822002D664C /* CommitAccept.c in Sources */,
   3.263  				64A8267A1B455D0800EECAF0 /* email.c in Sources */,
   3.264 @@ -1063,6 +1100,7 @@
   3.265  				43E4FBB42362C29100BC01F4 /* GroupHandshake.c in Sources */,
   3.266  				15B037F622B2B822002D664C /* Version.c in Sources */,
   3.267  				15B037C622B2B822002D664C /* xer_support.c in Sources */,
   3.268 +				43188A9B23C4B2DE008EF79C /* Sync_func.c in Sources */,
   3.269  				15B037EC22B2B822002D664C /* constraints.c in Sources */,
   3.270  				15B0380522B2B822002D664C /* asn_codecs_prim.c in Sources */,
   3.271  				64A8267E1B455D0800EECAF0 /* message_api.c in Sources */,
   3.272 @@ -1078,6 +1116,7 @@
   3.273  				64A8267D1B455D0800EECAF0 /* keymanagement.c in Sources */,
   3.274  				64A8267C1B455D0800EECAF0 /* identity_list.c in Sources */,
   3.275  				43F73C0D2166282C00AB4524 /* key_reset.c in Sources */,
   3.276 +				43188AAC23C4B549008EF79C /* Commands.c in Sources */,
   3.277  				15B0380C22B2B822002D664C /* BOOLEAN.c in Sources */,
   3.278  				64A8268A1B455D0800EECAF0 /* transport.c in Sources */,
   3.279  				15B037EA22B2B822002D664C /* BIT_STRING.c in Sources */,
   3.280 @@ -1085,6 +1124,7 @@
   3.281  				15B037C222B2B822002D664C /* asn_SEQUENCE_OF.c in Sources */,
   3.282  				64A826791B455D0800EECAF0 /* cryptotech.c in Sources */,
   3.283  				64A826781B455D0800EECAF0 /* bloblist.c in Sources */,
   3.284 +				43188A9F23C4B2DE008EF79C /* Sync_actions.c in Sources */,
   3.285  				15B0381122B2B823002D664C /* CommitAcceptForGroup.c in Sources */,
   3.286  				C46EBAED216E445F0042A6A3 /* base64.c in Sources */,
   3.287  				430BCC492015EE800077E998 /* pEp_string.c in Sources */,
   3.288 @@ -1093,36 +1133,36 @@
   3.289  				158FF96123C49ED600CB1016 /* Distribution.c in Sources */,
   3.290  				43F73C0B2166282C00AB4524 /* openpgp_compat.c in Sources */,
   3.291  				15B037F422B2B822002D664C /* ber_decoder.c in Sources */,
   3.292 -				154918B022B940200091B6D6 /* KeySync_fsm.c in Sources */,
   3.293  				43370833203C075A004E6547 /* sqlite3.c in Sources */,
   3.294  				15B0380122B2B822002D664C /* asn_SET_OF.c in Sources */,
   3.295 -				154918B522B940200091B6D6 /* sync_codec.c in Sources */,
   3.296  				15B037DE22B2B822002D664C /* KeySync.c in Sources */,
   3.297  				15B037C322B2B822002D664C /* constr_SEQUENCE_OF.c in Sources */,
   3.298  				15B037DF22B2B822002D664C /* IdentityList.c in Sources */,
   3.299  				15B037AE22B2B822002D664C /* NegotiationOpen.c in Sources */,
   3.300 -				154918B122B940200091B6D6 /* Sync_actions.c in Sources */,
   3.301  				15B037B322B2B822002D664C /* Beacon.c in Sources */,
   3.302  				64A826881B455D0800EECAF0 /* timestamp.c in Sources */,
   3.303  				15B037BB22B2B822002D664C /* der_encoder.c in Sources */,
   3.304  				15B037E022B2B822002D664C /* TID.c in Sources */,
   3.305 -				154918B722B940200091B6D6 /* Sync_event.c in Sources */,
   3.306  				43F6921D1F164A47009418F5 /* resource_id.c in Sources */,
   3.307  				15B037AA22B2B822002D664C /* ber_tlv_length.c in Sources */,
   3.308  				15B037F822B2B822002D664C /* OwnKeysOfferer.c in Sources */,
   3.309  				430D258B1C9ED75A00B94535 /* blacklist.c in Sources */,
   3.310  				15B0380E22B2B822002D664C /* PrintableString.c in Sources */,
   3.311  				15B037E922B2B822002D664C /* CommitAcceptOfferer.c in Sources */,
   3.312 +				43188AC023C4BBDE008EF79C /* distribution_codec.c in Sources */,
   3.313  				432713B023A10B07007EAD4A /* GroupKeysForNewMember.c in Sources */,
   3.314 -				154918B922B940200091B6D6 /* Sync_func.c in Sources */,
   3.315  				646C414E1D510D8800C63EFF /* baseprotocol.c in Sources */,
   3.316 +				43188AB623C4B6B9008EF79C /* Command.c in Sources */,
   3.317  				15B037C722B2B822002D664C /* per_decoder.c in Sources */,
   3.318  				6467888C1CEB3D120001F54C /* map_asn1.c in Sources */,
   3.319 +				43188A9C23C4B2DE008EF79C /* Sync_impl.c in Sources */,
   3.320  				43F73C122166282C00AB4524 /* growing_buf.c in Sources */,
   3.321  				64A826801B455D0800EECAF0 /* mime.c in Sources */,
   3.322 +				43188A9D23C4B2DE008EF79C /* Sync_event.c in Sources */,
   3.323  				64A8267F1B455D0800EECAF0 /* message.c in Sources */,
   3.324  				64A826811B455D0800EECAF0 /* pEpEngine.c in Sources */,
   3.325  				15B037FF22B2B822002D664C /* per_opentype.c in Sources */,
   3.326 +				43188A9823C4B2DE008EF79C /* KeySync_fsm.c in Sources */,
   3.327  			);
   3.328  			runOnlyForDeploymentPostprocessing = 0;
   3.329  		};