Merged in sync sync_test_refactor
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Tue, 12 Feb 2019 12:14:45 +0100
branchsync_test_refactor
changeset 32951a12a24ff0e6
parent 3294 7b95c642c491
parent 3291 a55b3189d84b
child 3296 fe7cbfc8e84f
Merged in sync
     1.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Tue Feb 12 12:14:29 2019 +0100
     1.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Tue Feb 12 12:14:45 2019 +0100
     1.3 @@ -13,13 +13,27 @@
     1.4  		43370833203C075A004E6547 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 4337082D203C075A004E6547 /* sqlite3.c */; };
     1.5  		43370834203C075A004E6547 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 43370832203C075A004E6547 /* sqlite3.h */; };
     1.6  		4354FF651D6EDF300033069C /* sync_impl.c in Sources */ = {isa = PBXBuildFile; fileRef = 4354FF641D6EDF300033069C /* sync_impl.c */; };
     1.7 -		4354FF691D6EE1A70033069C /* NULL.c in Sources */ = {isa = PBXBuildFile; fileRef = 4354FF681D6EE1A70033069C /* NULL.c */; };
     1.8 +		438C439B2167582500C7425B /* sync_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 438C43962167582400C7425B /* sync_api.h */; };
     1.9  		438C43B52167752C00C7425B /* labeled_int_list.h in Headers */ = {isa = PBXBuildFile; fileRef = 438C43AF2167752C00C7425B /* labeled_int_list.h */; };
    1.10  		438C43B62167752C00C7425B /* labeled_int_list.c in Sources */ = {isa = PBXBuildFile; fileRef = 438C43B42167752C00C7425B /* labeled_int_list.c */; };
    1.11 -		43BA0F461D7964750059172F /* asn1_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 43BA0F451D7964750059172F /* asn1_helper.c */; };
    1.12 -		43E9BC6A1DB51A1E00AD2352 /* GroupUpdate.c in Sources */ = {isa = PBXBuildFile; fileRef = 43E9BC691DB51A1E00AD2352 /* GroupUpdate.c */; };
    1.13 -		43E9BC7F1DB6720E00AD2352 /* UpdateRequest.c in Sources */ = {isa = PBXBuildFile; fileRef = 43E9BC7E1DB6720E00AD2352 /* UpdateRequest.c */; };
    1.14  		43F6921D1F164A47009418F5 /* resource_id.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F6921C1F164A47009418F5 /* resource_id.c */; };
    1.15 +		43F73BF02166269200AB4524 /* PString.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BEB2166269200AB4524 /* PString.c */; };
    1.16 +		43F73BF2216626E100AB4524 /* Sync_func.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BF1216626E100AB4524 /* Sync_func.c */; };
    1.17 +		43F73BFC216627CC00AB4524 /* CommitAccept.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BF5216627CB00AB4524 /* CommitAccept.c */; };
    1.18 +		43F73BFD216627CC00AB4524 /* TID.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BF6216627CC00AB4524 /* TID.c */; };
    1.19 +		43F73BFE216627CC00AB4524 /* KeySync.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BF7216627CC00AB4524 /* KeySync.c */; };
    1.20 +		43F73BFF216627CC00AB4524 /* GroupKeysAndClose.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BF8216627CC00AB4524 /* GroupKeysAndClose.c */; };
    1.21 +		43F73C00216627CC00AB4524 /* Rollback.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BF9216627CC00AB4524 /* Rollback.c */; };
    1.22 +		43F73C01216627CC00AB4524 /* HandshakeAnswer.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BFA216627CC00AB4524 /* HandshakeAnswer.c */; };
    1.23 +		43F73C02216627CC00AB4524 /* CommitReject.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BFB216627CC00AB4524 /* CommitReject.c */; };
    1.24 +		43F73C0B2166282C00AB4524 /* openpgp_compat.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73C032166282C00AB4524 /* openpgp_compat.c */; };
    1.25 +		43F73C0C2166282C00AB4524 /* Sync_event.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73C042166282C00AB4524 /* Sync_event.c */; };
    1.26 +		43F73C0D2166282C00AB4524 /* key_reset.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73C052166282C00AB4524 /* key_reset.c */; };
    1.27 +		43F73C0E2166282C00AB4524 /* sync_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73C062166282C00AB4524 /* sync_codec.c */; };
    1.28 +		43F73C0F2166282C00AB4524 /* KeySync_fsm.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73C072166282C00AB4524 /* KeySync_fsm.c */; };
    1.29 +		43F73C112166282C00AB4524 /* sync_api.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73C092166282C00AB4524 /* sync_api.c */; };
    1.30 +		43F73C122166282C00AB4524 /* growing_buf.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73C0A2166282C00AB4524 /* growing_buf.c */; };
    1.31 +		43F73C14216628CA00AB4524 /* Sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73C13216628CA00AB4524 /* Sync.c */; };
    1.32  		6400FB861B8CA1C6005221E3 /* libnetpgp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 645922521B8BD32B00A5AF93 /* libnetpgp.a */; };
    1.33  		6400FB8B1B8CA1CF005221E3 /* libetpan-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64289E371B8B630200FC617B /* libetpan-ios.a */; };
    1.34  		644297C51BE11CE0002BC73B /* system.db in Resources */ = {isa = PBXBuildFile; fileRef = 64951A1B1BE0FCD800B10E71 /* system.db */; };
    1.35 @@ -61,8 +75,6 @@
    1.36  		646C410B1D510CD800C63EFF /* constraints.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C40B61D510CD700C63EFF /* constraints.h */; };
    1.37  		646C410C1D510CD800C63EFF /* der_encoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C40B71D510CD700C63EFF /* der_encoder.c */; };
    1.38  		646C410D1D510CD800C63EFF /* der_encoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C40B81D510CD700C63EFF /* der_encoder.h */; };
    1.39 -		646C410E1D510CD800C63EFF /* DeviceGroup-Protocol.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C40B91D510CD700C63EFF /* DeviceGroup-Protocol.c */; };
    1.40 -		646C410F1D510CD800C63EFF /* DeviceGroup-Protocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C40BA1D510CD700C63EFF /* DeviceGroup-Protocol.h */; };
    1.41  		646C41101D510CD800C63EFF /* GroupKeys.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C40BB1D510CD700C63EFF /* GroupKeys.c */; };
    1.42  		646C41111D510CD800C63EFF /* GroupKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C40BC1D510CD700C63EFF /* GroupKeys.h */; };
    1.43  		646C41121D510CD800C63EFF /* HandshakeRequest.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C40BD1D510CD700C63EFF /* HandshakeRequest.c */; };
    1.44 @@ -95,8 +107,6 @@
    1.45  		646C412F1D510CD800C63EFF /* per_support.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C40DA1D510CD800C63EFF /* per_support.h */; };
    1.46  		646C41301D510CD800C63EFF /* PrintableString.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C40DB1D510CD800C63EFF /* PrintableString.c */; };
    1.47  		646C41311D510CD800C63EFF /* PrintableString.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C40DC1D510CD800C63EFF /* PrintableString.h */; };
    1.48 -		646C41321D510CD800C63EFF /* Sync-Protocols.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C40DE1D510CD800C63EFF /* Sync-Protocols.c */; };
    1.49 -		646C41331D510CD800C63EFF /* Sync-Protocols.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C40DF1D510CD800C63EFF /* Sync-Protocols.h */; };
    1.50  		646C41341D510CD800C63EFF /* UTF8String.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C40E01D510CD800C63EFF /* UTF8String.c */; };
    1.51  		646C41351D510CD800C63EFF /* UTF8String.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C40E11D510CD800C63EFF /* UTF8String.h */; };
    1.52  		646C41361D510CD800C63EFF /* Version.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C40E21D510CD800C63EFF /* Version.c */; };
    1.53 @@ -108,12 +118,6 @@
    1.54  		646C413C1D510CD800C63EFF /* xer_support.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C40E81D510CD800C63EFF /* xer_support.c */; };
    1.55  		646C413D1D510CD800C63EFF /* xer_support.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C40E91D510CD800C63EFF /* xer_support.h */; };
    1.56  		646C41451D510D2C00C63EFF /* sync_actions.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C413E1D510D2C00C63EFF /* sync_actions.c */; };
    1.57 -		646C41461D510D2C00C63EFF /* sync_driver.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C413F1D510D2C00C63EFF /* sync_driver.c */; };
    1.58 -		646C41471D510D2C00C63EFF /* sync_fsm.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C41401D510D2C00C63EFF /* sync_fsm.c */; };
    1.59 -		646C41481D510D2C00C63EFF /* sync_fsm.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C41411D510D2C00C63EFF /* sync_fsm.h */; };
    1.60 -		646C41491D510D2C00C63EFF /* sync_send_actions.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C41421D510D2C00C63EFF /* sync_send_actions.c */; };
    1.61 -		646C414A1D510D2C00C63EFF /* sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C41431D510D2C00C63EFF /* sync.c */; };
    1.62 -		646C414B1D510D2C00C63EFF /* sync.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C41441D510D2C00C63EFF /* sync.h */; };
    1.63  		646C414E1D510D8800C63EFF /* baseprotocol.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C414C1D510D8800C63EFF /* baseprotocol.c */; };
    1.64  		646C414F1D510D8800C63EFF /* baseprotocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C414D1D510D8800C63EFF /* baseprotocol.h */; };
    1.65  		649DE08B1B45C19100912F72 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 649DE08A1B45C19100912F72 /* libcurl.a */; };
    1.66 @@ -202,15 +206,28 @@
    1.67  		430D258A1C9ED75A00B94535 /* blacklist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = blacklist.c; path = ../src/blacklist.c; sourceTree = "<group>"; };
    1.68  		4337082D203C075A004E6547 /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../src/sqlite3.c; sourceTree = "<group>"; };
    1.69  		43370832203C075A004E6547 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = ../src/sqlite3.h; sourceTree = "<group>"; };
    1.70 -		4346F86A1ECB38E700381CBE /* sync_app.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = sync_app.h; path = ../src/sync_app.h; sourceTree = "<group>"; };
    1.71  		4354FF641D6EDF300033069C /* sync_impl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync_impl.c; path = ../src/sync_impl.c; sourceTree = "<group>"; };
    1.72 -		4354FF681D6EE1A70033069C /* NULL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = NULL.c; path = ../asn.1/NULL.c; sourceTree = "<group>"; };
    1.73 +		438C43962167582400C7425B /* sync_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sync_api.h; path = ../src/sync_api.h; sourceTree = "<group>"; };
    1.74  		438C43AF2167752C00C7425B /* labeled_int_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = labeled_int_list.h; path = ../src/labeled_int_list.h; sourceTree = "<group>"; };
    1.75  		438C43B42167752C00C7425B /* labeled_int_list.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = labeled_int_list.c; path = ../src/labeled_int_list.c; sourceTree = "<group>"; };
    1.76 -		43BA0F451D7964750059172F /* asn1_helper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = asn1_helper.c; path = ../src/asn1_helper.c; sourceTree = "<group>"; };
    1.77 -		43E9BC691DB51A1E00AD2352 /* GroupUpdate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = GroupUpdate.c; path = ../asn.1/GroupUpdate.c; sourceTree = "<group>"; };
    1.78 -		43E9BC7E1DB6720E00AD2352 /* UpdateRequest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = UpdateRequest.c; path = ../asn.1/UpdateRequest.c; sourceTree = "<group>"; };
    1.79  		43F6921C1F164A47009418F5 /* resource_id.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = resource_id.c; path = ../src/resource_id.c; sourceTree = "<group>"; };
    1.80 +		43F73BEB2166269200AB4524 /* PString.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = PString.c; path = ../asn.1/PString.c; sourceTree = "<group>"; };
    1.81 +		43F73BF1216626E100AB4524 /* Sync_func.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Sync_func.c; path = ../src/Sync_func.c; sourceTree = "<group>"; };
    1.82 +		43F73BF5216627CB00AB4524 /* CommitAccept.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = CommitAccept.c; path = ../asn.1/CommitAccept.c; sourceTree = "<group>"; };
    1.83 +		43F73BF6216627CC00AB4524 /* TID.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = TID.c; path = ../asn.1/TID.c; sourceTree = "<group>"; };
    1.84 +		43F73BF7216627CC00AB4524 /* KeySync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = KeySync.c; path = ../asn.1/KeySync.c; sourceTree = "<group>"; };
    1.85 +		43F73BF8216627CC00AB4524 /* GroupKeysAndClose.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = GroupKeysAndClose.c; path = ../asn.1/GroupKeysAndClose.c; sourceTree = "<group>"; };
    1.86 +		43F73BF9216627CC00AB4524 /* Rollback.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Rollback.c; path = ../asn.1/Rollback.c; sourceTree = "<group>"; };
    1.87 +		43F73BFA216627CC00AB4524 /* HandshakeAnswer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = HandshakeAnswer.c; path = ../asn.1/HandshakeAnswer.c; sourceTree = "<group>"; };
    1.88 +		43F73BFB216627CC00AB4524 /* CommitReject.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = CommitReject.c; path = ../asn.1/CommitReject.c; sourceTree = "<group>"; };
    1.89 +		43F73C032166282C00AB4524 /* openpgp_compat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = openpgp_compat.c; path = ../src/openpgp_compat.c; sourceTree = "<group>"; };
    1.90 +		43F73C042166282C00AB4524 /* Sync_event.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Sync_event.c; path = ../src/Sync_event.c; sourceTree = "<group>"; };
    1.91 +		43F73C052166282C00AB4524 /* key_reset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = key_reset.c; path = ../src/key_reset.c; sourceTree = "<group>"; };
    1.92 +		43F73C062166282C00AB4524 /* sync_codec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync_codec.c; path = ../src/sync_codec.c; sourceTree = "<group>"; };
    1.93 +		43F73C072166282C00AB4524 /* KeySync_fsm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = KeySync_fsm.c; path = ../src/KeySync_fsm.c; sourceTree = "<group>"; };
    1.94 +		43F73C092166282C00AB4524 /* sync_api.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync_api.c; path = ../src/sync_api.c; sourceTree = "<group>"; };
    1.95 +		43F73C0A2166282C00AB4524 /* growing_buf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = growing_buf.c; path = ../src/growing_buf.c; sourceTree = "<group>"; };
    1.96 +		43F73C13216628CA00AB4524 /* Sync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Sync.c; path = ../asn.1/Sync.c; sourceTree = "<group>"; };
    1.97  		644297BF1BE11C65002BC73B /* pEpTrustWords.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = pEpTrustWords.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
    1.98  		644297C11BE11C65002BC73B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
    1.99  		646788871CEB3D120001F54C /* map_asn1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = map_asn1.c; path = ../src/map_asn1.c; sourceTree = "<group>"; };
   1.100 @@ -251,8 +268,6 @@
   1.101  		646C40B61D510CD700C63EFF /* constraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = constraints.h; path = ../asn.1/constraints.h; sourceTree = "<group>"; };
   1.102  		646C40B71D510CD700C63EFF /* der_encoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = der_encoder.c; path = ../asn.1/der_encoder.c; sourceTree = "<group>"; };
   1.103  		646C40B81D510CD700C63EFF /* der_encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = der_encoder.h; path = ../asn.1/der_encoder.h; sourceTree = "<group>"; };
   1.104 -		646C40B91D510CD700C63EFF /* DeviceGroup-Protocol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "DeviceGroup-Protocol.c"; path = "../asn.1/DeviceGroup-Protocol.c"; sourceTree = "<group>"; };
   1.105 -		646C40BA1D510CD700C63EFF /* DeviceGroup-Protocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "DeviceGroup-Protocol.h"; path = "../asn.1/DeviceGroup-Protocol.h"; sourceTree = "<group>"; };
   1.106  		646C40BB1D510CD700C63EFF /* GroupKeys.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = GroupKeys.c; path = ../asn.1/GroupKeys.c; sourceTree = "<group>"; };
   1.107  		646C40BC1D510CD700C63EFF /* GroupKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupKeys.h; path = ../asn.1/GroupKeys.h; sourceTree = "<group>"; };
   1.108  		646C40BD1D510CD700C63EFF /* HandshakeRequest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = HandshakeRequest.c; path = ../asn.1/HandshakeRequest.c; sourceTree = "<group>"; };
   1.109 @@ -285,9 +300,6 @@
   1.110  		646C40DA1D510CD800C63EFF /* per_support.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = per_support.h; path = ../asn.1/per_support.h; sourceTree = "<group>"; };
   1.111  		646C40DB1D510CD800C63EFF /* PrintableString.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = PrintableString.c; path = ../asn.1/PrintableString.c; sourceTree = "<group>"; };
   1.112  		646C40DC1D510CD800C63EFF /* PrintableString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PrintableString.h; path = ../asn.1/PrintableString.h; sourceTree = "<group>"; };
   1.113 -		646C40DD1D510CD800C63EFF /* protocols.asn1 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = protocols.asn1; path = ../asn.1/protocols.asn1; sourceTree = "<group>"; };
   1.114 -		646C40DE1D510CD800C63EFF /* Sync-Protocols.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "Sync-Protocols.c"; path = "../asn.1/Sync-Protocols.c"; sourceTree = "<group>"; };
   1.115 -		646C40DF1D510CD800C63EFF /* Sync-Protocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Sync-Protocols.h"; path = "../asn.1/Sync-Protocols.h"; sourceTree = "<group>"; };
   1.116  		646C40E01D510CD800C63EFF /* UTF8String.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = UTF8String.c; path = ../asn.1/UTF8String.c; sourceTree = "<group>"; };
   1.117  		646C40E11D510CD800C63EFF /* UTF8String.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UTF8String.h; path = ../asn.1/UTF8String.h; sourceTree = "<group>"; };
   1.118  		646C40E21D510CD800C63EFF /* Version.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Version.c; path = ../asn.1/Version.c; sourceTree = "<group>"; };
   1.119 @@ -299,12 +311,6 @@
   1.120  		646C40E81D510CD800C63EFF /* xer_support.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xer_support.c; path = ../asn.1/xer_support.c; sourceTree = "<group>"; };
   1.121  		646C40E91D510CD800C63EFF /* xer_support.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xer_support.h; path = ../asn.1/xer_support.h; sourceTree = "<group>"; };
   1.122  		646C413E1D510D2C00C63EFF /* sync_actions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync_actions.c; path = ../src/sync_actions.c; sourceTree = "<group>"; };
   1.123 -		646C413F1D510D2C00C63EFF /* sync_driver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync_driver.c; path = ../src/sync_driver.c; sourceTree = "<group>"; };
   1.124 -		646C41401D510D2C00C63EFF /* sync_fsm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync_fsm.c; path = ../src/sync_fsm.c; sourceTree = "<group>"; };
   1.125 -		646C41411D510D2C00C63EFF /* sync_fsm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sync_fsm.h; path = ../src/sync_fsm.h; sourceTree = "<group>"; };
   1.126 -		646C41421D510D2C00C63EFF /* sync_send_actions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync_send_actions.c; path = ../src/sync_send_actions.c; sourceTree = "<group>"; };
   1.127 -		646C41431D510D2C00C63EFF /* sync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync.c; path = ../src/sync.c; sourceTree = "<group>"; };
   1.128 -		646C41441D510D2C00C63EFF /* sync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sync.h; path = ../src/sync.h; sourceTree = "<group>"; };
   1.129  		646C414C1D510D8800C63EFF /* baseprotocol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = baseprotocol.c; path = ../src/baseprotocol.c; sourceTree = "<group>"; };
   1.130  		646C414D1D510D8800C63EFF /* baseprotocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = baseprotocol.h; path = ../src/baseprotocol.h; sourceTree = "<group>"; };
   1.131  		64796A3F1B455AA5004B1C24 /* libpEpEngine.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpEpEngine.a; sourceTree = BUILT_PRODUCTS_DIR; };
   1.132 @@ -380,9 +386,15 @@
   1.133  		6406CE811CE382F400C14D77 /* asn.1 */ = {
   1.134  			isa = PBXGroup;
   1.135  			children = (
   1.136 -				43E9BC7E1DB6720E00AD2352 /* UpdateRequest.c */,
   1.137 -				43E9BC691DB51A1E00AD2352 /* GroupUpdate.c */,
   1.138 -				4354FF681D6EE1A70033069C /* NULL.c */,
   1.139 +				43F73C13216628CA00AB4524 /* Sync.c */,
   1.140 +				43F73BF5216627CB00AB4524 /* CommitAccept.c */,
   1.141 +				43F73BFB216627CC00AB4524 /* CommitReject.c */,
   1.142 +				43F73BF8216627CC00AB4524 /* GroupKeysAndClose.c */,
   1.143 +				43F73BFA216627CC00AB4524 /* HandshakeAnswer.c */,
   1.144 +				43F73BF7216627CC00AB4524 /* KeySync.c */,
   1.145 +				43F73BF9216627CC00AB4524 /* Rollback.c */,
   1.146 +				43F73BF6216627CC00AB4524 /* TID.c */,
   1.147 +				43F73BEB2166269200AB4524 /* PString.c */,
   1.148  				646C40951D510CD700C63EFF /* asn_application.h */,
   1.149  				646C40961D510CD700C63EFF /* asn_codecs_prim.c */,
   1.150  				646C40971D510CD700C63EFF /* asn_codecs_prim.h */,
   1.151 @@ -419,8 +431,6 @@
   1.152  				646C40B61D510CD700C63EFF /* constraints.h */,
   1.153  				646C40B71D510CD700C63EFF /* der_encoder.c */,
   1.154  				646C40B81D510CD700C63EFF /* der_encoder.h */,
   1.155 -				646C40B91D510CD700C63EFF /* DeviceGroup-Protocol.c */,
   1.156 -				646C40BA1D510CD700C63EFF /* DeviceGroup-Protocol.h */,
   1.157  				646C40BB1D510CD700C63EFF /* GroupKeys.c */,
   1.158  				646C40BC1D510CD700C63EFF /* GroupKeys.h */,
   1.159  				646C40BD1D510CD700C63EFF /* HandshakeRequest.c */,
   1.160 @@ -453,9 +463,6 @@
   1.161  				646C40DA1D510CD800C63EFF /* per_support.h */,
   1.162  				646C40DB1D510CD800C63EFF /* PrintableString.c */,
   1.163  				646C40DC1D510CD800C63EFF /* PrintableString.h */,
   1.164 -				646C40DD1D510CD800C63EFF /* protocols.asn1 */,
   1.165 -				646C40DE1D510CD800C63EFF /* Sync-Protocols.c */,
   1.166 -				646C40DF1D510CD800C63EFF /* Sync-Protocols.h */,
   1.167  				646C40E01D510CD800C63EFF /* UTF8String.c */,
   1.168  				646C40E11D510CD800C63EFF /* UTF8String.h */,
   1.169  				646C40E21D510CD800C63EFF /* Version.c */,
   1.170 @@ -526,23 +533,24 @@
   1.171  				C46EBAEC216E445F0042A6A3 /* base64.h */,
   1.172  				438C43B42167752C00C7425B /* labeled_int_list.c */,
   1.173  				438C43AF2167752C00C7425B /* labeled_int_list.h */,
   1.174 +				438C43962167582400C7425B /* sync_api.h */,
   1.175 +				43F73C0A2166282C00AB4524 /* growing_buf.c */,
   1.176 +				43F73C052166282C00AB4524 /* key_reset.c */,
   1.177 +				43F73C072166282C00AB4524 /* KeySync_fsm.c */,
   1.178 +				43F73C032166282C00AB4524 /* openpgp_compat.c */,
   1.179 +				43F73C092166282C00AB4524 /* sync_api.c */,
   1.180 +				43F73C062166282C00AB4524 /* sync_codec.c */,
   1.181 +				43F73C042166282C00AB4524 /* Sync_event.c */,
   1.182 +				43F73BF1216626E100AB4524 /* Sync_func.c */,
   1.183  				4337082D203C075A004E6547 /* sqlite3.c */,
   1.184  				43370832203C075A004E6547 /* sqlite3.h */,
   1.185  				430BCC472015EE800077E998 /* pEp_string.c */,
   1.186  				430BCC462015EE800077E998 /* pEp_string.h */,
   1.187  				43F6921C1F164A47009418F5 /* resource_id.c */,
   1.188 -				43BA0F451D7964750059172F /* asn1_helper.c */,
   1.189  				4354FF641D6EDF300033069C /* sync_impl.c */,
   1.190  				646C414C1D510D8800C63EFF /* baseprotocol.c */,
   1.191  				646C414D1D510D8800C63EFF /* baseprotocol.h */,
   1.192  				646C413E1D510D2C00C63EFF /* sync_actions.c */,
   1.193 -				646C413F1D510D2C00C63EFF /* sync_driver.c */,
   1.194 -				646C41401D510D2C00C63EFF /* sync_fsm.c */,
   1.195 -				646C41411D510D2C00C63EFF /* sync_fsm.h */,
   1.196 -				646C41421D510D2C00C63EFF /* sync_send_actions.c */,
   1.197 -				646C41431D510D2C00C63EFF /* sync.c */,
   1.198 -				646C41441D510D2C00C63EFF /* sync.h */,
   1.199 -				4346F86A1ECB38E700381CBE /* sync_app.h */,
   1.200  				646788871CEB3D120001F54C /* map_asn1.c */,
   1.201  				646788881CEB3D120001F54C /* map_asn1.h */,
   1.202  				430D258A1C9ED75A00B94535 /* blacklist.c */,
   1.203 @@ -609,13 +617,13 @@
   1.204  				646C40F71D510CD800C63EFF /* ber_decoder.h in Headers */,
   1.205  				646C41351D510CD800C63EFF /* UTF8String.h in Headers */,
   1.206  				646C40EC1D510CD800C63EFF /* asn_codecs_prim.h in Headers */,
   1.207 +				438C439B2167582500C7425B /* sync_api.h in Headers */,
   1.208  				646C40EE1D510CD800C63EFF /* asn_internal.h in Headers */,
   1.209  				646C413B1D510CD800C63EFF /* xer_encoder.h in Headers */,
   1.210  				646C40F01D510CD800C63EFF /* asn_SEQUENCE_OF.h in Headers */,
   1.211  				646C40FD1D510CD800C63EFF /* BIT_STRING.h in Headers */,
   1.212  				646C411F1D510CD800C63EFF /* INTEGER.h in Headers */,
   1.213  				646C411D1D510CD800C63EFF /* IdentityList.h in Headers */,
   1.214 -				646C41331D510CD800C63EFF /* Sync-Protocols.h in Headers */,
   1.215  				646C41011D510CD800C63EFF /* constr_CHOICE.h in Headers */,
   1.216  				646C40FB1D510CD800C63EFF /* ber_tlv_tag.h in Headers */,
   1.217  				646C414F1D510D8800C63EFF /* baseprotocol.h in Headers */,
   1.218 @@ -634,16 +642,13 @@
   1.219  				646C41191D510CD800C63EFF /* Hex.h in Headers */,
   1.220  				646C41051D510CD800C63EFF /* constr_SEQUENCE.h in Headers */,
   1.221  				646C41151D510CD800C63EFF /* Hash.h in Headers */,
   1.222 -				646C410F1D510CD800C63EFF /* DeviceGroup-Protocol.h in Headers */,
   1.223  				646C40FF1D510CD800C63EFF /* BOOLEAN.h in Headers */,
   1.224 -				646C41481D510D2C00C63EFF /* sync_fsm.h in Headers */,
   1.225  				64A8268C1B455D9D00EECAF0 /* pEpEngine.h in Headers */,
   1.226  				646C41091D510CD800C63EFF /* constr_TYPE.h in Headers */,
   1.227  				430BCC482015EE800077E998 /* pEp_string.h in Headers */,
   1.228  				646C410D1D510CD800C63EFF /* der_encoder.h in Headers */,
   1.229  				646C41231D510CD800C63EFF /* NativeEnumerated.h in Headers */,
   1.230  				646C41071D510CD800C63EFF /* constr_SET_OF.h in Headers */,
   1.231 -				646C414B1D510D2C00C63EFF /* sync.h in Headers */,
   1.232  				C46EBAEE216E445F0042A6A3 /* base64.h in Headers */,
   1.233  				646C411B1D510CD800C63EFF /* Identity.h in Headers */,
   1.234  				646C412B1D510CD800C63EFF /* per_encoder.h in Headers */,
   1.235 @@ -807,7 +812,7 @@
   1.236  			);
   1.237  			runOnlyForDeploymentPostprocessing = 0;
   1.238  			shellPath = /bin/sh;
   1.239 -			shellScript = "bash -l -c \"make -C ../asn.1 generate\"\nbash -l -c \"make -C ../asn.1\"\nbash -l -c \"LC_ALL=en_US.UTF-8 YML_PATH=$HOME/yml2 make -C ../sync\"\n";
   1.240 +			shellScript = "mkdir -p \"$BUILT_PRODUCTS_DIR/include\"\n\ncd \"$SRCROOT/..\"\n\nbash -l -c \"gmake -C sync\"\nbash -l -c \"gmake -C asn.1\"\n";
   1.241  		};
   1.242  /* End PBXShellScriptBuildPhase section */
   1.243  
   1.244 @@ -824,10 +829,11 @@
   1.245  			buildActionMask = 2147483647;
   1.246  			files = (
   1.247  				64A826871B455D0800EECAF0 /* stringpair.c in Sources */,
   1.248 -				43E9BC6A1DB51A1E00AD2352 /* GroupUpdate.c in Sources */,
   1.249 +				43F73C0E2166282C00AB4524 /* sync_codec.c in Sources */,
   1.250  				646C41341D510CD800C63EFF /* UTF8String.c in Sources */,
   1.251  				64A826831B455D0800EECAF0 /* platform_unix.c in Sources */,
   1.252  				646C40F81D510CD800C63EFF /* ber_tlv_length.c in Sources */,
   1.253 +				43F73BF2216626E100AB4524 /* Sync_func.c in Sources */,
   1.254  				646C411C1D510CD800C63EFF /* IdentityList.c in Sources */,
   1.255  				646C41301D510CD800C63EFF /* PrintableString.c in Sources */,
   1.256  				64A8267B1B455D0800EECAF0 /* etpan_mime.c in Sources */,
   1.257 @@ -835,52 +841,57 @@
   1.258  				438C43B62167752C00C7425B /* labeled_int_list.c in Sources */,
   1.259  				646C41261D510CD800C63EFF /* OCTET_STRING.c in Sources */,
   1.260  				646C41141D510CD800C63EFF /* Hash.c in Sources */,
   1.261 -				646C410E1D510CD800C63EFF /* DeviceGroup-Protocol.c in Sources */,
   1.262 +				43F73BF02166269200AB4524 /* PString.c in Sources */,
   1.263  				64A826861B455D0800EECAF0 /* stringlist.c in Sources */,
   1.264  				4354FF651D6EDF300033069C /* sync_impl.c in Sources */,
   1.265  				64A8267E1B455D0800EECAF0 /* message_api.c in Sources */,
   1.266 -				43E9BC7F1DB6720E00AD2352 /* UpdateRequest.c in Sources */,
   1.267  				646C41361D510CD800C63EFF /* Version.c in Sources */,
   1.268  				646C41081D510CD800C63EFF /* constr_TYPE.c in Sources */,
   1.269  				646C40FE1D510CD800C63EFF /* BOOLEAN.c in Sources */,
   1.270  				646C41001D510CD800C63EFF /* constr_CHOICE.c in Sources */,
   1.271  				646C41121D510CD800C63EFF /* HandshakeRequest.c in Sources */,
   1.272 -				646C41471D510D2C00C63EFF /* sync_fsm.c in Sources */,
   1.273  				64A826821B455D0800EECAF0 /* pgp_netpgp.c in Sources */,
   1.274  				646C41101D510CD800C63EFF /* GroupKeys.c in Sources */,
   1.275  				646C40EF1D510CD800C63EFF /* asn_SEQUENCE_OF.c in Sources */,
   1.276  				64A826891B455D0800EECAF0 /* trans_auto.c in Sources */,
   1.277  				646C410C1D510CD800C63EFF /* der_encoder.c in Sources */,
   1.278 +				43F73C112166282C00AB4524 /* sync_api.c in Sources */,
   1.279  				646C41381D510CD800C63EFF /* xer_decoder.c in Sources */,
   1.280 +				43F73BFE216627CC00AB4524 /* KeySync.c in Sources */,
   1.281  				646C41181D510CD800C63EFF /* Hex.c in Sources */,
   1.282  				64A8267D1B455D0800EECAF0 /* keymanagement.c in Sources */,
   1.283 +				43F73C01216627CC00AB4524 /* HandshakeAnswer.c in Sources */,
   1.284  				646C40EB1D510CD800C63EFF /* asn_codecs_prim.c in Sources */,
   1.285  				646C41451D510D2C00C63EFF /* sync_actions.c in Sources */,
   1.286  				646C40F61D510CD800C63EFF /* ber_decoder.c in Sources */,
   1.287  				646C40F11D510CD800C63EFF /* asn_SET_OF.c in Sources */,
   1.288 -				4354FF691D6EE1A70033069C /* NULL.c in Sources */,
   1.289  				646C413A1D510CD800C63EFF /* xer_encoder.c in Sources */,
   1.290 +				43F73BFD216627CC00AB4524 /* TID.c in Sources */,
   1.291  				646C41021D510CD800C63EFF /* constr_SEQUENCE_OF.c in Sources */,
   1.292  				646C410A1D510CD800C63EFF /* constraints.c in Sources */,
   1.293 -				646C41461D510D2C00C63EFF /* sync_driver.c in Sources */,
   1.294  				64A8267C1B455D0800EECAF0 /* identity_list.c in Sources */,
   1.295  				646C40FC1D510CD800C63EFF /* BIT_STRING.c in Sources */,
   1.296  				646C40F41D510CD800C63EFF /* Beacon.c in Sources */,
   1.297 +				43F73C0D2166282C00AB4524 /* key_reset.c in Sources */,
   1.298 +				43F73BFC216627CC00AB4524 /* CommitAccept.c in Sources */,
   1.299  				646C411E1D510CD800C63EFF /* INTEGER.c in Sources */,
   1.300  				646C413C1D510CD800C63EFF /* xer_support.c in Sources */,
   1.301  				64A8268A1B455D0800EECAF0 /* transport.c in Sources */,
   1.302 -				646C41491D510D2C00C63EFF /* sync_send_actions.c in Sources */,
   1.303  				646C41201D510CD800C63EFF /* ISO639-1.c in Sources */,
   1.304 -				646C414A1D510D2C00C63EFF /* sync.c in Sources */,
   1.305  				64A826791B455D0800EECAF0 /* cryptotech.c in Sources */,
   1.306 -				43BA0F461D7964750059172F /* asn1_helper.c in Sources */,
   1.307 +				43F73C0F2166282C00AB4524 /* KeySync_fsm.c in Sources */,
   1.308  				646C412A1D510CD800C63EFF /* per_encoder.c in Sources */,
   1.309  				646C412E1D510CD800C63EFF /* per_support.c in Sources */,
   1.310 +				43F73C0C2166282C00AB4524 /* Sync_event.c in Sources */,
   1.311  				64A826781B455D0800EECAF0 /* bloblist.c in Sources */,
   1.312  				C46EBAED216E445F0042A6A3 /* base64.c in Sources */,
   1.313  				430BCC492015EE800077E998 /* pEp_string.c in Sources */,
   1.314 +				43F73C00216627CC00AB4524 /* Rollback.c in Sources */,
   1.315  				646C41041D510CD800C63EFF /* constr_SEQUENCE.c in Sources */,
   1.316 +				43F73C14216628CA00AB4524 /* Sync.c in Sources */,
   1.317 +				43F73C0B2166282C00AB4524 /* openpgp_compat.c in Sources */,
   1.318  				43370833203C075A004E6547 /* sqlite3.c in Sources */,
   1.319 +				43F73C02216627CC00AB4524 /* CommitReject.c in Sources */,
   1.320  				64A826881B455D0800EECAF0 /* timestamp.c in Sources */,
   1.321  				646C41221D510CD800C63EFF /* NativeEnumerated.c in Sources */,
   1.322  				43F6921D1F164A47009418F5 /* resource_id.c in Sources */,
   1.323 @@ -890,13 +901,14 @@
   1.324  				646C40FA1D510CD800C63EFF /* ber_tlv_tag.c in Sources */,
   1.325  				646C41241D510CD800C63EFF /* NativeInteger.c in Sources */,
   1.326  				646C41061D510CD800C63EFF /* constr_SET_OF.c in Sources */,
   1.327 +				43F73C122166282C00AB4524 /* growing_buf.c in Sources */,
   1.328  				646C412C1D510CD800C63EFF /* per_opentype.c in Sources */,
   1.329  				646C41281D510CD800C63EFF /* per_decoder.c in Sources */,
   1.330  				64A826801B455D0800EECAF0 /* mime.c in Sources */,
   1.331  				64A8267F1B455D0800EECAF0 /* message.c in Sources */,
   1.332  				646C411A1D510CD800C63EFF /* Identity.c in Sources */,
   1.333 +				43F73BFF216627CC00AB4524 /* GroupKeysAndClose.c in Sources */,
   1.334  				64A826811B455D0800EECAF0 /* pEpEngine.c in Sources */,
   1.335 -				646C41321D510CD800C63EFF /* Sync-Protocols.c in Sources */,
   1.336  			);
   1.337  			runOnlyForDeploymentPostprocessing = 0;
   1.338  		};