merge IOSAD-111 sync
authorDirk Zimmermann <dz@pep.security>
Fri, 03 May 2019 15:44:55 +0200
branchsync
changeset 3620ed2e72f63757
parent 3617 3d6f394c9a6c
parent 3619 dab3207c2d7d
child 3622 b23882c843cd
merge IOSAD-111
     1.1 --- a/build-mac/generated-files-asn1.txt	Fri May 03 15:19:14 2019 +0200
     1.2 +++ b/build-mac/generated-files-asn1.txt	Fri May 03 15:44:55 2019 +0200
     1.3 @@ -1,48 +1,109 @@
     1.4  $(SRCROOT)/../asn.1/BIT_STRING.c
     1.5 +$(SRCROOT)/../asn.1/BIT_STRING.h
     1.6  $(SRCROOT)/../asn.1/BOOLEAN.c
     1.7 +$(SRCROOT)/../asn.1/BOOLEAN.h
     1.8  $(SRCROOT)/../asn.1/Beacon.c
     1.9 +$(SRCROOT)/../asn.1/Beacon.h
    1.10  $(SRCROOT)/../asn.1/CommitAccept.c
    1.11 +$(SRCROOT)/../asn.1/CommitAccept.h
    1.12 +$(SRCROOT)/../asn.1/CommitAcceptFirst.c
    1.13 +$(SRCROOT)/../asn.1/CommitAcceptFirst.h
    1.14  $(SRCROOT)/../asn.1/CommitAcceptForGroup.c
    1.15 +$(SRCROOT)/../asn.1/CommitAcceptForGroup.h
    1.16 +$(SRCROOT)/../asn.1/CommitAcceptSecond.c
    1.17 +$(SRCROOT)/../asn.1/CommitAcceptSecond.h
    1.18  $(SRCROOT)/../asn.1/CommitReject.c
    1.19 +$(SRCROOT)/../asn.1/CommitReject.h
    1.20  $(SRCROOT)/../asn.1/GroupKeys.c
    1.21 -$(SRCROOT)/../asn.1/GroupKeysAndClose.c
    1.22 -$(SRCROOT)/../asn.1/HandshakeAnswer.c
    1.23 -$(SRCROOT)/../asn.1/HandshakeRequest.c
    1.24 +$(SRCROOT)/../asn.1/GroupKeys.h
    1.25 +$(SRCROOT)/../asn.1/GroupTrustThisKey.c
    1.26 +$(SRCROOT)/../asn.1/GroupTrustThisKey.h
    1.27  $(SRCROOT)/../asn.1/Hash.c
    1.28 +$(SRCROOT)/../asn.1/Hash.h
    1.29  $(SRCROOT)/../asn.1/Hex.c
    1.30 +$(SRCROOT)/../asn.1/Hex.h
    1.31  $(SRCROOT)/../asn.1/INTEGER.c
    1.32 +$(SRCROOT)/../asn.1/INTEGER.h
    1.33  $(SRCROOT)/../asn.1/ISO639-1.c
    1.34 +$(SRCROOT)/../asn.1/ISO639-1.h
    1.35  $(SRCROOT)/../asn.1/Identity.c
    1.36 +$(SRCROOT)/../asn.1/Identity.h
    1.37  $(SRCROOT)/../asn.1/IdentityList.c
    1.38 +$(SRCROOT)/../asn.1/IdentityList.h
    1.39  $(SRCROOT)/../asn.1/KeySync.c
    1.40 +$(SRCROOT)/../asn.1/KeySync.h
    1.41  $(SRCROOT)/../asn.1/NativeEnumerated.c
    1.42 +$(SRCROOT)/../asn.1/NativeEnumerated.h
    1.43  $(SRCROOT)/../asn.1/NativeInteger.c
    1.44 +$(SRCROOT)/../asn.1/NativeInteger.h
    1.45 +$(SRCROOT)/../asn.1/NegotiationOpen.c
    1.46 +$(SRCROOT)/../asn.1/NegotiationOpen.h
    1.47 +$(SRCROOT)/../asn.1/NegotiationRequest.c
    1.48 +$(SRCROOT)/../asn.1/NegotiationRequest.h
    1.49  $(SRCROOT)/../asn.1/OCTET_STRING.c
    1.50 +$(SRCROOT)/../asn.1/OCTET_STRING.h
    1.51 +$(SRCROOT)/../asn.1/OwnKeys.c
    1.52 +$(SRCROOT)/../asn.1/OwnKeys.h
    1.53 +$(SRCROOT)/../asn.1/OwnKeysFirst.c
    1.54 +$(SRCROOT)/../asn.1/OwnKeysFirst.h
    1.55 +$(SRCROOT)/../asn.1/OwnKeysSecond.c
    1.56 +$(SRCROOT)/../asn.1/OwnKeysSecond.h
    1.57  $(SRCROOT)/../asn.1/PString.c
    1.58 +$(SRCROOT)/../asn.1/PString.h
    1.59  $(SRCROOT)/../asn.1/PrintableString.c
    1.60 +$(SRCROOT)/../asn.1/PrintableString.h
    1.61  $(SRCROOT)/../asn.1/Rollback.c
    1.62 +$(SRCROOT)/../asn.1/Rollback.h
    1.63  $(SRCROOT)/../asn.1/Sync.c
    1.64 +$(SRCROOT)/../asn.1/Sync.h
    1.65  $(SRCROOT)/../asn.1/TID.c
    1.66 +$(SRCROOT)/../asn.1/TID.h
    1.67  $(SRCROOT)/../asn.1/UTF8String.c
    1.68 +$(SRCROOT)/../asn.1/UTF8String.h
    1.69  $(SRCROOT)/../asn.1/Version.c
    1.70 +$(SRCROOT)/../asn.1/Version.h
    1.71  $(SRCROOT)/../asn.1/asn_SEQUENCE_OF.c
    1.72 +$(SRCROOT)/../asn.1/asn_SEQUENCE_OF.h
    1.73  $(SRCROOT)/../asn.1/asn_SET_OF.c
    1.74 +$(SRCROOT)/../asn.1/asn_SET_OF.h
    1.75 +$(SRCROOT)/../asn.1/asn_application.h
    1.76 +$(SRCROOT)/../asn.1/asn_codecs.h
    1.77  $(SRCROOT)/../asn.1/asn_codecs_prim.c
    1.78 +$(SRCROOT)/../asn.1/asn_codecs_prim.h
    1.79 +$(SRCROOT)/../asn.1/asn_internal.h
    1.80 +$(SRCROOT)/../asn.1/asn_system.h
    1.81  $(SRCROOT)/../asn.1/ber_decoder.c
    1.82 +$(SRCROOT)/../asn.1/ber_decoder.h
    1.83  $(SRCROOT)/../asn.1/ber_tlv_length.c
    1.84 +$(SRCROOT)/../asn.1/ber_tlv_length.h
    1.85  $(SRCROOT)/../asn.1/ber_tlv_tag.c
    1.86 +$(SRCROOT)/../asn.1/ber_tlv_tag.h
    1.87  $(SRCROOT)/../asn.1/constr_CHOICE.c
    1.88 +$(SRCROOT)/../asn.1/constr_CHOICE.h
    1.89  $(SRCROOT)/../asn.1/constr_SEQUENCE.c
    1.90 +$(SRCROOT)/../asn.1/constr_SEQUENCE.h
    1.91  $(SRCROOT)/../asn.1/constr_SEQUENCE_OF.c
    1.92 +$(SRCROOT)/../asn.1/constr_SEQUENCE_OF.h
    1.93  $(SRCROOT)/../asn.1/constr_SET_OF.c
    1.94 +$(SRCROOT)/../asn.1/constr_SET_OF.h
    1.95  $(SRCROOT)/../asn.1/constr_TYPE.c
    1.96 +$(SRCROOT)/../asn.1/constr_TYPE.h
    1.97  $(SRCROOT)/../asn.1/constraints.c
    1.98 +$(SRCROOT)/../asn.1/constraints.h
    1.99  $(SRCROOT)/../asn.1/der_encoder.c
   1.100 +$(SRCROOT)/../asn.1/der_encoder.h
   1.101  $(SRCROOT)/../asn.1/pdu_collection.c
   1.102  $(SRCROOT)/../asn.1/per_decoder.c
   1.103 +$(SRCROOT)/../asn.1/per_decoder.h
   1.104  $(SRCROOT)/../asn.1/per_encoder.c
   1.105 +$(SRCROOT)/../asn.1/per_encoder.h
   1.106  $(SRCROOT)/../asn.1/per_opentype.c
   1.107 +$(SRCROOT)/../asn.1/per_opentype.h
   1.108  $(SRCROOT)/../asn.1/per_support.c
   1.109 +$(SRCROOT)/../asn.1/per_support.h
   1.110  $(SRCROOT)/../asn.1/xer_decoder.c
   1.111 +$(SRCROOT)/../asn.1/xer_decoder.h
   1.112  $(SRCROOT)/../asn.1/xer_encoder.c
   1.113 +$(SRCROOT)/../asn.1/xer_encoder.h
   1.114  $(SRCROOT)/../asn.1/xer_support.c
   1.115 +$(SRCROOT)/../asn.1/xer_support.h
     2.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Fri May 03 15:19:14 2019 +0200
     2.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Fri May 03 15:44:55 2019 +0200
     2.3 @@ -11,9 +11,7 @@
     2.4  		1521CEF7225C9AEF00FD2AA2 /* PString.h in Headers */ = {isa = PBXBuildFile; fileRef = 1521CEEA225C9AEE00FD2AA2 /* PString.h */; };
     2.5  		1521CEF8225C9AEF00FD2AA2 /* Rollback.h in Headers */ = {isa = PBXBuildFile; fileRef = 1521CEEB225C9AEE00FD2AA2 /* Rollback.h */; };
     2.6  		1521CEF9225C9AEF00FD2AA2 /* CommitAcceptForGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 1521CEEC225C9AEE00FD2AA2 /* CommitAcceptForGroup.h */; };
     2.7 -		1521CEFA225C9AEF00FD2AA2 /* GroupKeysAndClose.h in Headers */ = {isa = PBXBuildFile; fileRef = 1521CEED225C9AEE00FD2AA2 /* GroupKeysAndClose.h */; };
     2.8  		1521CEFB225C9AEF00FD2AA2 /* CommitAccept.h in Headers */ = {isa = PBXBuildFile; fileRef = 1521CEEE225C9AEE00FD2AA2 /* CommitAccept.h */; };
     2.9 -		1521CEFC225C9AEF00FD2AA2 /* HandshakeAnswer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1521CEEF225C9AEE00FD2AA2 /* HandshakeAnswer.h */; };
    2.10  		1521CEFD225C9AEF00FD2AA2 /* pdu_collection.c in Sources */ = {isa = PBXBuildFile; fileRef = 1521CEF0225C9AEE00FD2AA2 /* pdu_collection.c */; };
    2.11  		1521CEFE225C9AEF00FD2AA2 /* KeySync.h in Headers */ = {isa = PBXBuildFile; fileRef = 1521CEF1225C9AEE00FD2AA2 /* KeySync.h */; };
    2.12  		1521CEFF225C9AEF00FD2AA2 /* CommitReject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1521CEF2225C9AEE00FD2AA2 /* CommitReject.h */; };
    2.13 @@ -22,21 +20,36 @@
    2.14  		430BCC482015EE800077E998 /* pEp_string.h in Headers */ = {isa = PBXBuildFile; fileRef = 430BCC462015EE800077E998 /* pEp_string.h */; };
    2.15  		430BCC492015EE800077E998 /* pEp_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 430BCC472015EE800077E998 /* pEp_string.c */; };
    2.16  		430D258B1C9ED75A00B94535 /* blacklist.c in Sources */ = {isa = PBXBuildFile; fileRef = 430D258A1C9ED75A00B94535 /* blacklist.c */; };
    2.17 +		431F048C2273223600CCE960 /* CommitAcceptSecond.h in Headers */ = {isa = PBXBuildFile; fileRef = 431F04862273223600CCE960 /* CommitAcceptSecond.h */; };
    2.18 +		431F048D2273223600CCE960 /* CommitAcceptSecond.c in Sources */ = {isa = PBXBuildFile; fileRef = 431F048B2273223600CCE960 /* CommitAcceptSecond.c */; };
    2.19 +		431F04902273227900CCE960 /* OwnKeysFirst.h in Headers */ = {isa = PBXBuildFile; fileRef = 431F048E2273227900CCE960 /* OwnKeysFirst.h */; };
    2.20 +		431F04912273227900CCE960 /* OwnKeysFirst.c in Sources */ = {isa = PBXBuildFile; fileRef = 431F048F2273227900CCE960 /* OwnKeysFirst.c */; };
    2.21 +		431F0494227322EF00CCE960 /* CommitAcceptFirst.h in Headers */ = {isa = PBXBuildFile; fileRef = 431F0492227322EF00CCE960 /* CommitAcceptFirst.h */; };
    2.22 +		431F0495227322EF00CCE960 /* CommitAcceptFirst.c in Sources */ = {isa = PBXBuildFile; fileRef = 431F0493227322EF00CCE960 /* CommitAcceptFirst.c */; };
    2.23 +		431F04A22273235300CCE960 /* GroupTrustThisKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 431F049C2273235300CCE960 /* GroupTrustThisKey.h */; };
    2.24 +		431F04A32273235300CCE960 /* GroupTrustThisKey.c in Sources */ = {isa = PBXBuildFile; fileRef = 431F04A12273235300CCE960 /* GroupTrustThisKey.c */; };
    2.25 +		431F04A6227323A400CCE960 /* OwnKeysSecond.h in Headers */ = {isa = PBXBuildFile; fileRef = 431F04A4227323A400CCE960 /* OwnKeysSecond.h */; };
    2.26 +		431F04A7227323A400CCE960 /* OwnKeysSecond.c in Sources */ = {isa = PBXBuildFile; fileRef = 431F04A5227323A400CCE960 /* OwnKeysSecond.c */; };
    2.27 +		431F04AA227323EE00CCE960 /* OwnKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 431F04A8227323EE00CCE960 /* OwnKeys.h */; };
    2.28 +		431F04AB227323EE00CCE960 /* OwnKeys.c in Sources */ = {isa = PBXBuildFile; fileRef = 431F04A9227323EE00CCE960 /* OwnKeys.c */; };
    2.29 +		431F04B722733A7E00CCE960 /* key_reset.h in Headers */ = {isa = PBXBuildFile; fileRef = 431F04B222733A7E00CCE960 /* key_reset.h */; };
    2.30  		43370833203C075A004E6547 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 4337082D203C075A004E6547 /* sqlite3.c */; };
    2.31  		43370834203C075A004E6547 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 43370832203C075A004E6547 /* sqlite3.h */; };
    2.32  		4354FF651D6EDF300033069C /* sync_impl.c in Sources */ = {isa = PBXBuildFile; fileRef = 4354FF641D6EDF300033069C /* sync_impl.c */; };
    2.33  		438C439B2167582500C7425B /* sync_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 438C43962167582400C7425B /* sync_api.h */; };
    2.34  		438C43B52167752C00C7425B /* labeled_int_list.h in Headers */ = {isa = PBXBuildFile; fileRef = 438C43AF2167752C00C7425B /* labeled_int_list.h */; };
    2.35  		438C43B62167752C00C7425B /* labeled_int_list.c in Sources */ = {isa = PBXBuildFile; fileRef = 438C43B42167752C00C7425B /* labeled_int_list.c */; };
    2.36 +		43CC349E2276D31A002F77AF /* NegotiationRequest.c in Sources */ = {isa = PBXBuildFile; fileRef = 43CC349C2276D31A002F77AF /* NegotiationRequest.c */; };
    2.37 +		43CC349F2276D31A002F77AF /* NegotiationRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 43CC349D2276D31A002F77AF /* NegotiationRequest.h */; };
    2.38 +		43CC34A22276D34C002F77AF /* NegotiationOpen.c in Sources */ = {isa = PBXBuildFile; fileRef = 43CC34A02276D34B002F77AF /* NegotiationOpen.c */; };
    2.39 +		43CC34A32276D34C002F77AF /* NegotiationOpen.h in Headers */ = {isa = PBXBuildFile; fileRef = 43CC34A12276D34C002F77AF /* NegotiationOpen.h */; };
    2.40  		43F6921D1F164A47009418F5 /* resource_id.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F6921C1F164A47009418F5 /* resource_id.c */; };
    2.41  		43F73BF02166269200AB4524 /* PString.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BEB2166269200AB4524 /* PString.c */; };
    2.42  		43F73BF2216626E100AB4524 /* Sync_func.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BF1216626E100AB4524 /* Sync_func.c */; };
    2.43  		43F73BFC216627CC00AB4524 /* CommitAccept.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BF5216627CB00AB4524 /* CommitAccept.c */; };
    2.44  		43F73BFD216627CC00AB4524 /* TID.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BF6216627CC00AB4524 /* TID.c */; };
    2.45  		43F73BFE216627CC00AB4524 /* KeySync.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BF7216627CC00AB4524 /* KeySync.c */; };
    2.46 -		43F73BFF216627CC00AB4524 /* GroupKeysAndClose.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BF8216627CC00AB4524 /* GroupKeysAndClose.c */; };
    2.47  		43F73C00216627CC00AB4524 /* Rollback.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BF9216627CC00AB4524 /* Rollback.c */; };
    2.48 -		43F73C01216627CC00AB4524 /* HandshakeAnswer.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BFA216627CC00AB4524 /* HandshakeAnswer.c */; };
    2.49  		43F73C02216627CC00AB4524 /* CommitReject.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BFB216627CC00AB4524 /* CommitReject.c */; };
    2.50  		43F73C0B2166282C00AB4524 /* openpgp_compat.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73C032166282C00AB4524 /* openpgp_compat.c */; };
    2.51  		43F73C0C2166282C00AB4524 /* Sync_event.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73C042166282C00AB4524 /* Sync_event.c */; };
    2.52 @@ -89,8 +102,6 @@
    2.53  		646C410D1D510CD800C63EFF /* der_encoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C40B81D510CD700C63EFF /* der_encoder.h */; };
    2.54  		646C41101D510CD800C63EFF /* GroupKeys.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C40BB1D510CD700C63EFF /* GroupKeys.c */; };
    2.55  		646C41111D510CD800C63EFF /* GroupKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C40BC1D510CD700C63EFF /* GroupKeys.h */; };
    2.56 -		646C41121D510CD800C63EFF /* HandshakeRequest.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C40BD1D510CD700C63EFF /* HandshakeRequest.c */; };
    2.57 -		646C41131D510CD800C63EFF /* HandshakeRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C40BE1D510CD700C63EFF /* HandshakeRequest.h */; };
    2.58  		646C41141D510CD800C63EFF /* Hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C40BF1D510CD700C63EFF /* Hash.c */; };
    2.59  		646C41151D510CD800C63EFF /* Hash.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C40C01D510CD700C63EFF /* Hash.h */; };
    2.60  		646C41181D510CD800C63EFF /* Hex.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C40C31D510CD700C63EFF /* Hex.c */; };
    2.61 @@ -224,9 +235,7 @@
    2.62  		1521CEEA225C9AEE00FD2AA2 /* PString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PString.h; path = ../asn.1/PString.h; sourceTree = "<group>"; };
    2.63  		1521CEEB225C9AEE00FD2AA2 /* Rollback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Rollback.h; path = ../asn.1/Rollback.h; sourceTree = "<group>"; };
    2.64  		1521CEEC225C9AEE00FD2AA2 /* CommitAcceptForGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommitAcceptForGroup.h; path = ../asn.1/CommitAcceptForGroup.h; sourceTree = "<group>"; };
    2.65 -		1521CEED225C9AEE00FD2AA2 /* GroupKeysAndClose.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupKeysAndClose.h; path = ../asn.1/GroupKeysAndClose.h; sourceTree = "<group>"; };
    2.66  		1521CEEE225C9AEE00FD2AA2 /* CommitAccept.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommitAccept.h; path = ../asn.1/CommitAccept.h; sourceTree = "<group>"; };
    2.67 -		1521CEEF225C9AEE00FD2AA2 /* HandshakeAnswer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HandshakeAnswer.h; path = ../asn.1/HandshakeAnswer.h; sourceTree = "<group>"; };
    2.68  		1521CEF0225C9AEE00FD2AA2 /* pdu_collection.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pdu_collection.c; path = ../asn.1/pdu_collection.c; sourceTree = "<group>"; };
    2.69  		1521CEF1225C9AEE00FD2AA2 /* KeySync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KeySync.h; path = ../asn.1/KeySync.h; sourceTree = "<group>"; };
    2.70  		1521CEF2225C9AEE00FD2AA2 /* CommitReject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommitReject.h; path = ../asn.1/CommitReject.h; sourceTree = "<group>"; };
    2.71 @@ -236,12 +245,29 @@
    2.72  		430BCC462015EE800077E998 /* pEp_string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pEp_string.h; path = ../src/pEp_string.h; sourceTree = "<group>"; };
    2.73  		430BCC472015EE800077E998 /* pEp_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pEp_string.c; path = ../src/pEp_string.c; sourceTree = "<group>"; };
    2.74  		430D258A1C9ED75A00B94535 /* blacklist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = blacklist.c; path = ../src/blacklist.c; sourceTree = "<group>"; };
    2.75 +		431F04862273223600CCE960 /* CommitAcceptSecond.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommitAcceptSecond.h; path = ../asn.1/CommitAcceptSecond.h; sourceTree = "<group>"; };
    2.76 +		431F048B2273223600CCE960 /* CommitAcceptSecond.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = CommitAcceptSecond.c; path = ../asn.1/CommitAcceptSecond.c; sourceTree = "<group>"; };
    2.77 +		431F048E2273227900CCE960 /* OwnKeysFirst.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OwnKeysFirst.h; path = ../asn.1/OwnKeysFirst.h; sourceTree = "<group>"; };
    2.78 +		431F048F2273227900CCE960 /* OwnKeysFirst.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = OwnKeysFirst.c; path = ../asn.1/OwnKeysFirst.c; sourceTree = "<group>"; };
    2.79 +		431F0492227322EF00CCE960 /* CommitAcceptFirst.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommitAcceptFirst.h; path = ../asn.1/CommitAcceptFirst.h; sourceTree = "<group>"; };
    2.80 +		431F0493227322EF00CCE960 /* CommitAcceptFirst.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = CommitAcceptFirst.c; path = ../asn.1/CommitAcceptFirst.c; sourceTree = "<group>"; };
    2.81 +		431F049C2273235300CCE960 /* GroupTrustThisKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupTrustThisKey.h; path = ../asn.1/GroupTrustThisKey.h; sourceTree = "<group>"; };
    2.82 +		431F04A12273235300CCE960 /* GroupTrustThisKey.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = GroupTrustThisKey.c; path = ../asn.1/GroupTrustThisKey.c; sourceTree = "<group>"; };
    2.83 +		431F04A4227323A400CCE960 /* OwnKeysSecond.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OwnKeysSecond.h; path = ../asn.1/OwnKeysSecond.h; sourceTree = "<group>"; };
    2.84 +		431F04A5227323A400CCE960 /* OwnKeysSecond.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = OwnKeysSecond.c; path = ../asn.1/OwnKeysSecond.c; sourceTree = "<group>"; };
    2.85 +		431F04A8227323EE00CCE960 /* OwnKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OwnKeys.h; path = ../asn.1/OwnKeys.h; sourceTree = "<group>"; };
    2.86 +		431F04A9227323EE00CCE960 /* OwnKeys.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = OwnKeys.c; path = ../asn.1/OwnKeys.c; sourceTree = "<group>"; };
    2.87 +		431F04B222733A7E00CCE960 /* key_reset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = key_reset.h; path = ../src/key_reset.h; sourceTree = "<group>"; };
    2.88  		4337082D203C075A004E6547 /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../src/sqlite3.c; sourceTree = "<group>"; };
    2.89  		43370832203C075A004E6547 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = ../src/sqlite3.h; sourceTree = "<group>"; };
    2.90  		4354FF641D6EDF300033069C /* sync_impl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync_impl.c; path = ../src/sync_impl.c; sourceTree = "<group>"; };
    2.91  		438C43962167582400C7425B /* sync_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sync_api.h; path = ../src/sync_api.h; sourceTree = "<group>"; };
    2.92  		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>"; };
    2.93  		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>"; };
    2.94 +		43CC349C2276D31A002F77AF /* NegotiationRequest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = NegotiationRequest.c; path = ../asn.1/NegotiationRequest.c; sourceTree = "<group>"; };
    2.95 +		43CC349D2276D31A002F77AF /* NegotiationRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NegotiationRequest.h; path = ../asn.1/NegotiationRequest.h; sourceTree = "<group>"; };
    2.96 +		43CC34A02276D34B002F77AF /* NegotiationOpen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = NegotiationOpen.c; path = ../asn.1/NegotiationOpen.c; sourceTree = "<group>"; };
    2.97 +		43CC34A12276D34C002F77AF /* NegotiationOpen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NegotiationOpen.h; path = ../asn.1/NegotiationOpen.h; sourceTree = "<group>"; };
    2.98  		43D47A8A225CC60600E97C5B /* pEpTrustWords-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "pEpTrustWords-Info.plist"; path = "/Users/dirk/projects/pEp/pEpEngine/build-mac/pEpTrustWords-Info.plist"; sourceTree = "<absolute>"; };
    2.99  		43F6921C1F164A47009418F5 /* resource_id.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = resource_id.c; path = ../src/resource_id.c; sourceTree = "<group>"; };
   2.100  		43F73BEB2166269200AB4524 /* PString.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = PString.c; path = ../asn.1/PString.c; sourceTree = "<group>"; };
   2.101 @@ -249,9 +275,7 @@
   2.102  		43F73BF5216627CB00AB4524 /* CommitAccept.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = CommitAccept.c; path = ../asn.1/CommitAccept.c; sourceTree = "<group>"; };
   2.103  		43F73BF6216627CC00AB4524 /* TID.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = TID.c; path = ../asn.1/TID.c; sourceTree = "<group>"; };
   2.104  		43F73BF7216627CC00AB4524 /* KeySync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = KeySync.c; path = ../asn.1/KeySync.c; sourceTree = "<group>"; };
   2.105 -		43F73BF8216627CC00AB4524 /* GroupKeysAndClose.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = GroupKeysAndClose.c; path = ../asn.1/GroupKeysAndClose.c; sourceTree = "<group>"; };
   2.106  		43F73BF9216627CC00AB4524 /* Rollback.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Rollback.c; path = ../asn.1/Rollback.c; sourceTree = "<group>"; };
   2.107 -		43F73BFA216627CC00AB4524 /* HandshakeAnswer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = HandshakeAnswer.c; path = ../asn.1/HandshakeAnswer.c; sourceTree = "<group>"; };
   2.108  		43F73BFB216627CC00AB4524 /* CommitReject.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = CommitReject.c; path = ../asn.1/CommitReject.c; sourceTree = "<group>"; };
   2.109  		43F73C032166282C00AB4524 /* openpgp_compat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = openpgp_compat.c; path = ../src/openpgp_compat.c; sourceTree = "<group>"; };
   2.110  		43F73C042166282C00AB4524 /* Sync_event.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Sync_event.c; path = ../src/Sync_event.c; sourceTree = "<group>"; };
   2.111 @@ -303,8 +327,6 @@
   2.112  		646C40B81D510CD700C63EFF /* der_encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = der_encoder.h; path = ../asn.1/der_encoder.h; sourceTree = "<group>"; };
   2.113  		646C40BB1D510CD700C63EFF /* GroupKeys.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = GroupKeys.c; path = ../asn.1/GroupKeys.c; sourceTree = "<group>"; };
   2.114  		646C40BC1D510CD700C63EFF /* GroupKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupKeys.h; path = ../asn.1/GroupKeys.h; sourceTree = "<group>"; };
   2.115 -		646C40BD1D510CD700C63EFF /* HandshakeRequest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = HandshakeRequest.c; path = ../asn.1/HandshakeRequest.c; sourceTree = "<group>"; };
   2.116 -		646C40BE1D510CD700C63EFF /* HandshakeRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HandshakeRequest.h; path = ../asn.1/HandshakeRequest.h; sourceTree = "<group>"; };
   2.117  		646C40BF1D510CD700C63EFF /* Hash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Hash.c; path = ../asn.1/Hash.c; sourceTree = "<group>"; };
   2.118  		646C40C01D510CD700C63EFF /* Hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Hash.h; path = ../asn.1/Hash.h; sourceTree = "<group>"; };
   2.119  		646C40C31D510CD700C63EFF /* Hex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Hex.c; path = ../asn.1/Hex.c; sourceTree = "<group>"; };
   2.120 @@ -426,12 +448,26 @@
   2.121  		6406CE811CE382F400C14D77 /* asn.1 */ = {
   2.122  			isa = PBXGroup;
   2.123  			children = (
   2.124 +				43CC34A02276D34B002F77AF /* NegotiationOpen.c */,
   2.125 +				43CC34A12276D34C002F77AF /* NegotiationOpen.h */,
   2.126 +				43CC349C2276D31A002F77AF /* NegotiationRequest.c */,
   2.127 +				43CC349D2276D31A002F77AF /* NegotiationRequest.h */,
   2.128 +				431F04A12273235300CCE960 /* GroupTrustThisKey.c */,
   2.129 +				431F049C2273235300CCE960 /* GroupTrustThisKey.h */,
   2.130 +				431F04A9227323EE00CCE960 /* OwnKeys.c */,
   2.131 +				431F04A8227323EE00CCE960 /* OwnKeys.h */,
   2.132 +				431F048F2273227900CCE960 /* OwnKeysFirst.c */,
   2.133 +				431F048E2273227900CCE960 /* OwnKeysFirst.h */,
   2.134 +				431F04A5227323A400CCE960 /* OwnKeysSecond.c */,
   2.135 +				431F04A4227323A400CCE960 /* OwnKeysSecond.h */,
   2.136 +				431F0493227322EF00CCE960 /* CommitAcceptFirst.c */,
   2.137 +				431F0492227322EF00CCE960 /* CommitAcceptFirst.h */,
   2.138 +				431F048B2273223600CCE960 /* CommitAcceptSecond.c */,
   2.139 +				431F04862273223600CCE960 /* CommitAcceptSecond.h */,
   2.140  				1521CEEE225C9AEE00FD2AA2 /* CommitAccept.h */,
   2.141  				1521CEE9225C9AED00FD2AA2 /* CommitAcceptForGroup.c */,
   2.142  				1521CEEC225C9AEE00FD2AA2 /* CommitAcceptForGroup.h */,
   2.143  				1521CEF2225C9AEE00FD2AA2 /* CommitReject.h */,
   2.144 -				1521CEED225C9AEE00FD2AA2 /* GroupKeysAndClose.h */,
   2.145 -				1521CEEF225C9AEE00FD2AA2 /* HandshakeAnswer.h */,
   2.146  				1521CEF1225C9AEE00FD2AA2 /* KeySync.h */,
   2.147  				1521CEF0225C9AEE00FD2AA2 /* pdu_collection.c */,
   2.148  				1521CEEA225C9AEE00FD2AA2 /* PString.h */,
   2.149 @@ -442,8 +478,6 @@
   2.150  				43F73C13216628CA00AB4524 /* Sync.c */,
   2.151  				43F73BF5216627CB00AB4524 /* CommitAccept.c */,
   2.152  				43F73BFB216627CC00AB4524 /* CommitReject.c */,
   2.153 -				43F73BF8216627CC00AB4524 /* GroupKeysAndClose.c */,
   2.154 -				43F73BFA216627CC00AB4524 /* HandshakeAnswer.c */,
   2.155  				43F73BF7216627CC00AB4524 /* KeySync.c */,
   2.156  				43F73BF9216627CC00AB4524 /* Rollback.c */,
   2.157  				43F73BF6216627CC00AB4524 /* TID.c */,
   2.158 @@ -486,8 +520,6 @@
   2.159  				646C40B81D510CD700C63EFF /* der_encoder.h */,
   2.160  				646C40BB1D510CD700C63EFF /* GroupKeys.c */,
   2.161  				646C40BC1D510CD700C63EFF /* GroupKeys.h */,
   2.162 -				646C40BD1D510CD700C63EFF /* HandshakeRequest.c */,
   2.163 -				646C40BE1D510CD700C63EFF /* HandshakeRequest.h */,
   2.164  				646C40BF1D510CD700C63EFF /* Hash.c */,
   2.165  				646C40C01D510CD700C63EFF /* Hash.h */,
   2.166  				646C40C31D510CD700C63EFF /* Hex.c */,
   2.167 @@ -590,6 +622,7 @@
   2.168  				438C43AF2167752C00C7425B /* labeled_int_list.h */,
   2.169  				438C43962167582400C7425B /* sync_api.h */,
   2.170  				43F73C0A2166282C00AB4524 /* growing_buf.c */,
   2.171 +				431F04B222733A7E00CCE960 /* key_reset.h */,
   2.172  				43F73C052166282C00AB4524 /* key_reset.c */,
   2.173  				43F73C072166282C00AB4524 /* KeySync_fsm.c */,
   2.174  				43F73C032166282C00AB4524 /* openpgp_compat.c */,
   2.175 @@ -669,15 +702,19 @@
   2.176  				646C41111D510CD800C63EFF /* GroupKeys.h in Headers */,
   2.177  				646C40F21D510CD800C63EFF /* asn_SET_OF.h in Headers */,
   2.178  				646C41311D510CD800C63EFF /* PrintableString.h in Headers */,
   2.179 +				431F048C2273223600CCE960 /* CommitAcceptSecond.h in Headers */,
   2.180  				646C40F51D510CD800C63EFF /* Beacon.h in Headers */,
   2.181  				438C43B52167752C00C7425B /* labeled_int_list.h in Headers */,
   2.182  				646C40F71D510CD800C63EFF /* ber_decoder.h in Headers */,
   2.183  				646C41351D510CD800C63EFF /* UTF8String.h in Headers */,
   2.184 +				43CC34A32276D34C002F77AF /* NegotiationOpen.h in Headers */,
   2.185  				646C40EC1D510CD800C63EFF /* asn_codecs_prim.h in Headers */,
   2.186  				438C439B2167582500C7425B /* sync_api.h in Headers */,
   2.187  				646C40EE1D510CD800C63EFF /* asn_internal.h in Headers */,
   2.188  				646C413B1D510CD800C63EFF /* xer_encoder.h in Headers */,
   2.189 +				431F04A6227323A400CCE960 /* OwnKeysSecond.h in Headers */,
   2.190  				646C40F01D510CD800C63EFF /* asn_SEQUENCE_OF.h in Headers */,
   2.191 +				43CC349F2276D31A002F77AF /* NegotiationRequest.h in Headers */,
   2.192  				646C40FD1D510CD800C63EFF /* BIT_STRING.h in Headers */,
   2.193  				646C411F1D510CD800C63EFF /* INTEGER.h in Headers */,
   2.194  				646C411D1D510CD800C63EFF /* IdentityList.h in Headers */,
   2.195 @@ -686,7 +723,6 @@
   2.196  				646C40FB1D510CD800C63EFF /* ber_tlv_tag.h in Headers */,
   2.197  				646C414F1D510D8800C63EFF /* baseprotocol.h in Headers */,
   2.198  				6467888D1CEB3D120001F54C /* map_asn1.h in Headers */,
   2.199 -				646C41131D510CD800C63EFF /* HandshakeRequest.h in Headers */,
   2.200  				1521CEF9225C9AEF00FD2AA2 /* CommitAcceptForGroup.h in Headers */,
   2.201  				646C40F31D510CD800C63EFF /* asn_system.h in Headers */,
   2.202  				43370834203C075A004E6547 /* sqlite3.h in Headers */,
   2.203 @@ -694,18 +730,21 @@
   2.204  				646C41251D510CD800C63EFF /* NativeInteger.h in Headers */,
   2.205  				646C41271D510CD800C63EFF /* OCTET_STRING.h in Headers */,
   2.206  				646C41391D510CD800C63EFF /* xer_decoder.h in Headers */,
   2.207 -				1521CEFA225C9AEF00FD2AA2 /* GroupKeysAndClose.h in Headers */,
   2.208  				646C40EA1D510CD800C63EFF /* asn_application.h in Headers */,
   2.209  				646C41211D510CD800C63EFF /* ISO639-1.h in Headers */,
   2.210 +				431F04B722733A7E00CCE960 /* key_reset.h in Headers */,
   2.211  				646C412D1D510CD800C63EFF /* per_opentype.h in Headers */,
   2.212  				646C413D1D510CD800C63EFF /* xer_support.h in Headers */,
   2.213  				646C41191D510CD800C63EFF /* Hex.h in Headers */,
   2.214 +				431F04902273227900CCE960 /* OwnKeysFirst.h in Headers */,
   2.215  				646C41051D510CD800C63EFF /* constr_SEQUENCE.h in Headers */,
   2.216  				1521CF01225C9AEF00FD2AA2 /* TID.h in Headers */,
   2.217  				646C41151D510CD800C63EFF /* Hash.h in Headers */,
   2.218  				646C40FF1D510CD800C63EFF /* BOOLEAN.h in Headers */,
   2.219  				64A8268C1B455D9D00EECAF0 /* pEpEngine.h in Headers */,
   2.220 +				431F04AA227323EE00CCE960 /* OwnKeys.h in Headers */,
   2.221  				646C41091D510CD800C63EFF /* constr_TYPE.h in Headers */,
   2.222 +				431F0494227322EF00CCE960 /* CommitAcceptFirst.h in Headers */,
   2.223  				430BCC482015EE800077E998 /* pEp_string.h in Headers */,
   2.224  				1521CEFF225C9AEF00FD2AA2 /* CommitReject.h in Headers */,
   2.225  				646C410D1D510CD800C63EFF /* der_encoder.h in Headers */,
   2.226 @@ -718,7 +757,7 @@
   2.227  				646C412B1D510CD800C63EFF /* per_encoder.h in Headers */,
   2.228  				646C40F91D510CD800C63EFF /* ber_tlv_length.h in Headers */,
   2.229  				646C41291D510CD800C63EFF /* per_decoder.h in Headers */,
   2.230 -				1521CEFC225C9AEF00FD2AA2 /* HandshakeAnswer.h in Headers */,
   2.231 +				431F04A22273235300CCE960 /* GroupTrustThisKey.h in Headers */,
   2.232  			);
   2.233  			runOnlyForDeploymentPostprocessing = 0;
   2.234  		};
   2.235 @@ -903,10 +942,13 @@
   2.236  				64A826871B455D0800EECAF0 /* stringpair.c in Sources */,
   2.237  				43F73C0E2166282C00AB4524 /* sync_codec.c in Sources */,
   2.238  				1521CEF6225C9AEF00FD2AA2 /* CommitAcceptForGroup.c in Sources */,
   2.239 +				431F04912273227900CCE960 /* OwnKeysFirst.c in Sources */,
   2.240 +				431F04A32273235300CCE960 /* GroupTrustThisKey.c in Sources */,
   2.241  				646C41341D510CD800C63EFF /* UTF8String.c in Sources */,
   2.242  				64A826831B455D0800EECAF0 /* platform_unix.c in Sources */,
   2.243  				646C40F81D510CD800C63EFF /* ber_tlv_length.c in Sources */,
   2.244  				43F73BF2216626E100AB4524 /* Sync_func.c in Sources */,
   2.245 +				431F04A7227323A400CCE960 /* OwnKeysSecond.c in Sources */,
   2.246  				646C411C1D510CD800C63EFF /* IdentityList.c in Sources */,
   2.247  				646C41301D510CD800C63EFF /* PrintableString.c in Sources */,
   2.248  				64A8267B1B455D0800EECAF0 /* etpan_mime.c in Sources */,
   2.249 @@ -914,6 +956,7 @@
   2.250  				438C43B62167752C00C7425B /* labeled_int_list.c in Sources */,
   2.251  				646C41261D510CD800C63EFF /* OCTET_STRING.c in Sources */,
   2.252  				646C41141D510CD800C63EFF /* Hash.c in Sources */,
   2.253 +				43CC349E2276D31A002F77AF /* NegotiationRequest.c in Sources */,
   2.254  				43F73BF02166269200AB4524 /* PString.c in Sources */,
   2.255  				64A826861B455D0800EECAF0 /* stringlist.c in Sources */,
   2.256  				4354FF651D6EDF300033069C /* sync_impl.c in Sources */,
   2.257 @@ -922,7 +965,6 @@
   2.258  				646C41081D510CD800C63EFF /* constr_TYPE.c in Sources */,
   2.259  				646C40FE1D510CD800C63EFF /* BOOLEAN.c in Sources */,
   2.260  				646C41001D510CD800C63EFF /* constr_CHOICE.c in Sources */,
   2.261 -				646C41121D510CD800C63EFF /* HandshakeRequest.c in Sources */,
   2.262  				64A826821B455D0800EECAF0 /* pgp_netpgp.c in Sources */,
   2.263  				646C41101D510CD800C63EFF /* GroupKeys.c in Sources */,
   2.264  				646C40EF1D510CD800C63EFF /* asn_SEQUENCE_OF.c in Sources */,
   2.265 @@ -933,12 +975,12 @@
   2.266  				43F73BFE216627CC00AB4524 /* KeySync.c in Sources */,
   2.267  				646C41181D510CD800C63EFF /* Hex.c in Sources */,
   2.268  				64A8267D1B455D0800EECAF0 /* keymanagement.c in Sources */,
   2.269 -				43F73C01216627CC00AB4524 /* HandshakeAnswer.c in Sources */,
   2.270  				646C40EB1D510CD800C63EFF /* asn_codecs_prim.c in Sources */,
   2.271  				646C41451D510D2C00C63EFF /* sync_actions.c in Sources */,
   2.272  				646C40F61D510CD800C63EFF /* ber_decoder.c in Sources */,
   2.273  				646C40F11D510CD800C63EFF /* asn_SET_OF.c in Sources */,
   2.274  				646C413A1D510CD800C63EFF /* xer_encoder.c in Sources */,
   2.275 +				431F04AB227323EE00CCE960 /* OwnKeys.c in Sources */,
   2.276  				43F73BFD216627CC00AB4524 /* TID.c in Sources */,
   2.277  				646C41021D510CD800C63EFF /* constr_SEQUENCE_OF.c in Sources */,
   2.278  				646C410A1D510CD800C63EFF /* constraints.c in Sources */,
   2.279 @@ -969,6 +1011,7 @@
   2.280  				646C41221D510CD800C63EFF /* NativeEnumerated.c in Sources */,
   2.281  				43F6921D1F164A47009418F5 /* resource_id.c in Sources */,
   2.282  				430D258B1C9ED75A00B94535 /* blacklist.c in Sources */,
   2.283 +				431F0495227322EF00CCE960 /* CommitAcceptFirst.c in Sources */,
   2.284  				646C414E1D510D8800C63EFF /* baseprotocol.c in Sources */,
   2.285  				6467888C1CEB3D120001F54C /* map_asn1.c in Sources */,
   2.286  				646C40FA1D510CD800C63EFF /* ber_tlv_tag.c in Sources */,
   2.287 @@ -979,9 +1022,10 @@
   2.288  				646C412C1D510CD800C63EFF /* per_opentype.c in Sources */,
   2.289  				646C41281D510CD800C63EFF /* per_decoder.c in Sources */,
   2.290  				64A826801B455D0800EECAF0 /* mime.c in Sources */,
   2.291 +				431F048D2273223600CCE960 /* CommitAcceptSecond.c in Sources */,
   2.292  				64A8267F1B455D0800EECAF0 /* message.c in Sources */,
   2.293 +				43CC34A22276D34C002F77AF /* NegotiationOpen.c in Sources */,
   2.294  				646C411A1D510CD800C63EFF /* Identity.c in Sources */,
   2.295 -				43F73BFF216627CC00AB4524 /* GroupKeysAndClose.c in Sources */,
   2.296  				64A826811B455D0800EECAF0 /* pEpEngine.c in Sources */,
   2.297  			);
   2.298  			runOnlyForDeploymentPostprocessing = 0;