Browse Source

Merge branch 'IPS-67'

IOSAD-230
Dirk Zimmermann 8 months ago
parent
commit
cdb7070e89
3 changed files with 98 additions and 0 deletions
  1. +24
    -0
      build-mac/Subprojects/pEpASN1/pEpASN1.xcodeproj/project.pbxproj
  2. +72
    -0
      build-mac/pEpEngine.xcodeproj/project.pbxproj
  3. +2
    -0
      src/map_asn1.h

+ 24
- 0
build-mac/Subprojects/pEpASN1/pEpASN1.xcodeproj/project.pbxproj View File

@ -406,6 +406,14 @@
15EB0D8C26D7D1C500CDFF4F /* PStringPair.c in Sources */ = {isa = PBXBuildFile; fileRef = 15EB0D8926D7D1C500CDFF4F /* PStringPair.c */; };
15EB0D8D26D7D1C500CDFF4F /* PStringPair.h in Headers */ = {isa = PBXBuildFile; fileRef = 15EB0D8A26D7D1C500CDFF4F /* PStringPair.h */; settings = {ATTRIBUTES = (Public, ); }; };
15EB0D8E26D7D1C500CDFF4F /* PStringPair.h in Headers */ = {isa = PBXBuildFile; fileRef = 15EB0D8A26D7D1C500CDFF4F /* PStringPair.h */; settings = {ATTRIBUTES = (Public, ); }; };
43788990272831D200E80F5A /* PIdentity.c in Sources */ = {isa = PBXBuildFile; fileRef = 4378898E272831D200E80F5A /* PIdentity.c */; };
43788991272831D200E80F5A /* PIdentity.c in Sources */ = {isa = PBXBuildFile; fileRef = 4378898E272831D200E80F5A /* PIdentity.c */; };
43788992272831D200E80F5A /* PIdentity.h in Headers */ = {isa = PBXBuildFile; fileRef = 4378898F272831D200E80F5A /* PIdentity.h */; settings = {ATTRIBUTES = (Public, ); }; };
43788993272831D200E80F5A /* PIdentity.h in Headers */ = {isa = PBXBuildFile; fileRef = 4378898F272831D200E80F5A /* PIdentity.h */; settings = {ATTRIBUTES = (Public, ); }; };
437889962728321800E80F5A /* PIdentityList.c in Sources */ = {isa = PBXBuildFile; fileRef = 437889942728321800E80F5A /* PIdentityList.c */; };
437889972728321800E80F5A /* PIdentityList.c in Sources */ = {isa = PBXBuildFile; fileRef = 437889942728321800E80F5A /* PIdentityList.c */; };
437889982728321800E80F5A /* PIdentityList.h in Headers */ = {isa = PBXBuildFile; fileRef = 437889952728321800E80F5A /* PIdentityList.h */; settings = {ATTRIBUTES = (Public, ); }; };
437889992728321800E80F5A /* PIdentityList.h in Headers */ = {isa = PBXBuildFile; fileRef = 437889952728321800E80F5A /* PIdentityList.h */; settings = {ATTRIBUTES = (Public, ); }; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -631,6 +639,10 @@
15EB0D7726D7CBDE00CDFF4F /* PBlob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PBlob.h; path = ../../../asn.1/PBlob.h; sourceTree = "<group>"; };
15EB0D8926D7D1C500CDFF4F /* PStringPair.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = PStringPair.c; path = ../../../asn.1/PStringPair.c; sourceTree = "<group>"; };
15EB0D8A26D7D1C500CDFF4F /* PStringPair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PStringPair.h; path = ../../../asn.1/PStringPair.h; sourceTree = "<group>"; };
4378898E272831D200E80F5A /* PIdentity.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = PIdentity.c; path = ../../../asn.1/PIdentity.c; sourceTree = "<group>"; };
4378898F272831D200E80F5A /* PIdentity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PIdentity.h; path = ../../../asn.1/PIdentity.h; sourceTree = "<group>"; };
437889942728321800E80F5A /* PIdentityList.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = PIdentityList.c; path = ../../../asn.1/PIdentityList.c; sourceTree = "<group>"; };
437889952728321800E80F5A /* PIdentityList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PIdentityList.h; path = ../../../asn.1/PIdentityList.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -691,6 +703,10 @@
15A3206B260E0376009D07EB /* src */ = {
isa = PBXGroup;
children = (
437889942728321800E80F5A /* PIdentityList.c */,
437889952728321800E80F5A /* PIdentityList.h */,
4378898E272831D200E80F5A /* PIdentity.c */,
4378898F272831D200E80F5A /* PIdentity.h */,
15EB0D8926D7D1C500CDFF4F /* PStringPair.c */,
15EB0D8A26D7D1C500CDFF4F /* PStringPair.h */,
15EB0D7626D7CBDE00CDFF4F /* PBlob.c */,
@ -915,6 +931,7 @@
151581F826CE4E87003D8685 /* asn_SEQUENCE_OF.h in Headers */,
151581DD26CE4E87003D8685 /* asn_internal.h in Headers */,
1515821B26CE4E87003D8685 /* GeneralizedTime.h in Headers */,
43788992272831D200E80F5A /* PIdentity.h in Headers */,
1515822126CE4E87003D8685 /* ISO639-1.h in Headers */,
151581E526CE4E87003D8685 /* TrustRequest.h in Headers */,
1515823026CE4E87003D8685 /* Hash.h in Headers */,
@ -974,6 +991,7 @@
151581DE26CE4E87003D8685 /* per_encoder.h in Headers */,
151581E426CE4E87003D8685 /* NegotiationRequestGrouped.h in Headers */,
15EB0D8226D7CBDE00CDFF4F /* PBlob.h in Headers */,
437889982728321800E80F5A /* PIdentityList.h in Headers */,
151581F626CE4E87003D8685 /* Distribution.h in Headers */,
151581ED26CE4E87003D8685 /* Hex.h in Headers */,
1515820126CE4E87003D8685 /* ContentDisposition.h in Headers */,
@ -1018,6 +1036,7 @@
1515856A26CE5385003D8685 /* GroupKeysForNewMember.h in Headers */,
1515854C26CE5385003D8685 /* ExploreResponse.h in Headers */,
1515859726CE5385003D8685 /* OwnKeysOfferer.h in Headers */,
43788993272831D200E80F5A /* PIdentity.h in Headers */,
1515859526CE5385003D8685 /* GroupTrustThisKey.h in Headers */,
1515855126CE5385003D8685 /* asn_internal.h in Headers */,
15EB0D7926D7CBDE00CDFF4F /* PBlobList.h in Headers */,
@ -1048,6 +1067,7 @@
1515855C26CE5385003D8685 /* CommitAcceptForGroup.h in Headers */,
1515859026CE5385003D8685 /* der_encoder.h in Headers */,
1515856726CE5385003D8685 /* asn_application.h in Headers */,
437889992728321800E80F5A /* PIdentityList.h in Headers */,
1515855026CE5385003D8685 /* Exploration.h in Headers */,
1515855E26CE5385003D8685 /* ISO639-1.h in Headers */,
1515858526CE5385003D8685 /* per_decoder.h in Headers */,
@ -1287,6 +1307,7 @@
15EB0D7C26D7CBDE00CDFF4F /* PStringPairList.c in Sources */,
151584E426CE5347003D8685 /* INTEGER.c in Sources */,
151584E026CE5347003D8685 /* ExploreChallenge.c in Sources */,
437889962728321800E80F5A /* PIdentityList.c in Sources */,
151584EC26CE5347003D8685 /* GroupTrustThisKey.c in Sources */,
151584CD26CE5347003D8685 /* GroupKeysUpdate.c in Sources */,
151584D826CE5347003D8685 /* Distribution.c in Sources */,
@ -1326,6 +1347,7 @@
1515850526CE5347003D8685 /* PStringList.c in Sources */,
151584FC26CE5347003D8685 /* constr_SEQUENCE.c in Sources */,
1515850926CE5347003D8685 /* GroupKeysAndClose.c in Sources */,
43788990272831D200E80F5A /* PIdentity.c in Sources */,
151584D326CE5347003D8685 /* Commands.c in Sources */,
151584D526CE5347003D8685 /* TrustSync.c in Sources */,
151584CA26CE5347003D8685 /* KeySync.c in Sources */,
@ -1386,6 +1408,7 @@
15EB0D7D26D7CBDE00CDFF4F /* PStringPairList.c in Sources */,
1515848826CE5345003D8685 /* INTEGER.c in Sources */,
1515848426CE5345003D8685 /* ExploreChallenge.c in Sources */,
437889972728321800E80F5A /* PIdentityList.c in Sources */,
1515849026CE5345003D8685 /* GroupTrustThisKey.c in Sources */,
1515847126CE5345003D8685 /* GroupKeysUpdate.c in Sources */,
1515847C26CE5345003D8685 /* Distribution.c in Sources */,
@ -1425,6 +1448,7 @@
151584A926CE5345003D8685 /* PStringList.c in Sources */,
151584A026CE5345003D8685 /* constr_SEQUENCE.c in Sources */,
151584AD26CE5345003D8685 /* GroupKeysAndClose.c in Sources */,
43788991272831D200E80F5A /* PIdentity.c in Sources */,
1515847726CE5345003D8685 /* Commands.c in Sources */,
1515847926CE5345003D8685 /* TrustSync.c in Sources */,
1515846E26CE5345003D8685 /* KeySync.c in Sources */,


+ 72
- 0
build-mac/pEpEngine.xcodeproj/project.pbxproj View File

@ -365,6 +365,34 @@
remoteGlobalIDString = 150845DE25F13CE700D46DA6;
remoteInfo = generate_code;
};
4309FF0A27315E560055C6C9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4309FF0327315E560055C6C9 /* pEpTransport.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 43B26350272AA95000EE82BC;
remoteInfo = pEpTransport_macOS;
};
4309FF0C27315E560055C6C9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4309FF0327315E560055C6C9 /* pEpTransport.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 43B263CF272AC13400EE82BC;
remoteInfo = pEpTransport_iOS;
};
4309FF87273170E50055C6C9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4309FF0327315E560055C6C9 /* pEpTransport.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 43B263C6272AC13400EE82BC;
remoteInfo = pEpTransport_iOS;
};
4309FF89273170EF0055C6C9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4309FF0327315E560055C6C9 /* pEpTransport.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 43B2634F272AA95000EE82BC;
remoteInfo = pEpTransport_macOS;
};
43D47AA0225CC82400E97C5B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 64796A371B455AA5004B1C24 /* Project object */;
@ -542,6 +570,7 @@
1585EF5A26A08B2000B822E1 /* CommonPEPDependencies.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CommonPEPDependencies.xcodeproj; path = "../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/CommonPEPDependencies.xcodeproj"; sourceTree = "<group>"; };
15A3203B260E030B009D07EB /* pEpASN1.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pEpASN1.xcodeproj; path = Subprojects/pEpASN1/pEpASN1.xcodeproj; sourceTree = "<group>"; };
15A3261C2611F6B5009D07EB /* PEPSQLITE3.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PEPSQLITE3.xcodeproj; path = Subprojects/PEPSQLITE3/PEPSQLITE3.xcodeproj; sourceTree = "<group>"; };
4309FF0327315E560055C6C9 /* pEpTransport.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pEpTransport.xcodeproj; path = "../../libpEpTransport/build-mac/pEpTransport/pEpTransport.xcodeproj"; sourceTree = "<group>"; };
644297BF1BE11C65002BC73B /* pEpTrustWords.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = pEpTrustWords.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
644297C11BE11C65002BC73B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
64796A3F1B455AA5004B1C24 /* libpEpEngine.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpEpEngine.a; sourceTree = BUILT_PRODUCTS_DIR; };
@ -642,6 +671,15 @@
name = Products;
sourceTree = "<group>";
};
4309FF0427315E560055C6C9 /* Products */ = {
isa = PBXGroup;
children = (
4309FF0B27315E560055C6C9 /* libpEpTransport_macOS.a */,
4309FF0D27315E560055C6C9 /* libpEpTransport_iOS.a */,
);
name = Products;
sourceTree = "<group>";
};
64289E2B1B8B630200FC617B /* Products */ = {
isa = PBXGroup;
children = (
@ -665,6 +703,7 @@
1585EF5A26A08B2000B822E1 /* CommonPEPDependencies.xcodeproj */,
15A3261C2611F6B5009D07EB /* PEPSQLITE3.xcodeproj */,
15A3203B260E030B009D07EB /* pEpASN1.xcodeproj */,
4309FF0327315E560055C6C9 /* pEpTransport.xcodeproj */,
64951A1B1BE0FCD800B10E71 /* system.db */,
64DA24121B832EBA000BEE80 /* libetpan.xcodeproj */,
64A8264B1B455C5600EECAF0 /* src */,
@ -958,6 +997,7 @@
buildRules = (
);
dependencies = (
4309FF8A273170EF0055C6C9 /* PBXTargetDependency */,
1585EF6D26A08B2E00B822E1 /* PBXTargetDependency */,
156AFE832670E6D800AF0039 /* PBXTargetDependency */,
151585FA26CE6A78003D8685 /* PBXTargetDependency */,
@ -1001,6 +1041,7 @@
buildRules = (
);
dependencies = (
4309FF88273170E50055C6C9 /* PBXTargetDependency */,
1585EF6F26A08B3A00B822E1 /* PBXTargetDependency */,
15A3266026120618009D07EB /* PBXTargetDependency */,
15B21C3625FB8DD10097927A /* PBXTargetDependency */,
@ -1064,6 +1105,10 @@
ProductGroup = 15A3261D2611F6B5009D07EB /* Products */;
ProjectRef = 15A3261C2611F6B5009D07EB /* PEPSQLITE3.xcodeproj */;
},
{
ProductGroup = 4309FF0427315E560055C6C9 /* Products */;
ProjectRef = 4309FF0327315E560055C6C9 /* pEpTransport.xcodeproj */;
},
);
projectRoot = "";
targets = (
@ -1105,6 +1150,20 @@
remoteRef = 15A3266526120618009D07EB /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
4309FF0B27315E560055C6C9 /* libpEpTransport_macOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libpEpTransport_macOS.a;
remoteRef = 4309FF0A27315E560055C6C9 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
4309FF0D27315E560055C6C9 /* libpEpTransport_iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libpEpTransport_iOS.a;
remoteRef = 4309FF0C27315E560055C6C9 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
64289E351B8B630200FC617B /* libetpan.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@ -1408,6 +1467,16 @@
target = 150845DE25F13CE700D46DA6 /* generate_code */;
targetProxy = 15B21C3525FB8DD10097927A /* PBXContainerItemProxy */;
};
4309FF88273170E50055C6C9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = pEpTransport_iOS;
targetProxy = 4309FF87273170E50055C6C9 /* PBXContainerItemProxy */;
};
4309FF8A273170EF0055C6C9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = pEpTransport_macOS;
targetProxy = 4309FF89273170EF0055C6C9 /* PBXContainerItemProxy */;
};
43D47AA1225CC82400E97C5B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
platformFilter = ios;
@ -1579,6 +1648,7 @@
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)/Subprojects/pEpASN1/build/include",
"$(PROJECT_DIR)/Subprojects/PEPSQLITE3/build/include",
"$(PROJECT_DIR)/build/include",
"${PROJECT_DIR}/../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/include",
);
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
@ -1750,6 +1820,7 @@
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)/Subprojects/pEpASN1/build/include",
"$(PROJECT_DIR)/Subprojects/PEPSQLITE3/build/include",
"$(PROJECT_DIR)/build/include",
"${PROJECT_DIR}/../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/include",
);
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
@ -1813,6 +1884,7 @@
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)/Subprojects/pEpASN1/build/include",
"$(PROJECT_DIR)/Subprojects/PEPSQLITE3/build/include",
"$(PROJECT_DIR)/build/include",
"${PROJECT_DIR}/../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/include",
);
IPHONEOS_DEPLOYMENT_TARGET = 12.0;


+ 2
- 0
src/map_asn1.h View File

@ -9,6 +9,8 @@
#include "message.h"
#include "ASN1Message.h"
#include "Identity.h" // ENGINE-971
#include "IdentityList.h" // ENGINE-971
#ifdef __cplusplus
extern "C" {


Loading…
Cancel
Save