pEp.foundation
/
pEpObjCAdapter
11
1
Fork 2
Code Issues Releases Wiki Activity

Merge branch 'master' into IPS-100

Browse Source
IPS-100
Marcel Schneider 1 year ago
parent 82534c7483 814fb3f0e4
commit ef11fc6c95
36 changed files with 735 additions and 290 deletions
Show Stats Download Patch File Download Diff File

0
PEPObjCAdapter_iOS/module.modulemap → PEPObjCAdapter_iOS/pEpObjCAdapterModuleMap.modulemap
Unescape Escape View File

1
Subprojects/PEPObjCAdapterProtocols/PEPObjCAdapterProtocols/PublicHeaders/PEPSessionProtocol.h
Unescape Escape View File

@ -35,7 +35,6 @@ extern NSString *const _Nonnull PEPObjCAdapterErrorDomain;
successCallback:(void (^)(PEPMessage *srcMessage,
PEPMessage *dstMessage,
PEPStringList *keyList,
PEPRating rating,
PEPDecryptFlags flags,
BOOL isFormerlyEncryptedReuploadedMessage))successCallback;

23
Subprojects/PEPObjCTypeUtils/PEPObjCTypeUtils.xcodeproj/project.pbxproj
Unescape Escape View File

@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
150B1946276B460B001A7D03 /* libPEPObjCTypes_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1598060126CFC0C500593C9D /* libPEPObjCTypes_macOS.a */; };
1554D09D2757C72E00529E81 /* libpEpEngine_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1585EC93269C51EC00B822E1 /* libpEpEngine_macOS.a */; };
1585EBC32698A8FC00B822E1 /* PEPObjCTypeUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 1585EBC12698A8FC00B822E1 /* PEPObjCTypeUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
1585EC79269C3E1700B822E1 /* PEPObjCTypeUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 1585EBC12698A8FC00B822E1 /* PEPObjCTypeUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
1598062A26CFCA0000593C9D /* libPEPObjCTypes_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1598060326CFC0C500593C9D /* libPEPObjCTypes_iOS.a */; };
@ -24,8 +26,6 @@
43B0EAC4274D1EA700F5D076 /* PEPMessage+ASN1.h in Headers */ = {isa = PBXBuildFile; fileRef = 43B0EAC2274D1EA700F5D076 /* PEPMessage+ASN1.h */; };
43B0EAD5274D21E100F5D076 /* libPEPObjCTypeUtils_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1585EA7C26984C4300B822E1 /* libPEPObjCTypeUtils_macOS.a */; };
43B0EAE0274D222000F5D076 /* PEPMessageASN1Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 43B0EADF274D222000F5D076 /* PEPMessageASN1Tests.m */; };
43B0EAE1274D246A00F5D076 /* libpEpEngine_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1585EC93269C51EC00B822E1 /* libpEpEngine_macOS.a */; };
4E89010726CF900B00A683E9 /* libPEPObjCTypes_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E51C1F926CD12EE007A2164 /* libPEPObjCTypes_macOS.a */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -99,6 +99,13 @@
remoteGlobalIDString = 4E575864268329A20084F02D;
remoteInfo = PEPObjCTypes_iOS;
};
4372DD9D2758CF61005A2997 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 159805FA26CFC0C500593C9D /* PEPObjCTypes.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 439F4C36275632B2005F278E;
remoteInfo = PEPObjCTypesTests_macOS;
};
43B0EAD6274D21E100F5D076 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EA7426984C4300B822E1 /* Project object */;
@ -142,7 +149,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
4E89010726CF900B00A683E9 /* libPEPObjCTypes_macOS.a in Frameworks */,
1554D09D2757C72E00529E81 /* libpEpEngine_macOS.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -158,7 +165,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
43B0EAE1274D246A00F5D076 /* libpEpEngine_macOS.a in Frameworks */,
150B1946276B460B001A7D03 /* libPEPObjCTypes_macOS.a in Frameworks */,
43B0EAD5274D21E100F5D076 /* libPEPObjCTypeUtils_macOS.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -234,6 +241,7 @@
1598060126CFC0C500593C9D /* libPEPObjCTypes_macOS.a */,
1598060326CFC0C500593C9D /* libPEPObjCTypes_iOS.a */,
1598060526CFC0C500593C9D /* PEPObjCTypesTests_iOS.xctest */,
4372DD9E2758CF61005A2997 /* PEPObjCTypesTests_macOS.xctest */,
);
name = Products;
sourceTree = "<group>";
@ -425,6 +433,13 @@
remoteRef = 1598060426CFC0C500593C9D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
4372DD9E2758CF61005A2997 /* PEPObjCTypesTests_macOS.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = PEPObjCTypesTests_macOS.xctest;
remoteRef = 4372DD9D2758CF61005A2997 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */

18
Subprojects/PEPObjCTypeUtils/PEPObjCTypeUtils/PEPMessage+ASN1.m
Unescape Escape View File

@ -7,14 +7,13 @@
#import "PEPMessage+ASN1.h"
#import "PEPObjCTypeUtils.h"
#import "map_asn1.h"
#import "message_codec.h"
#import "PEPObjCTypeConversionUtil.h"
#import <map_asn1.h>
#import <message_codec.h>
@implementation PEPMessage (ASN1)
+ (instancetype _Nullable)messageFromAsn1Data:(NSData *)asn1Data
{
+ (instancetype _Nullable)messageFromAsn1Data:(NSData *)asn1Data {
ASN1Message_t *asn1Message = NULL;
PEP_STATUS status = decode_ASN1Message_message(asn1Data.bytes, asn1Data.length, &asn1Message);
if (status != PEP_STATUS_OK) {
@ -23,8 +22,7 @@
message *msg = ASN1Message_to_message(asn1Message, NULL, YES, 0);
// TODO: Use free_ASN1Message as soon as available (see ENGINE-969)
ASN_STRUCT_FREE(asn_DEF_ASN1Message, asn1Message);
free_ASN1Message(asn1Message);
if (!msg) {
return nil;
@ -33,8 +31,7 @@
return [PEPObjCTypeConversionUtil pEpMessagefromStruct:msg];
}
- (NSData *)asn1Data
{
- (NSData *)asn1Data {
message *msg = [PEPObjCTypeConversionUtil structFromPEPMessage:self];
ASN1Message_t *asn1Message = ASN1Message_from_message(msg, NULL, YES, 0);
free_message(msg);
@ -47,8 +44,7 @@
size_t msgBytesSze = 0;
PEP_STATUS status = encode_ASN1Message_message(asn1Message, &msgBytes, &msgBytesSze);
// TODO: Use free_ASN1Message as soon as available (see ENGINE-969)
ASN_STRUCT_FREE(asn_DEF_ASN1Message, asn1Message);
free_ASN1Message(asn1Message);
if (status != PEP_STATUS_OK) {
return nil;

28
Subprojects/PEPObjCTypeUtils/PEPObjCTypeUtils/PEPObjCTypeConversionUtil.m
Unescape Escape View File

@ -7,7 +7,6 @@
#import "PEPObjCTypeConversionUtil.h"
#import <PEPTransport.h>
#import <PEPAttachment.h>
#import <PEPMessage.h>
#import <PEPIdentity.h>
@ -16,28 +15,6 @@
@implementation PEPObjCTypeConversionUtil
// MARK: - PEPTransport
+ (PEPTransport * _Nullable)pEpTransportfromStruct:(PEP_transport_t * _Nonnull)transportStruct
{
PEPTransport *result = nil;
NSAssert(false, @"unimplemented stub");
return result;
}
+ (PEP_transport_t *)structFromPEPTransport:(PEPTransport *)pEpTransport
{
PEP_transport_t *transportStruct = NULL;
NSAssert(false, @"unimplemented stub");
return transportStruct;
}
+ (void)overWritePEPTransportObject:(PEPTransport *)pEpTransport
withValuesFromStruct:(PEP_transport_t * _Nonnull)transportStruct
{
NSAssert(false, @"unimplemented stub");
}
// MARK: - PEPMessage
+ (PEPMessage * _Nullable)pEpMessagefromStruct:(message * _Nullable)msg
@ -117,6 +94,8 @@
msg->attachments = [self arrayToBloblist:pEpMessage.attachments];
}
msg->rating = (PEP_rating) pEpMessage.rating;
return msg;
}
@ -194,6 +173,8 @@
if (message->attachments && message->attachments->value) {
pEpMessage.attachments = [self arrayFromBloblist:message->attachments];
}
pEpMessage.rating = (PEPRating) message->rating;
}
+ (void)removeEmptyRecipientsFromPEPMessage:(PEPMessage *)pEpMessage
@ -239,6 +220,7 @@
pEpMessage.keywords = nil;
pEpMessage.receivedBy = nil;
pEpMessage.direction = (PEPMsgDirection) PEP_dir_incoming; // basically, 0
pEpMessage.rating = PEPRatingUndefined;
}
// MARK: - PEPIdentity

12
Subprojects/PEPObjCTypeUtils/PEPObjCTypeUtils/PublicHeaders/PEPObjCTypeConversionUtil.h
Unescape Escape View File

@ -7,9 +7,8 @@
#import <Foundation/Foundation.h>
#import "transport.h"
#import <transport.h>
@class PEPTransport;
@class PEPMessage;
@class PEPIdentity;
@class PEPAttachment;
@ -18,15 +17,6 @@ NS_ASSUME_NONNULL_BEGIN
@interface PEPObjCTypeConversionUtil : NSObject
// MARK: - PEPTransport
+ (PEPTransport * _Nullable)pEpTransportfromStruct:(PEP_transport_t * _Nonnull)transportStruct;
+ (PEP_transport_t *)structFromPEPTransport:(PEPTransport *)pEpTransport;
+ (void)overWritePEPTransportObject:(PEPTransport *)pEpTransport
withValuesFromStruct:(PEP_transport_t * _Nonnull)transportStruct;
// MARK: - PEPMessage
+ (PEPMessage * _Nullable)pEpMessagefromStruct:(message * _Nullable)msg;

194
Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/project.pbxproj
Unescape Escape View File

@ -9,24 +9,26 @@
/* Begin PBXBuildFile section */
1598061A26CFC5D800593C9D /* PEPObjCTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E575841268328CD0084F02D /* PEPObjCTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
1598061B26CFC5D900593C9D /* PEPObjCTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E575841268328CD0084F02D /* PEPObjCTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
1598067426CFE9B100593C9D /* PEPTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 1598067226CFE9B100593C9D /* PEPTransport.h */; settings = {ATTRIBUTES = (Public, ); }; };
1598067526CFE9B100593C9D /* PEPTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 1598067226CFE9B100593C9D /* PEPTransport.h */; settings = {ATTRIBUTES = (Public, ); }; };
1598067626CFE9B100593C9D /* PEPTransportConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 1598067326CFE9B100593C9D /* PEPTransportConfig.h */; settings = {ATTRIBUTES = (Public, ); }; };
1598067726CFE9B100593C9D /* PEPTransportConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 1598067326CFE9B100593C9D /* PEPTransportConfig.h */; settings = {ATTRIBUTES = (Public, ); }; };
1598067A26CFE9CF00593C9D /* PEPTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = 1598067826CFE9CF00593C9D /* PEPTransport.m */; };
1598067B26CFE9CF00593C9D /* PEPTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = 1598067826CFE9CF00593C9D /* PEPTransport.m */; };
1598067C26CFE9CF00593C9D /* PEPTransportConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 1598067926CFE9CF00593C9D /* PEPTransportConfig.m */; };
1598067D26CFE9CF00593C9D /* PEPTransportConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 1598067926CFE9CF00593C9D /* PEPTransportConfig.m */; };
15BD2F9A27342A2400B1B1F5 /* PEPEqualableTools.h in Headers */ = {isa = PBXBuildFile; fileRef = 15BD2F9827342A2400B1B1F5 /* PEPEqualableTools.h */; };
15BD2F9B27342A2400B1B1F5 /* PEPEqualableTools.h in Headers */ = {isa = PBXBuildFile; fileRef = 15BD2F9827342A2400B1B1F5 /* PEPEqualableTools.h */; };
15BD2F9C27342A2400B1B1F5 /* PEPEqualableTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 15BD2F9927342A2400B1B1F5 /* PEPEqualableTools.m */; };
15BD2F9D27342A2400B1B1F5 /* PEPEqualableTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 15BD2F9927342A2400B1B1F5 /* PEPEqualableTools.m */; };
15BD319C2742A1B500B1B1F5 /* PEPErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 15BD319A2742A1B500B1B1F5 /* PEPErrors.h */; };
15BD319D2742A1B500B1B1F5 /* PEPErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 15BD319A2742A1B500B1B1F5 /* PEPErrors.h */; };
15BD319C2742A1B500B1B1F5 /* PEPErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 15BD319A2742A1B500B1B1F5 /* PEPErrors.h */; settings = {ATTRIBUTES = (Public, ); }; };
15BD319D2742A1B500B1B1F5 /* PEPErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 15BD319A2742A1B500B1B1F5 /* PEPErrors.h */; settings = {ATTRIBUTES = (Public, ); }; };
15BD319E2742A1B500B1B1F5 /* PEPErrors.m in Sources */ = {isa = PBXBuildFile; fileRef = 15BD319B2742A1B500B1B1F5 /* PEPErrors.m */; };
15BD319F2742A1B500B1B1F5 /* PEPErrors.m in Sources */ = {isa = PBXBuildFile; fileRef = 15BD319B2742A1B500B1B1F5 /* PEPErrors.m */; };
439F4C3A275632B2005F278E /* libPEPObjCTypes_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E575858268329170084F02D /* libPEPObjCTypes_macOS.a */; };
439F4C40275632D7005F278E /* PEPTypesTestUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E5758D026833F920084F02D /* PEPTypesTestUtil.m */; };
439F4C41275632DC005F278E /* PEPAttachment+SecureCodingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E5758CA26833F920084F02D /* PEPAttachment+SecureCodingTest.m */; };
439F4C42275632DF005F278E /* PEPIdentity+SecureCodingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E5758CB26833F920084F02D /* PEPIdentity+SecureCodingTest.m */; };
439F4C43275632E2005F278E /* PEPLanguage+SecureCodingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E5758CC26833F920084F02D /* PEPLanguage+SecureCodingTest.m */; };
439F4C44275632E6005F278E /* PEPMessage+SecureCodingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E5758CD26833F920084F02D /* PEPMessage+SecureCodingTest.m */; };
43D44C822685BB3600638D1C /* PEPObjCTypes_iOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E575867268329A20084F02D /* PEPObjCTypes_iOS.h */; platformFilter = ios; settings = {ATTRIBUTES = (Public, ); }; };
43D44C842685BEB400638D1C /* module.modulemap in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43D44C832685BE4300638D1C /* module.modulemap */; platformFilter = ios; };
43D44C842685BEB400638D1C /* pEpObjCTypesModuleMap.modulemap in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43D44C832685BE4300638D1C /* pEpObjCTypesModuleMap.modulemap */; platformFilter = ios; };
4E57585B268329170084F02D /* PEPObjCTypes_macOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E57585A268329170084F02D /* PEPObjCTypes_macOS.h */; };
4E57585D268329170084F02D /* PEPObjCTypes_macOS.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E57585C268329170084F02D /* PEPObjCTypes_macOS.m */; };
4E575869268329A20084F02D /* PEPObjCTypes_iOS.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E575868268329A20084F02D /* PEPObjCTypes_iOS.m */; platformFilter = ios; };
@ -52,7 +54,7 @@
4E5758AE2683331C0084F02D /* PEPTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E57588126832F2F0084F02D /* PEPTypes.h */; platformFilter = ios; settings = {ATTRIBUTES = (Public, ); }; };
4E5758B02683331C0084F02D /* PEPLanguage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E57588226832F2F0084F02D /* PEPLanguage.h */; platformFilter = ios; settings = {ATTRIBUTES = (Public, ); }; };
4E5758B626833A4E0084F02D /* PEPObjCTypes_macOS.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4E57585A268329170084F02D /* PEPObjCTypes_macOS.h */; };
4E5758B726833A560084F02D /* module.modulemap in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4E5758B4268339450084F02D /* module.modulemap */; };
4E5758B726833A560084F02D /* pEpObjCTypesModuleMap.modulemap in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4E5758B4268339450084F02D /* pEpObjCTypesModuleMap.modulemap */; };
4E5758C426833D140084F02D /* libPEPObjCTypes_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E575865268329A20084F02D /* libPEPObjCTypes_iOS.a */; platformFilter = ios; };
4E5758D126833F920084F02D /* PEPAttachment+SecureCodingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E5758CA26833F920084F02D /* PEPAttachment+SecureCodingTest.m */; };
4E5758D226833F920084F02D /* PEPIdentity+SecureCodingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E5758CB26833F920084F02D /* PEPIdentity+SecureCodingTest.m */; };
@ -62,6 +64,13 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
439F4C3B275632B2005F278E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4E575836268328CD0084F02D /* Project object */;
proxyType = 1;
remoteGlobalIDString = 4E575857268329170084F02D;
remoteInfo = PEPObjCTypes_macOS;
};
4E5758D726836A0C0084F02D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4E575836268328CD0084F02D /* Project object */;
@ -78,7 +87,7 @@
dstPath = "include/$(PRODUCT_NAME)";
dstSubfolderSpec = 16;
files = (
43D44C842685BEB400638D1C /* module.modulemap in CopyFiles */,
43D44C842685BEB400638D1C /* pEpObjCTypesModuleMap.modulemap in CopyFiles */,
4E57586A268329A20084F02D /* PEPObjCTypes_iOS.h in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -89,7 +98,7 @@
dstPath = "include/$(PRODUCT_NAME)";
dstSubfolderSpec = 16;
files = (
4E5758B726833A560084F02D /* module.modulemap in CopyFiles */,
4E5758B726833A560084F02D /* pEpObjCTypesModuleMap.modulemap in CopyFiles */,
4E5758B626833A4E0084F02D /* PEPObjCTypes_macOS.h in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -97,15 +106,14 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
1598067226CFE9B100593C9D /* PEPTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPTransport.h; sourceTree = "<group>"; };
1598067326CFE9B100593C9D /* PEPTransportConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPTransportConfig.h; sourceTree = "<group>"; };
1598067826CFE9CF00593C9D /* PEPTransport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PEPTransport.m; sourceTree = "<group>"; };
1598067926CFE9CF00593C9D /* PEPTransportConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PEPTransportConfig.m; sourceTree = "<group>"; };
15BD2F9827342A2400B1B1F5 /* PEPEqualableTools.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPEqualableTools.h; sourceTree = "<group>"; };
15BD2F9927342A2400B1B1F5 /* PEPEqualableTools.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPEqualableTools.m; sourceTree = "<group>"; };
15BD319A2742A1B500B1B1F5 /* PEPErrors.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPErrors.h; sourceTree = "<group>"; };
15BD319B2742A1B500B1B1F5 /* PEPErrors.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPErrors.m; sourceTree = "<group>"; };
43D44C832685BE4300638D1C /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
439F4C36275632B2005F278E /* PEPObjCTypesTests_macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PEPObjCTypesTests_macOS.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
43D44C832685BE4300638D1C /* pEpObjCTypesModuleMap.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = pEpObjCTypesModuleMap.modulemap; sourceTree = "<group>"; };
4E575841268328CD0084F02D /* PEPObjCTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCTypes.h; sourceTree = "<group>"; };
4E575858268329170084F02D /* libPEPObjCTypes_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPObjCTypes_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
4E57585A268329170084F02D /* PEPObjCTypes_macOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCTypes_macOS.h; sourceTree = "<group>"; };
@ -123,7 +131,7 @@
4E57588326832F2F0084F02D /* PEPMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPMessage.h; sourceTree = "<group>"; };
4E57588426832F2F0084F02D /* PEPAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPAttachment.h; sourceTree = "<group>"; };
4E57588626832F2F0084F02D /* PEPIdentity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPIdentity.h; sourceTree = "<group>"; };
4E5758B4268339450084F02D /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
4E5758B4268339450084F02D /* pEpObjCTypesModuleMap.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = pEpObjCTypesModuleMap.modulemap; sourceTree = "<group>"; };
4E5758B926833A700084F02D /* libpEpEngine_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libpEpEngine_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
4E5758BF26833D140084F02D /* PEPObjCTypesTests_iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PEPObjCTypesTests_iOS.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
4E5758C326833D140084F02D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@ -136,6 +144,14 @@
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
439F4C33275632B2005F278E /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
439F4C3A275632B2005F278E /* libPEPObjCTypes_macOS.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
4E575856268329170084F02D /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@ -188,6 +204,7 @@
4E575858268329170084F02D /* libPEPObjCTypes_macOS.a */,
4E575865268329A20084F02D /* libPEPObjCTypes_iOS.a */,
4E5758BF26833D140084F02D /* PEPObjCTypesTests_iOS.xctest */,
439F4C36275632B2005F278E /* PEPObjCTypesTests_macOS.xctest */,
);
name = Products;
sourceTree = "<group>";
@ -206,7 +223,7 @@
children = (
4E57585A268329170084F02D /* PEPObjCTypes_macOS.h */,
4E57585C268329170084F02D /* PEPObjCTypes_macOS.m */,
4E5758B4268339450084F02D /* module.modulemap */,
4E5758B4268339450084F02D /* pEpObjCTypesModuleMap.modulemap */,
);
path = PEPObjCTypes_macOS;
sourceTree = "<group>";
@ -216,7 +233,7 @@
children = (
4E575867268329A20084F02D /* PEPObjCTypes_iOS.h */,
4E575868268329A20084F02D /* PEPObjCTypes_iOS.m */,
43D44C832685BE4300638D1C /* module.modulemap */,
43D44C832685BE4300638D1C /* pEpObjCTypesModuleMap.modulemap */,
);
path = PEPObjCTypes_iOS;
sourceTree = "<group>";
@ -224,7 +241,6 @@
4E57587326832F2F0084F02D /* src */ = {
isa = PBXGroup;
children = (
1598067826CFE9CF00593C9D /* PEPTransport.m */,
1598067926CFE9CF00593C9D /* PEPTransportConfig.m */,
4E57587826832F2F0084F02D /* PEPAttachment.m */,
4E57587526832F2F0084F02D /* PEPIdentity.m */,
@ -240,7 +256,6 @@
isa = PBXGroup;
children = (
4E575841268328CD0084F02D /* PEPObjCTypes.h */,
1598067226CFE9B100593C9D /* PEPTransport.h */,
1598067326CFE9B100593C9D /* PEPTransportConfig.h */,
4E57587F26832F2F0084F02D /* PEPEngineTypes.h */,
4E57588126832F2F0084F02D /* PEPTypes.h */,
@ -295,7 +310,6 @@
4E5758A026832F2F0084F02D /* PEPMessage.h in Headers */,
15BD319C2742A1B500B1B1F5 /* PEPErrors.h in Headers */,
1598061B26CFC5D900593C9D /* PEPObjCTypes.h in Headers */,
1598067426CFE9B100593C9D /* PEPTransport.h in Headers */,
4E5758A126832F2F0084F02D /* PEPAttachment.h in Headers */,
4E57589C26832F2F0084F02D /* PEPEngineTypes.h in Headers */,
4E57585B268329170084F02D /* PEPObjCTypes_macOS.h in Headers */,
@ -313,7 +327,6 @@
4E5758AC2683331C0084F02D /* PEPIdentity.h in Headers */,
1598061A26CFC5D800593C9D /* PEPObjCTypes.h in Headers */,
15BD319D2742A1B500B1B1F5 /* PEPErrors.h in Headers */,
1598067526CFE9B100593C9D /* PEPTransport.h in Headers */,
4E5758AE2683331C0084F02D /* PEPTypes.h in Headers */,
4E5758B02683331C0084F02D /* PEPLanguage.h in Headers */,
4E5758A82683331C0084F02D /* PEPEngineTypes.h in Headers */,
@ -327,6 +340,24 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
439F4C35275632B2005F278E /* PEPObjCTypesTests_macOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 439F4C3F275632B2005F278E /* Build configuration list for PBXNativeTarget "PEPObjCTypesTests_macOS" */;
buildPhases = (
439F4C32275632B2005F278E /* Sources */,
439F4C33275632B2005F278E /* Frameworks */,
439F4C34275632B2005F278E /* Resources */,
);
buildRules = (
);
dependencies = (
439F4C3C275632B2005F278E /* PBXTargetDependency */,
);
name = PEPObjCTypesTests_macOS;
productName = PEPObjCTypesTests_macOS;
productReference = 439F4C36275632B2005F278E /* PEPObjCTypesTests_macOS.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
4E575857268329170084F02D /* PEPObjCTypes_macOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 4E57585E268329170084F02D /* Build configuration list for PBXNativeTarget "PEPObjCTypes_macOS" */;
@ -335,6 +366,7 @@
4E575855268329170084F02D /* Sources */,
4E575856268329170084F02D /* Frameworks */,
4E5758B526833A120084F02D /* CopyFiles */,
15A9C9322760D85F00307D3F /* Rename Module Map File - Workaround for "duplicate module definition" - IOS-2879 */,
4E5758F7268371770084F02D /* Copy artefacts to custom build dir */,
);
buildRules = (
@ -354,6 +386,7 @@
4E575861268329A20084F02D /* Sources */,
4E575862268329A20084F02D /* Frameworks */,
4E575863268329A20084F02D /* CopyFiles */,
15A9C9332760D86500307D3F /* Rename Module Map File - Workaround for "duplicate module definition" - IOS-2879 */,
4E5758F8268371B10084F02D /* Copy artefacts to custom build dir */,
);
buildRules = (
@ -391,6 +424,9 @@
attributes = {
LastUpgradeCheck = 1250;
TargetAttributes = {
439F4C35275632B2005F278E = {
CreatedOnToolsVersion = 13.1;
};
4E575857268329170084F02D = {
CreatedOnToolsVersion = 12.5;
};
@ -418,11 +454,19 @@
4E575857268329170084F02D /* PEPObjCTypes_macOS */,
4E575864268329A20084F02D /* PEPObjCTypes_iOS */,
4E5758BE26833D140084F02D /* PEPObjCTypesTests_iOS */,
439F4C35275632B2005F278E /* PEPObjCTypesTests_macOS */,
);
};
/* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
439F4C34275632B2005F278E /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
4E5758BD26833D140084F02D /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
@ -433,6 +477,42 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
15A9C9322760D85F00307D3F /* Rename Module Map File - Workaround for "duplicate module definition" - IOS-2879 */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Rename Module Map File - Workaround for \"duplicate module definition\" - IOS-2879";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "BUILD_INCLUDE_DIR=\"${BUILT_PRODUCTS_DIR}/include/PEPObjCTypes_macOS\"\nmv ${BUILD_INCLUDE_DIR}/pEpObjCTypesModuleMap.modulemap ${BUILD_INCLUDE_DIR}/module.modulemap\n";
};
15A9C9332760D86500307D3F /* Rename Module Map File - Workaround for "duplicate module definition" - IOS-2879 */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Rename Module Map File - Workaround for \"duplicate module definition\" - IOS-2879";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "BUILD_INCLUDE_DIR=\"${BUILT_PRODUCTS_DIR}/include/PEPObjCTypes_iOS\"\nmv ${BUILD_INCLUDE_DIR}/pEpObjCTypesModuleMap.modulemap ${BUILD_INCLUDE_DIR}/module.modulemap\n";
};
4E5758F7268371770084F02D /* Copy artefacts to custom build dir */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@ -472,6 +552,18 @@
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
439F4C32275632B2005F278E /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
439F4C44275632E6005F278E /* PEPMessage+SecureCodingTest.m in Sources */,
439F4C40275632D7005F278E /* PEPTypesTestUtil.m in Sources */,
439F4C43275632E2005F278E /* PEPLanguage+SecureCodingTest.m in Sources */,
439F4C42275632DF005F278E /* PEPIdentity+SecureCodingTest.m in Sources */,
439F4C41275632DC005F278E /* PEPAttachment+SecureCodingTest.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
4E575855268329170084F02D /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@ -480,7 +572,6 @@
4E57589626832F2F0084F02D /* PEPLanguage.m in Sources */,
4E57589026832F2F0084F02D /* PEPAttachment.m in Sources */,
4E57588B26832F2F0084F02D /* PEPIdentity.m in Sources */,
1598067A26CFE9CF00593C9D /* PEPTransport.m in Sources */,
1598067C26CFE9CF00593C9D /* PEPTransportConfig.m in Sources */,
4E57585D268329170084F02D /* PEPObjCTypes_macOS.m in Sources */,
4E57589A26832F2F0084F02D /* PEPMessage.m in Sources */,
@ -496,7 +587,6 @@
4E57589726832F2F0084F02D /* PEPLanguage.m in Sources */,
4E57589126832F2F0084F02D /* PEPAttachment.m in Sources */,
4E57588C26832F2F0084F02D /* PEPIdentity.m in Sources */,
1598067B26CFE9CF00593C9D /* PEPTransport.m in Sources */,
1598067D26CFE9CF00593C9D /* PEPTransportConfig.m in Sources */,
4E575869268329A20084F02D /* PEPObjCTypes_iOS.m in Sources */,
4E57589B26832F2F0084F02D /* PEPMessage.m in Sources */,
@ -519,6 +609,11 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
439F4C3C275632B2005F278E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 4E575857268329170084F02D /* PEPObjCTypes_macOS */;
targetProxy = 439F4C3B275632B2005F278E /* PBXContainerItemProxy */;
};
4E5758D826836A0C0084F02D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
platformFilter = ios;
@ -528,6 +623,52 @@
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
439F4C3D275632B2005F278E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = NQLYU6MGPN;
GENERATE_INFOPLIST_FILE = YES;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.5;
MARKETING_VERSION = 1.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
PRODUCT_BUNDLE_IDENTIFIER = "security.pEp.PEPObjCTypesTests-macOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
};
name = Debug;
};
439F4C3E275632B2005F278E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = NQLYU6MGPN;
GENERATE_INFOPLIST_FILE = YES;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.5;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "security.pEp.PEPObjCTypesTests-macOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
};
name = Release;
};
4E575845268328CD0084F02D /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@ -744,6 +885,15 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
439F4C3F275632B2005F278E /* Build configuration list for PBXNativeTarget "PEPObjCTypesTests_macOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
439F4C3D275632B2005F278E /* Debug */,
439F4C3E275632B2005F278E /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
4E575839268328CD0084F02D /* Build configuration list for PBXProject "PEPObjCTypes" */ = {
isa = XCConfigurationList;
buildConfigurations = (

10
Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCTypes_macOS.xcscheme
Unescape Escape View File

@ -28,6 +28,16 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "439F4C35275632B2005F278E"
BuildableName = "PEPObjCTypesTests_macOS.xctest"
BlueprintName = "PEPObjCTypesTests_macOS"
ReferencedContainer = "container:PEPObjCTypes.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction

2
Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPIdentity.h
Unescape Escape View File

@ -10,8 +10,6 @@
#import "PEPEngineTypes.h"
@class PEPSession;
@interface PEPIdentity : NSObject <NSMutableCopying, NSSecureCoding>
/**

1
Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPMessage.h
Unescape Escape View File

@ -41,6 +41,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, nullable) NSArray<NSString *> *keywords;
@property (nonatomic, nullable) PEPIdentity *receivedBy;
@property (nonatomic) PEPMsgDirection direction;
@property (nonatomic) PEPRating rating;
/// A copy constructor.
- (instancetype)initWithMessage:(PEPMessage *)message;

1
Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPObjCTypes.h
Unescape Escape View File

@ -14,6 +14,7 @@
#import "PEPAttachment.h"
#import "PEPIdentity.h"
#import "PEPErrors.h"
#import "PEPTransportConfig.h"
@interface PEPObjCTypes : NSObject

17
Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPTransport.h
Unescape Escape View File

@ -1,17 +0,0 @@
//
// PEPTransport.h
//
// Created by Andreas Buff on 16.08.21.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
/// Represents pEpEngine struct _PEP_transport_t
/// Intentinally unimplemented as currently unused (is meant to use when the Engine will do transport, offering some infos and callbacks to do the actual work)
@interface PEPTransport : NSObject
@end
NS_ASSUME_NONNULL_END

3
Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPTransportConfig.h
Unescape Escape View File

@ -11,10 +11,9 @@ NS_ASSUME_NONNULL_BEGIN
@interface PEPTransportConfig : NSObject
@property (nonatomic) Size size;
@property (nonatomic) UInt16 port;
- (instancetype)initWithSize:(Size)size port:(UInt16)port;
- (instancetype)initWithPort:(UInt16)port;
@end

5
Subprojects/PEPObjCTypes/PEPObjCTypes/src/PEPMessage.m
Unescape Escape View File

@ -118,6 +118,7 @@ static NSArray *s_keys;
@"sentDate",
@"shortMessage",
@"to",
@"rating"
];
}
@ -154,7 +155,8 @@ static NSArray *s_keys;
forKey:@"optionalFields"];
self.keywords = [decoder decodeObjectOfClasses:stringArraySet forKey:@"keywords"];
self.receivedBy = [decoder decodeObjectOfClass:[PEPIdentity class] forKey:@"receivedBy"];
self.direction = [decoder decodeIntForKey:@"direction"];;
self.direction = [decoder decodeIntForKey:@"direction"];
self.rating = [decoder decodeIntForKey:@"rating"];
}
return self;
@ -185,6 +187,7 @@ static NSArray *s_keys;
[coder encodeObject:self.keywords forKey:@"keywords"];
[coder encodeObject:self.receivedBy forKey:@"receivedBy"];
[coder encodeInt:self.direction forKey:@"direction"];
[coder encodeInt:self.rating forKey:@"rating"];
}
+ (BOOL)supportsSecureCoding {

20
Subprojects/PEPObjCTypes/PEPObjCTypes/src/PEPTransport.m
Unescape Escape View File

@ -1,20 +0,0 @@
//
// PEPTransport.m
//
// Created by Andreas Buff on 16.08.21.
//
#import "PEPTransport.h"
@implementation PEPTransport
// Intentionally unimplemented. See info in header
- (instancetype)init
{
self = [super init];
if (self) {
NSAssert(false, @"unimplemented stub");
}
return self;
}
@end

3
Subprojects/PEPObjCTypes/PEPObjCTypes/src/PEPTransportConfig.m
Unescape Escape View File

@ -9,11 +9,10 @@
@implementation PEPTransportConfig
- (instancetype)initWithSize:(Size)size port:(UInt16)port
- (instancetype)initWithPort:(UInt16)port
{
self = [super init];
if (self) {
_size = size;
_port = port;
}
return self;

76
Subprojects/PEPObjCTypes/PEPObjCTypesTests_iOS/PEPMessage+SecureCodingTest.m
Unescape Escape View File

@ -19,142 +19,178 @@
@implementation PEPMessage_SecureCodingTest
- (void)testConformsSecureCodingProtocol {
- (void)testConformsSecureCodingProtocol
{
PEPMessage *testee = [PEPMessage new];
XCTAssertTrue([testee conformsToProtocol:@protocol(NSSecureCoding)]);
}
- (void)testSupportsSecureCodingProtocol {
- (void)testSupportsSecureCodingProtocol
{
XCTAssertTrue([PEPMessage supportsSecureCoding]);
}
- (void)testMessageMessageID {
- (void)testMessageMessageID
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.messageID, unarchivedTestee.messageID);
}
- (void)testMessageFrom {
- (void)testMessageFrom
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.from, unarchivedTestee.from);
}
- (void)testMessageTo {
- (void)testMessageTo
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.to, unarchivedTestee.to);
}
- (void)testMessageCC {
- (void)testMessageCC
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.cc, unarchivedTestee.cc);
}
- (void)testMessageBCC {
- (void)testMessageBCC
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.bcc, unarchivedTestee.bcc);
}
- (void)testMessageShortMessage {
- (void)testMessageShortMessage
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.shortMessage, unarchivedTestee.shortMessage);
}
- (void)testMessageLongMessage {
- (void)testMessageLongMessage
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.longMessage, unarchivedTestee.longMessage);
}
- (void)testMessageLongMessageFormatted {
- (void)testMessageLongMessageFormatted
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.longMessageFormatted, unarchivedTestee.longMessageFormatted);
}
- (void)testMessageReplyTo {
- (void)testMessageReplyTo
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.replyTo, unarchivedTestee.replyTo);
}
- (void)testMessageInReplyTo {
- (void)testMessageInReplyTo
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.inReplyTo, unarchivedTestee.inReplyTo);
}
- (void)testMessageReferences {
- (void)testMessageReferences
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.references, unarchivedTestee.references);
}
- (void)testMessageSentDate {
- (void)testMessageSentDate
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.sentDate, unarchivedTestee.sentDate);
}
- (void)testMessageReceivedDate {
- (void)testMessageReceivedDate
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.receivedDate, unarchivedTestee.receivedDate);
}
- (void)testMessageAttachments {
- (void)testMessageAttachments
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.attachments, unarchivedTestee.attachments);
}
- (void)testMessageOptionalFields {
- (void)testMessageOptionalFields
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.optionalFields, unarchivedTestee.optionalFields);
}
- (void)testMessageKeywords {
- (void)testMessageKeywords
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.keywords, unarchivedTestee.keywords);
}
- (void)testMessageReceivedBy {
- (void)testMessageReceivedBy
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee.receivedBy, unarchivedTestee.receivedBy);
}
- (void)testMessageDirection {
- (void)testMessageDirection
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqual(testee.direction, unarchivedTestee.direction);
}
- (void)testMessageRating
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqual(testee.rating, unarchivedTestee.rating);
}
- (void)testMessageEquality
{
PEPMessage *testee = [PEPTypesTestUtil pEpMessageWithAllFieldsFilled];
PEPMessage *unarchivedTestee = [self archiveAndUnarchiveMessage:testee];
XCTAssertEqualObjects(testee, unarchivedTestee);
}
// MARK: - Helper
- (PEPMessage *)archiveAndUnarchiveMessage:(PEPMessage *)message {

4
Subprojects/PEPObjCTypes/PEPObjCTypesTests_iOS/TestUtils/PEPTypesTestUtil.m
Unescape Escape View File

@ -81,11 +81,13 @@
message.attachments = @[attachment];
message.optionalFields = @[@"optionalField"];
message.optionalFields = @[@[@"optionalField", @"optionalFieldValue"]];
message.keywords = @[@"keyword"];
message.receivedBy = identity;
message.direction = PEPMsgDirectionIncoming;
message.rating = PEPRatingB0rken;
return message;
}

0
Subprojects/PEPObjCTypes/PEPObjCTypes_iOS/module.modulemap → Subprojects/PEPObjCTypes/PEPObjCTypes_iOS/pEpObjCTypesModuleMap.modulemap
Unescape Escape View File

0
Subprojects/PEPObjCTypes/PEPObjCTypes_macOS/module.modulemap → Subprojects/PEPObjCTypes/PEPObjCTypes_macOS/pEpObjCTypesModuleMap.modulemap
Unescape Escape View File

224
pEpObjCAdapter.xcodeproj/project.pbxproj
Unescape Escape View File

@ -3,11 +3,11 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {
/* Begin PBXBuildFile section */
15160690257A3E1900DD42E0 /* module.modulemap in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1543DD8B257A3C9E0041EFB5 /* module.modulemap */; platformFilter = ios; };
15160690257A3E1900DD42E0 /* pEpObjCAdapterModuleMap.modulemap in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1543DD8B257A3C9E0041EFB5 /* pEpObjCAdapterModuleMap.modulemap */; platformFilter = ios; };
15160AF1257A58A000DD42E0 /* libpEpEngine.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64289E561B8B70E800FC617B /* libpEpEngine.a */; platformFilter = ios; };
152A9C472010F50400F962ED /* PEPInternalSessionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 152A9C462010F50400F962ED /* PEPInternalSessionTest.m */; };
152E48FE26A86327009BD3CE /* libpEpEngine_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1552DCBD2577E0B600A92F71 /* libpEpEngine_macOS.a */; };
@ -196,6 +196,42 @@
43D2D5F12632B0FA00088BDC /* XCTestCase+PEPSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 43D2D5F02632B0FA00088BDC /* XCTestCase+PEPSession.m */; };
43E02A201C71F65B008F05E9 /* A3FC7F0A_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 43E02A1C1C71F65B008F05E9 /* A3FC7F0A_sec.asc */; };
43E02A211C71F65B008F05E9 /* A3FC7F0A.asc in Resources */ = {isa = PBXBuildFile; fileRef = 43E02A1D1C71F65B008F05E9 /* A3FC7F0A.asc */; };
43F29507273E7BE0009611F8 /* PEPSizeTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4331CE93229C2AAF00DDDC65 /* PEPSizeTest.m */; };
43F29508273E7BE0009611F8 /* PEPInternalSessionTestSendMessageDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4396CEC8218721F900FDD398 /* PEPInternalSessionTestSendMessageDelegate.m */; };
43F29509273E7BE0009611F8 /* PEPSessionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 434707F824C30E9700E05485 /* PEPSessionTest.m */; };
43F2950A273E7BE0009611F8 /* XCTestCase+PEPSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 43D2D5F02632B0FA00088BDC /* XCTestCase+PEPSession.m */; };
43F2950B273E7BE0009611F8 /* PEPInternalSessionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 152A9C462010F50400F962ED /* PEPInternalSessionTest.m */; };
43F2950C273E7BE0009611F8 /* PEPInternalSession+SetIdentity.m in Sources */ = {isa = PBXBuildFile; fileRef = 433A03F92627268700758B57 /* PEPInternalSession+SetIdentity.m */; };
43F2950D273E7BE0009611F8 /* PepTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 434226801D4F60000083ED79 /* PepTests.m */; };
43F2950E273E7BE0009611F8 /* PEPTestUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 15D3D77C2010DDC500A0DA20 /* PEPTestUtils.m */; };
43F2950F273E7BE0009611F8 /* PEPPassphraseCache+Reset.m in Sources */ = {isa = PBXBuildFile; fileRef = 4349CD7824ADDB8800A22A13 /* PEPPassphraseCache+Reset.m */; };
43F29510273E7BE0009611F8 /* PEPIdentity+isPEPUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 43062BAC24EEC83400489258 /* PEPIdentity+isPEPUser.m */; };
43F29511273E7BE0009611F8 /* PEPInternalSessionTestNotifyHandshakeDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4396CEB62187190F00FDD398 /* PEPInternalSessionTestNotifyHandshakeDelegate.m */; };
43F29512273E7BE0009611F8 /* PEPSessionProviderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 15D3D760200F61BB00A0DA20 /* PEPSessionProviderTest.m */; };
43F29513273E7BE0009611F8 /* PEPPassphraseCacheTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 43589EFA24A4ACFC0079BEA2 /* PEPPassphraseCacheTest.m */; };
43F29514273E7BE0009611F8 /* PEPPassphraseProviderMock.m in Sources */ = {isa = PBXBuildFile; fileRef = 436E917624B71E12000296FF /* PEPPassphraseProviderMock.m */; };
43F2951A273E7BE0009611F8 /* partner2_F9D9CCD0A401311F_pub.asc in Resources */ = {isa = PBXBuildFile; fileRef = 432FA2D11C884C5F00DDF874 /* partner2_F9D9CCD0A401311F_pub.asc */; };
43F2951B273E7BE0009611F8 /* system.db in Resources */ = {isa = PBXBuildFile; fileRef = 15921D87261CB474003346B7 /* system.db */; };
43F2951C273E7BE0009611F8 /* 5CB2C182_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 640F79211C9B517C00DBEC4E /* 5CB2C182_sec.asc */; };
43F2951D273E7BE0009611F8 /* msg_to_B623F674.asc in Resources */ = {isa = PBXBuildFile; fileRef = 432EF60B1C58B77900B6782A /* msg_to_B623F674.asc */; };
43F2951E273E7BE0009611F8 /* 0xC9C2EE39.asc in Resources */ = {isa = PBXBuildFile; fileRef = 64415E461BEA523300F6CBB2 /* 0xC9C2EE39.asc */; };
43F2951F273E7BE0009611F8 /* B623F674_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 43676B641C57EA1A00233933 /* B623F674_sec.asc */; };
43F29520273E7BE0009611F8 /* A3FC7F0A_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 43E02A1C1C71F65B008F05E9 /* A3FC7F0A_sec.asc */; };
43F29521273E7BE0009611F8 /* partner1_F2D281C2789DD7F6_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 432FA2D01C884C5F00DDF874 /* partner1_F2D281C2789DD7F6_sec.asc */; };
43F29522273E7BE0009611F8 /* C9C2EE39_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 64415E471BEA523300F6CBB2 /* C9C2EE39_sec.asc */; };
43F29523273E7BE0009611F8 /* 0x70DCF575.asc in Resources */ = {isa = PBXBuildFile; fileRef = 64415E441BEA523300F6CBB2 /* 0x70DCF575.asc */; };
43F29524273E7BE0009611F8 /* 70DCF575_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 64415E451BEA523300F6CBB2 /* 70DCF575_sec.asc */; };
43F29525273E7BE0009611F8 /* 5CB2C182.asc in Resources */ = {isa = PBXBuildFile; fileRef = 640F79221C9B517C00DBEC4E /* 5CB2C182.asc */; };
43F29526273E7BE0009611F8 /* A3FC7F0A.asc in Resources */ = {isa = PBXBuildFile; fileRef = 43E02A1D1C71F65B008F05E9 /* A3FC7F0A.asc */; };
43F29527273E7BE0009611F8 /* meATdontcare_E3BFBCA9248FC681_pub.asc in Resources */ = {isa = PBXBuildFile; fileRef = 432FA2D51C884FF500DDF874 /* meATdontcare_E3BFBCA9248FC681_pub.asc */; };
43F29528273E7BE0009611F8 /* Rick Deckard (43F270EC) – Secret.asc in Resources */ = {isa = PBXBuildFile; fileRef = 436E917124B714A1000296FF /* Rick Deckard (43F270EC) – Secret.asc */; };
43F29529273E7BE0009611F8 /* 0xB623F674.asc in Resources */ = {isa = PBXBuildFile; fileRef = 432EF6091C58B77900B6782A /* 0xB623F674.asc */; };
43F2952A273E7BE0009611F8 /* 6FF00E97_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 64415E431BEA523300F6CBB2 /* 6FF00E97_sec.asc */; };
43F2952B273E7BE0009611F8 /* meATdontcare_E3BFBCA9248FC681_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 432FA2D61C884FF500DDF874 /* meATdontcare_E3BFBCA9248FC681_sec.asc */; };
43F2952C273E7BE0009611F8 /* 6FF00E97.asc in Resources */ = {isa = PBXBuildFile; fileRef = 64415E421BEA523300F6CBB2 /* 6FF00E97.asc */; };
43F2952D273E7BE0009611F8 /* pEpTrustWords.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 64AE6B211BE15E3A000867E4 /* pEpTrustWords.bundle */; };
43F2952E273E7BE0009611F8 /* partner1_F2D281C2789DD7F6_pub.asc in Resources */ = {isa = PBXBuildFile; fileRef = 432FA2CF1C884C5F00DDF874 /* partner1_F2D281C2789DD7F6_pub.asc */; };
43F2958B273E8A8D009611F8 /* libPEPObjCAdapter_4ipsec_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C3089226E8B5030013F39F /* libPEPObjCAdapter_4ipsec_macOS.a */; };
4E51BFA726CBC685007A2164 /* libPEPToolbox_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E51BFA626CBC685007A2164 /* libPEPToolbox_macOS.a */; };
4E57581226821A760084F02D /* libPEPObjCAdapterProtocols_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E23E6F62681C8AF00B8F4C2 /* libPEPObjCAdapterProtocols_macOS.a */; };
640F79231C9B517C00DBEC4E /* 5CB2C182_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 640F79211C9B517C00DBEC4E /* 5CB2C182_sec.asc */; };
@ -296,6 +332,13 @@
remoteGlobalIDString = 4E23E7032681D5F300B8F4C2;
remoteInfo = PEPObjCAdapterProtocols_iOS;
};
43F29505273E7BE0009611F8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 64DA243B1B833248000BEE80 /* pEpEngine.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 644297BE1BE11C65002BC73B;
remoteInfo = pEpTrustWords;
};
4E23E6F52681C8AF00B8F4C2 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4EEB4CC92680E56A00161040 /* PEPObjCAdapterProtocols.xcodeproj */;
@ -362,7 +405,7 @@
dstSubfolderSpec = 16;
files = (
1543DC6B257943CF0041EFB5 /* PEPObjCAdapter_iOS.h in CopyFiles */,
15160690257A3E1900DD42E0 /* module.modulemap in CopyFiles */,
15160690257A3E1900DD42E0 /* pEpObjCAdapterModuleMap.modulemap in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -378,7 +421,7 @@
1543DC66257943CE0041EFB5 /* libPEPObjCAdapter_iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPObjCAdapter_iOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
1543DC68257943CE0041EFB5 /* PEPObjCAdapter_iOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCAdapter_iOS.h; sourceTree = "<group>"; };
1543DC69257943CF0041EFB5 /* PEPObjCAdapter_iOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPObjCAdapter_iOS.m; sourceTree = "<group>"; };
1543DD8B257A3C9E0041EFB5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
1543DD8B257A3C9E0041EFB5 /* pEpObjCAdapterModuleMap.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = pEpObjCAdapterModuleMap.modulemap; sourceTree = "<group>"; };
1552D93B2576602D00A92F71 /* libPEPObjCAdapter_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPObjCAdapter_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
1552D93D2576602D00A92F71 /* PEPObjCAdapter_macOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCAdapter_macOS.h; sourceTree = "<group>"; };
1552D93F2576602D00A92F71 /* PEPObjCAdapter_macOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPObjCAdapter_macOS.m; sourceTree = "<group>"; };
@ -463,6 +506,8 @@
43E02A1C1C71F65B008F05E9 /* A3FC7F0A_sec.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = A3FC7F0A_sec.asc; sourceTree = "<group>"; };
43E02A1D1C71F65B008F05E9 /* A3FC7F0A.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = A3FC7F0A.asc; sourceTree = "<group>"; };
43E1A7AB252B421D00307A7D /* Logger.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Logger.h; sourceTree = "<group>"; };
43F29532273E7BE0009611F8 /* pEpObjCAdapterTests_4ipsec_macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = pEpObjCAdapterTests_4ipsec_macOS.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
43F29533273E7BE0009611F8 /* pEpObjCAdapterTests_4ipsec_macOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = pEpObjCAdapterTests_4ipsec_macOS.plist; path = /Users/dirk/projects/pEp/src_pEp4ipsec/pEpObjCAdapter/pEpObjCAdapterTests_4ipsec_macOS.plist; sourceTree = "<absolute>"; };
43F73BE92166248E00AB4524 /* PEPSync.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPSync.m; sourceTree = "<group>"; };
4E51BF3826CA5E5C007A2164 /* PEPObjCTypes.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PEPObjCTypes.xcodeproj; path = Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj; sourceTree = "<group>"; };
4E51BFA626CBC685007A2164 /* libPEPToolbox_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libPEPToolbox_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
@ -512,6 +557,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
43F29515273E7BE0009611F8 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
43F2958B273E8A8D009611F8 /* libPEPObjCAdapter_4ipsec_macOS.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
64415E141BE94FCB00F6CBB2 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@ -537,7 +590,7 @@
children = (
1543DC68257943CE0041EFB5 /* PEPObjCAdapter_iOS.h */,
1543DC69257943CF0041EFB5 /* PEPObjCAdapter_iOS.m */,
1543DD8B257A3C9E0041EFB5 /* module.modulemap */,
1543DD8B257A3C9E0041EFB5 /* pEpObjCAdapterModuleMap.modulemap */,
);
path = PEPObjCAdapter_iOS;
sourceTree = "<group>";
@ -644,6 +697,7 @@
64415E181BE94FCB00F6CBB2 /* pEpObjCTests */,
352988AB1AEF964100FA7E2E /* Products */,
43447C51221D448500B6323E /* Frameworks */,
43F29533273E7BE0009611F8 /* pEpObjCAdapterTests_4ipsec_macOS.plist */,
);
sourceTree = "<group>";
};
@ -654,6 +708,7 @@
1552D93B2576602D00A92F71 /* libPEPObjCAdapter_macOS.a */,
1543DC66257943CE0041EFB5 /* libPEPObjCAdapter_iOS.a */,
15C3089226E8B5030013F39F /* libPEPObjCAdapter_4ipsec_macOS.a */,
43F29532273E7BE0009611F8 /* pEpObjCAdapterTests_4ipsec_macOS.xctest */,
);
name = Products;
sourceTree = "<group>";
@ -886,6 +941,7 @@
1543DC62257943CE0041EFB5 /* Sources */,
1543DC63257943CE0041EFB5 /* Frameworks */,
1543DC64257943CE0041EFB5 /* CopyFiles */,
15132437275B6AC3001182CA /* Rename Module Map File - Workaround for "duplicate module definition" - IOS-2879 */,
151607E9257A4A9C00DD42E0 /* Copy artefacts to custom build dir */,
);
buildRules = (
@ -942,6 +998,24 @@
productReference = 15C3089226E8B5030013F39F /* libPEPObjCAdapter_4ipsec_macOS.a */;
productType = "com.apple.product-type.library.static";
};
43F29503273E7BE0009611F8 /* pEpObjCAdapterTests_4ipsec_macOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 43F2952F273E7BE0009611F8 /* Build configuration list for PBXNativeTarget "pEpObjCAdapterTests_4ipsec_macOS" */;
buildPhases = (
43F29506273E7BE0009611F8 /* Sources */,
43F29515273E7BE0009611F8 /* Frameworks */,
43F29519273E7BE0009611F8 /* Resources */,
);
buildRules = (
);
dependencies = (
43F29504273E7BE0009611F8 /* PBXTargetDependency */,
);
name = pEpObjCAdapterTests_4ipsec_macOS;
productName = iOSTests;
productReference = 43F29532273E7BE0009611F8 /* pEpObjCAdapterTests_4ipsec_macOS.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
64415E161BE94FCB00F6CBB2 /* pEpObjCAdapterTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 64415E281BE94FCB00F6CBB2 /* Build configuration list for PBXNativeTarget "pEpObjCAdapterTests" */;
@ -1022,6 +1096,7 @@
1552D93A2576602D00A92F71 /* PEPObjCAdapter_macOS */,
64415E161BE94FCB00F6CBB2 /* pEpObjCAdapterTests */,
15C3084B26E8B5030013F39F /* PEPObjCAdapter_4ipsec_macOS */,
43F29503273E7BE0009611F8 /* pEpObjCAdapterTests_4ipsec_macOS */,
);
};
/* End PBXProject section */
@ -1100,6 +1175,34 @@
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
43F29519273E7BE0009611F8 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
43F2951A273E7BE0009611F8 /* partner2_F9D9CCD0A401311F_pub.asc in Resources */,
43F2951B273E7BE0009611F8 /* system.db in Resources */,
43F2951C273E7BE0009611F8 /* 5CB2C182_sec.asc in Resources */,
43F2951D273E7BE0009611F8 /* msg_to_B623F674.asc in Resources */,
43F2951E273E7BE0009611F8 /* 0xC9C2EE39.asc in Resources */,
43F2951F273E7BE0009611F8 /* B623F674_sec.asc in Resources */,
43F29520273E7BE0009611F8 /* A3FC7F0A_sec.asc in Resources */,
43F29521273E7BE0009611F8 /* partner1_F2D281C2789DD7F6_sec.asc in Resources */,
43F29522273E7BE0009611F8 /* C9C2EE39_sec.asc in Resources */,
43F29523273E7BE0009611F8 /* 0x70DCF575.asc in Resources */,
43F29524273E7BE0009611F8 /* 70DCF575_sec.asc in Resources */,
43F29525273E7BE0009611F8 /* 5CB2C182.asc in Resources */,
43F29526273E7BE0009611F8 /* A3FC7F0A.asc in Resources */,
43F29527273E7BE0009611F8 /* meATdontcare_E3BFBCA9248FC681_pub.asc in Resources */,
43F29528273E7BE0009611F8 /* Rick Deckard (43F270EC) – Secret.asc in Resources */,
43F29529273E7BE0009611F8 /* 0xB623F674.asc in Resources */,
43F2952A273E7BE0009611F8 /* 6FF00E97_sec.asc in Resources */,
43F2952B273E7BE0009611F8 /* meATdontcare_E3BFBCA9248FC681_sec.asc in Resources */,
43F2952C273E7BE0009611F8 /* 6FF00E97.asc in Resources */,
43F2952D273E7BE0009611F8 /* pEpTrustWords.bundle in Resources */,
43F2952E273E7BE0009611F8 /* partner1_F2D281C2789DD7F6_pub.asc in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
64415E151BE94FCB00F6CBB2 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
@ -1131,6 +1234,26 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
15132437275B6AC3001182CA /* Rename Module Map File - Workaround for "duplicate module definition" - IOS-2879 */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Rename Module Map File - Workaround for \"duplicate module definition\" - IOS-2879";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "mv ${BUILT_PRODUCTS_DIR}/include/PEPObjCAdapter_iOS/pEpObjCAdapterModuleMap.modulemap ${BUILT_PRODUCTS_DIR}/include/PEPObjCAdapter_iOS/module.modulemap\n";
showEnvVarsInLog = 0;
};
151607E9257A4A9C00DD42E0 /* Copy artefacts to custom build dir */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@ -1275,6 +1398,27 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
43F29506273E7BE0009611F8 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
43F29507273E7BE0009611F8 /* PEPSizeTest.m in Sources */,
43F29508273E7BE0009611F8 /* PEPInternalSessionTestSendMessageDelegate.m in Sources */,
43F29509273E7BE0009611F8 /* PEPSessionTest.m in Sources */,
43F2950A273E7BE0009611F8 /* XCTestCase+PEPSession.m in Sources */,
43F2950B273E7BE0009611F8 /* PEPInternalSessionTest.m in Sources */,
43F2950C273E7BE0009611F8 /* PEPInternalSession+SetIdentity.m in Sources */,
43F2950D273E7BE0009611F8 /* PepTests.m in Sources */,
43F2950E273E7BE0009611F8 /* PEPTestUtils.m in Sources */,
43F2950F273E7BE0009611F8 /* PEPPassphraseCache+Reset.m in Sources */,
43F29510273E7BE0009611F8 /* PEPIdentity+isPEPUser.m in Sources */,
43F29511273E7BE0009611F8 /* PEPInternalSessionTestNotifyHandshakeDelegate.m in Sources */,
43F29512273E7BE0009611F8 /* PEPSessionProviderTest.m in Sources */,
43F29513273E7BE0009611F8 /* PEPPassphraseCacheTest.m in Sources */,
43F29514273E7BE0009611F8 /* PEPPassphraseProviderMock.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
64415E131BE94FCB00F6CBB2 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@ -1339,6 +1483,11 @@
name = PEPObjCAdapterProtocols_iOS;
targetProxy = 430D78E12681E1CF00B12650 /* PBXContainerItemProxy */;
};
43F29504273E7BE0009611F8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = pEpTrustWords;
targetProxy = 43F29505273E7BE0009611F8 /* PBXContainerItemProxy */;
};
4E57580F26821A660084F02D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = PEPObjCAdapterProtocols_macOS;
@ -1372,6 +1521,7 @@
"$(inherited)",
);
IPHONEOS_DEPLOYMENT_TARGET = "${inherited}";
MODULEMAP_FILE = "";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
@ -1395,6 +1545,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_PREPROCESSOR_DEFINITIONS = "IS_IOS_BUILD=1";
IPHONEOS_DEPLOYMENT_TARGET = "${inherited}";
MODULEMAP_FILE = "";
MTL_FAST_MATH = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
@ -1597,6 +1748,7 @@
);
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
@ -1656,6 +1808,7 @@
);
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "-ObjC";
@ -1666,6 +1819,58 @@
};
name = Release;
};
43F29530273E7BE0009611F8 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = NQLYU6MGPN;
ENABLE_TESTABILITY = YES;
GCC_DYNAMIC_NO_PIC = NO;
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = pEpObjCAdapterTests_4ipsec_macOS.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = com.pep.iOSTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "";
};
name = Debug;
};
43F29531273E7BE0009611F8 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = NQLYU6MGPN;
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = pEpObjCAdapterTests_4ipsec_macOS.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = com.pep.iOSTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "";
};
name = Release;
};
64415E1F1BE94FCB00F6CBB2 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@ -1763,6 +1968,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
43F2952F273E7BE0009611F8 /* Build configuration list for PBXNativeTarget "pEpObjCAdapterTests_4ipsec_macOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
43F29530273E7BE0009611F8 /* Debug */,
43F29531273E7BE0009611F8 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
64415E281BE94FCB00F6CBB2 /* Build configuration list for PBXNativeTarget "pEpObjCAdapterTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (

32