diff --git a/SecureEnclaveSwift/SecureEnclaveDemo.xcodeproj/project.pbxproj b/SecureEnclaveSwift/SecureEnclaveDemo.xcodeproj/project.pbxproj index 0bae0f5..6c8ea0e 100644 --- a/SecureEnclaveSwift/SecureEnclaveDemo.xcodeproj/project.pbxproj +++ b/SecureEnclaveSwift/SecureEnclaveDemo.xcodeproj/project.pbxproj @@ -7,18 +7,18 @@ objects = { /* Begin PBXBuildFile section */ + 715776B725C858FD00608352 /* SecureEnclaveDemoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 715776B625C858FD00608352 /* SecureEnclaveDemoTests.swift */; }; A30595821DDE45B1007FBC2A /* SecureEnclaveHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = A30595811DDE45B1007FBC2A /* SecureEnclaveHelper.swift */; }; A33017CB1DD9B64800FF32E3 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A33017CA1DD9B64800FF32E3 /* AppDelegate.swift */; }; A33017CD1DD9B64800FF32E3 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A33017CC1DD9B64800FF32E3 /* ViewController.swift */; }; A33017D01DD9B64800FF32E3 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A33017CE1DD9B64800FF32E3 /* Main.storyboard */; }; A33017D21DD9B64800FF32E3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A33017D11DD9B64800FF32E3 /* Assets.xcassets */; }; A33017D51DD9B64800FF32E3 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A33017D31DD9B64800FF32E3 /* LaunchScreen.storyboard */; }; - A33017E01DD9B64800FF32E3 /* SecureEnclaveDemoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A33017DF1DD9B64800FF32E3 /* SecureEnclaveDemoTests.swift */; }; A33017EB1DD9B65300FF32E3 /* Manager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A33017EA1DD9B65300FF32E3 /* Manager.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - A33017DC1DD9B64800FF32E3 /* PBXContainerItemProxy */ = { + 715776B925C858FD00608352 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = A33017BF1DD9B64800FF32E3 /* Project object */; proxyType = 1; @@ -29,6 +29,9 @@ /* Begin PBXFileReference section */ 19294B7B1E75DC4F005DE441 /* SecureEnclaveDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SecureEnclaveDemo.entitlements; sourceTree = ""; }; + 715776B425C858FD00608352 /* SecureEnclaveDemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SecureEnclaveDemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 715776B625C858FD00608352 /* SecureEnclaveDemoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureEnclaveDemoTests.swift; sourceTree = ""; }; + 715776B825C858FD00608352 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A30595811DDE45B1007FBC2A /* SecureEnclaveHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecureEnclaveHelper.swift; sourceTree = ""; }; A33017C71DD9B64800FF32E3 /* SecureEnclaveDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SecureEnclaveDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; A33017CA1DD9B64800FF32E3 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -37,21 +40,20 @@ A33017D11DD9B64800FF32E3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; A33017D41DD9B64800FF32E3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; A33017D61DD9B64800FF32E3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A33017DB1DD9B64800FF32E3 /* SecureEnclaveDemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SecureEnclaveDemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; A33017DF1DD9B64800FF32E3 /* SecureEnclaveDemoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureEnclaveDemoTests.swift; sourceTree = ""; }; A33017E11DD9B64800FF32E3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A33017EA1DD9B65300FF32E3 /* Manager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Manager.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - A33017C41DD9B64800FF32E3 /* Frameworks */ = { + 715776B125C858FD00608352 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - A33017D81DD9B64800FF32E3 /* Frameworks */ = { + A33017C41DD9B64800FF32E3 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -61,12 +63,22 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 715776B525C858FD00608352 /* SecureEnclaveDemoTests */ = { + isa = PBXGroup; + children = ( + 715776B625C858FD00608352 /* SecureEnclaveDemoTests.swift */, + 715776B825C858FD00608352 /* Info.plist */, + ); + path = SecureEnclaveDemoTests; + sourceTree = ""; + }; A33017BE1DD9B64800FF32E3 = { isa = PBXGroup; children = ( A30595811DDE45B1007FBC2A /* SecureEnclaveHelper.swift */, A33017C91DD9B64800FF32E3 /* SecureEnclaveDemo */, A33017DE1DD9B64800FF32E3 /* SecureEnclaveDemoTests */, + 715776B525C858FD00608352 /* SecureEnclaveDemoTests */, A33017C81DD9B64800FF32E3 /* Products */, ); sourceTree = ""; @@ -75,7 +87,7 @@ isa = PBXGroup; children = ( A33017C71DD9B64800FF32E3 /* SecureEnclaveDemo.app */, - A33017DB1DD9B64800FF32E3 /* SecureEnclaveDemoTests.xctest */, + 715776B425C858FD00608352 /* SecureEnclaveDemoTests.xctest */, ); name = Products; sourceTree = ""; @@ -107,6 +119,24 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 715776B325C858FD00608352 /* SecureEnclaveDemoTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 715776BB25C858FD00608352 /* Build configuration list for PBXNativeTarget "SecureEnclaveDemoTests" */; + buildPhases = ( + 715776B025C858FD00608352 /* Sources */, + 715776B125C858FD00608352 /* Frameworks */, + 715776B225C858FD00608352 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 715776BA25C858FD00608352 /* PBXTargetDependency */, + ); + name = SecureEnclaveDemoTests; + productName = SecureEnclaveDemoTests; + productReference = 715776B425C858FD00608352 /* SecureEnclaveDemoTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; A33017C61DD9B64800FF32E3 /* SecureEnclaveDemo */ = { isa = PBXNativeTarget; buildConfigurationList = A33017E41DD9B64800FF32E3 /* Build configuration list for PBXNativeTarget "SecureEnclaveDemo" */; @@ -124,37 +154,24 @@ productReference = A33017C71DD9B64800FF32E3 /* SecureEnclaveDemo.app */; productType = "com.apple.product-type.application"; }; - A33017DA1DD9B64800FF32E3 /* SecureEnclaveDemoTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = A33017E71DD9B64800FF32E3 /* Build configuration list for PBXNativeTarget "SecureEnclaveDemoTests" */; - buildPhases = ( - A33017D71DD9B64800FF32E3 /* Sources */, - A33017D81DD9B64800FF32E3 /* Frameworks */, - A33017D91DD9B64800FF32E3 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - A33017DD1DD9B64800FF32E3 /* PBXTargetDependency */, - ); - name = SecureEnclaveDemoTests; - productName = SecureEnclaveDemoTests; - productReference = A33017DB1DD9B64800FF32E3 /* SecureEnclaveDemoTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ A33017BF1DD9B64800FF32E3 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0810; - LastUpgradeCheck = 0820; + LastSwiftUpdateCheck = 1240; + LastUpgradeCheck = 1240; ORGANIZATIONNAME = Ages; TargetAttributes = { + 715776B325C858FD00608352 = { + CreatedOnToolsVersion = 12.4; + ProvisioningStyle = Automatic; + TestTargetID = A33017C61DD9B64800FF32E3; + }; A33017C61DD9B64800FF32E3 = { CreatedOnToolsVersion = 8.1; - DevelopmentTeam = 33KVL2LY9J; + DevelopmentTeam = KCVR6NCB2C; ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.Keychain = { @@ -162,16 +179,11 @@ }; }; }; - A33017DA1DD9B64800FF32E3 = { - CreatedOnToolsVersion = 8.1; - ProvisioningStyle = Automatic; - TestTargetID = A33017C61DD9B64800FF32E3; - }; }; }; buildConfigurationList = A33017C21DD9B64800FF32E3 /* Build configuration list for PBXProject "SecureEnclaveDemo" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -183,58 +195,58 @@ projectRoot = ""; targets = ( A33017C61DD9B64800FF32E3 /* SecureEnclaveDemo */, - A33017DA1DD9B64800FF32E3 /* SecureEnclaveDemoTests */, + 715776B325C858FD00608352 /* SecureEnclaveDemoTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - A33017C51DD9B64800FF32E3 /* Resources */ = { + 715776B225C858FD00608352 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - A33017D51DD9B64800FF32E3 /* LaunchScreen.storyboard in Resources */, - A33017D21DD9B64800FF32E3 /* Assets.xcassets in Resources */, - A33017D01DD9B64800FF32E3 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - A33017D91DD9B64800FF32E3 /* Resources */ = { + A33017C51DD9B64800FF32E3 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + A33017D51DD9B64800FF32E3 /* LaunchScreen.storyboard in Resources */, + A33017D21DD9B64800FF32E3 /* Assets.xcassets in Resources */, + A33017D01DD9B64800FF32E3 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - A33017C31DD9B64800FF32E3 /* Sources */ = { + 715776B025C858FD00608352 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A33017CD1DD9B64800FF32E3 /* ViewController.swift in Sources */, - A30595821DDE45B1007FBC2A /* SecureEnclaveHelper.swift in Sources */, - A33017EB1DD9B65300FF32E3 /* Manager.swift in Sources */, - A33017CB1DD9B64800FF32E3 /* AppDelegate.swift in Sources */, + 715776B725C858FD00608352 /* SecureEnclaveDemoTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - A33017D71DD9B64800FF32E3 /* Sources */ = { + A33017C31DD9B64800FF32E3 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A33017E01DD9B64800FF32E3 /* SecureEnclaveDemoTests.swift in Sources */, + A33017CD1DD9B64800FF32E3 /* ViewController.swift in Sources */, + A30595821DDE45B1007FBC2A /* SecureEnclaveHelper.swift in Sources */, + A33017EB1DD9B65300FF32E3 /* Manager.swift in Sources */, + A33017CB1DD9B64800FF32E3 /* AppDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - A33017DD1DD9B64800FF32E3 /* PBXTargetDependency */ = { + 715776BA25C858FD00608352 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = A33017C61DD9B64800FF32E3 /* SecureEnclaveDemo */; - targetProxy = A33017DC1DD9B64800FF32E3 /* PBXContainerItemProxy */; + targetProxy = 715776B925C858FD00608352 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -258,24 +270,79 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 715776BC25C858FD00608352 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + GCC_C_LANGUAGE_STANDARD = gnu11; + INFOPLIST_FILE = SecureEnclaveDemoTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.4; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = net.stabledomain.SecureEnclaveDemoTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SecureEnclaveDemo.app/SecureEnclaveDemo"; + }; + name = Debug; + }; + 715776BD25C858FD00608352 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + GCC_C_LANGUAGE_STANDARD = gnu11; + INFOPLIST_FILE = SecureEnclaveDemoTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.4; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = net.stabledomain.SecureEnclaveDemoTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SecureEnclaveDemo.app/SecureEnclaveDemo"; + }; + name = Release; + }; A33017E21DD9B64800FF32E3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES; CLANG_WARN_UNREACHABLE_CODE = YES; @@ -299,7 +366,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.1; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -313,20 +380,30 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES; CLANG_WARN_UNREACHABLE_CODE = YES; @@ -344,7 +421,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.1; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -357,13 +434,18 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = 33KVL2LY9J; + CODE_SIGN_ENTITLEMENTS = SecureEnclaveDemo/SecureEnclaveDemo.entitlements; + DEVELOPMENT_TEAM = KCVR6NCB2C; + ENABLE_TESTING_SEARCH_PATHS = YES; INFOPLIST_FILE = SecureEnclaveDemo/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = no.agens.SecureEnclaveDemo; + PRODUCT_BUNDLE_IDENTIFIER = ""; + "PRODUCT_BUNDLE_IDENTIFIER[sdk=*]" = net.stabledomain.demo; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SUPPORTS_MACCATALYST = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -371,70 +453,48 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = 33KVL2LY9J; + CODE_SIGN_ENTITLEMENTS = SecureEnclaveDemo/SecureEnclaveDemo.entitlements; + DEVELOPMENT_TEAM = KCVR6NCB2C; + ENABLE_TESTABILITY = YES; + ENABLE_TESTING_SEARCH_PATHS = YES; INFOPLIST_FILE = SecureEnclaveDemo/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = no.agens.SecureEnclaveDemo; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; - }; - name = Release; - }; - A33017E81DD9B64800FF32E3 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - INFOPLIST_FILE = SecureEnclaveDemoTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = no.agens.SecureEnclaveDemoTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SecureEnclaveDemo.app/SecureEnclaveDemo"; - }; - name = Debug; - }; - A33017E91DD9B64800FF32E3 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - INFOPLIST_FILE = SecureEnclaveDemoTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = no.agens.SecureEnclaveDemoTests; + PRODUCT_BUNDLE_IDENTIFIER = ""; + "PRODUCT_BUNDLE_IDENTIFIER[sdk=*]" = net.stabledomain.demo; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SecureEnclaveDemo.app/SecureEnclaveDemo"; + SUPPORTS_MACCATALYST = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - A33017C21DD9B64800FF32E3 /* Build configuration list for PBXProject "SecureEnclaveDemo" */ = { + 715776BB25C858FD00608352 /* Build configuration list for PBXNativeTarget "SecureEnclaveDemoTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - A33017E21DD9B64800FF32E3 /* Debug */, - A33017E31DD9B64800FF32E3 /* Release */, + 715776BC25C858FD00608352 /* Debug */, + 715776BD25C858FD00608352 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A33017E41DD9B64800FF32E3 /* Build configuration list for PBXNativeTarget "SecureEnclaveDemo" */ = { + A33017C21DD9B64800FF32E3 /* Build configuration list for PBXProject "SecureEnclaveDemo" */ = { isa = XCConfigurationList; buildConfigurations = ( - A33017E51DD9B64800FF32E3 /* Debug */, - A33017E61DD9B64800FF32E3 /* Release */, + A33017E21DD9B64800FF32E3 /* Debug */, + A33017E31DD9B64800FF32E3 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A33017E71DD9B64800FF32E3 /* Build configuration list for PBXNativeTarget "SecureEnclaveDemoTests" */ = { + A33017E41DD9B64800FF32E3 /* Build configuration list for PBXNativeTarget "SecureEnclaveDemo" */ = { isa = XCConfigurationList; buildConfigurations = ( - A33017E81DD9B64800FF32E3 /* Debug */, - A33017E91DD9B64800FF32E3 /* Release */, + A33017E51DD9B64800FF32E3 /* Debug */, + A33017E61DD9B64800FF32E3 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/SecureEnclaveSwift/SecureEnclaveDemo/AppDelegate.swift b/SecureEnclaveSwift/SecureEnclaveDemo/AppDelegate.swift index 6d5ec28..103192b 100644 --- a/SecureEnclaveSwift/SecureEnclaveDemo/AppDelegate.swift +++ b/SecureEnclaveSwift/SecureEnclaveDemo/AppDelegate.swift @@ -22,7 +22,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. return true } diff --git a/SecureEnclaveSwift/SecureEnclaveDemo/Assets.xcassets/AppIcon.appiconset/Contents.json b/SecureEnclaveSwift/SecureEnclaveDemo/Assets.xcassets/AppIcon.appiconset/Contents.json index 1d060ed..9221b9b 100644 --- a/SecureEnclaveSwift/SecureEnclaveDemo/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/SecureEnclaveSwift/SecureEnclaveDemo/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -2,92 +2,97 @@ "images" : [ { "idiom" : "iphone", - "size" : "20x20", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { "idiom" : "iphone", - "size" : "20x20", - "scale" : "3x" + "scale" : "3x", + "size" : "20x20" }, { "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" + "scale" : "3x", + "size" : "29x29" }, { "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { "idiom" : "iphone", - "size" : "40x40", - "scale" : "3x" + "scale" : "3x", + "size" : "40x40" }, { "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" + "scale" : "2x", + "size" : "60x60" }, { "idiom" : "iphone", - "size" : "60x60", - "scale" : "3x" + "scale" : "3x", + "size" : "60x60" }, { "idiom" : "ipad", - "size" : "20x20", - "scale" : "1x" + "scale" : "1x", + "size" : "20x20" }, { "idiom" : "ipad", - "size" : "20x20", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { "idiom" : "ipad", - "size" : "29x29", - "scale" : "1x" + "scale" : "1x", + "size" : "29x29" }, { "idiom" : "ipad", - "size" : "29x29", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { "idiom" : "ipad", - "size" : "40x40", - "scale" : "1x" + "scale" : "1x", + "size" : "40x40" }, { "idiom" : "ipad", - "size" : "40x40", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { "idiom" : "ipad", - "size" : "76x76", - "scale" : "1x" + "scale" : "1x", + "size" : "76x76" }, { "idiom" : "ipad", - "size" : "76x76", - "scale" : "2x" + "scale" : "2x", + "size" : "76x76" }, { "idiom" : "ipad", - "size" : "83.5x83.5", - "scale" : "2x" + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/SecureEnclaveSwift/SecureEnclaveDemo/SecureEnclaveDemo.entitlements b/SecureEnclaveSwift/SecureEnclaveDemo/SecureEnclaveDemo.entitlements index 0c67376..225aa48 100644 --- a/SecureEnclaveSwift/SecureEnclaveDemo/SecureEnclaveDemo.entitlements +++ b/SecureEnclaveSwift/SecureEnclaveDemo/SecureEnclaveDemo.entitlements @@ -1,5 +1,12 @@ - + + com.apple.security.app-sandbox + + com.apple.security.network.client + + keychain-access-groups + + diff --git a/SecureEnclaveSwift/SecureEnclaveDemoTests/Info.plist b/SecureEnclaveSwift/SecureEnclaveDemoTests/Info.plist index 6c6c23c..64d65ca 100644 --- a/SecureEnclaveSwift/SecureEnclaveDemoTests/Info.plist +++ b/SecureEnclaveSwift/SecureEnclaveDemoTests/Info.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - en + $(DEVELOPMENT_LANGUAGE) CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -13,7 +13,7 @@ CFBundleName $(PRODUCT_NAME) CFBundlePackageType - BNDL + $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString 1.0 CFBundleVersion diff --git a/SecureEnclaveSwift/SecureEnclaveDemoTests/SecureEnclaveDemoTests.swift b/SecureEnclaveSwift/SecureEnclaveDemoTests/SecureEnclaveDemoTests.swift index 2f4ad91..57b0817 100644 --- a/SecureEnclaveSwift/SecureEnclaveDemoTests/SecureEnclaveDemoTests.swift +++ b/SecureEnclaveSwift/SecureEnclaveDemoTests/SecureEnclaveDemoTests.swift @@ -15,30 +15,27 @@ */ import XCTest -@testable import SecureEnclaveDemo class SecureEnclaveDemoTests: XCTestCase { - - override func setUp() { - super.setUp() + + override func setUpWithError() throws { // Put setup code here. This method is called before the invocation of each test method in the class. } - - override func tearDown() { + + override func tearDownWithError() throws { // Put teardown code here. This method is called after the invocation of each test method in the class. - super.tearDown() } - - func testExample() { + + func testExample() throws { // This is an example of a functional test case. // Use XCTAssert and related functions to verify your tests produce the correct results. } - - func testPerformanceExample() { + + func testPerformanceExample() throws { // This is an example of a performance test case. - self.measure { + measure { // Put the code you want to measure the time of here. } } - + } diff --git a/SecureEnclaveSwift/SecureEnclaveHelper.swift b/SecureEnclaveSwift/SecureEnclaveHelper.swift index 3fadabb..7408f7e 100644 --- a/SecureEnclaveSwift/SecureEnclaveHelper.swift +++ b/SecureEnclaveSwift/SecureEnclaveHelper.swift @@ -235,7 +235,7 @@ final class SecureEnclaveHelper { if result == nil { - throw SecureEnclaveHelperError(message: "\(error)", osStatus: 0) + throw SecureEnclaveHelperError(message: "\(error).", osStatus: 0) } return result as! Data @@ -250,7 +250,7 @@ final class SecureEnclaveHelper { if result == nil { - throw SecureEnclaveHelperError(message: "\(error)", osStatus: 0) + throw SecureEnclaveHelperError(message: "\(error).", osStatus: 0) } return result as! Data