diff --git a/TrustKit.podspec b/TrustKit.podspec index 805e209..9cc4d2b 100644 --- a/TrustKit.podspec +++ b/TrustKit.podspec @@ -14,7 +14,6 @@ Pod::Spec.new do |s| s.watchos.deployment_target = '3.0' s.source_files = ['TrustKit', 'TrustKit/**/*.{h,m,c}'] - s.header_mappings_dir = 'TrustKit' s.public_header_files = [ 'TrustKit/TrustKit.h', 'TrustKit/TSKTrustKitConfig.h', diff --git a/TrustKit.xcodeproj/project.pbxproj b/TrustKit.xcodeproj/project.pbxproj index f8f22fd..606715e 100644 --- a/TrustKit.xcodeproj/project.pbxproj +++ b/TrustKit.xcodeproj/project.pbxproj @@ -222,9 +222,9 @@ 8CE919251AEA07C5002B29AE /* ssl_pin_verifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CE919241AEA07C5002B29AE /* ssl_pin_verifier.h */; }; 8CE9192D1AEA0F7E002B29AE /* domain_registry.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CE919291AEA0F7E002B29AE /* domain_registry.h */; }; FC1A09001E57A4BB0055B12C /* TSKPinningValidatorResult.h in Headers */ = {isa = PBXBuildFile; fileRef = FC1A08FE1E57A4BB0055B12C /* TSKPinningValidatorResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; - FC1A09011E57A4BB0055B12C /* TSKPinningValidatorResult.h in Headers */ = {isa = PBXBuildFile; fileRef = FC1A08FE1E57A4BB0055B12C /* TSKPinningValidatorResult.h */; }; - FC1A09021E57A4BB0055B12C /* TSKPinningValidatorResult.h in Headers */ = {isa = PBXBuildFile; fileRef = FC1A08FE1E57A4BB0055B12C /* TSKPinningValidatorResult.h */; }; - FC1A09031E57A4BB0055B12C /* TSKPinningValidatorResult.h in Headers */ = {isa = PBXBuildFile; fileRef = FC1A08FE1E57A4BB0055B12C /* TSKPinningValidatorResult.h */; }; + FC1A09011E57A4BB0055B12C /* TSKPinningValidatorResult.h in Headers */ = {isa = PBXBuildFile; fileRef = FC1A08FE1E57A4BB0055B12C /* TSKPinningValidatorResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FC1A09021E57A4BB0055B12C /* TSKPinningValidatorResult.h in Headers */ = {isa = PBXBuildFile; fileRef = FC1A08FE1E57A4BB0055B12C /* TSKPinningValidatorResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FC1A09031E57A4BB0055B12C /* TSKPinningValidatorResult.h in Headers */ = {isa = PBXBuildFile; fileRef = FC1A08FE1E57A4BB0055B12C /* TSKPinningValidatorResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; FC1A09041E57A4BB0055B12C /* TSKPinningValidatorResult.m in Sources */ = {isa = PBXBuildFile; fileRef = FC1A08FF1E57A4BB0055B12C /* TSKPinningValidatorResult.m */; }; FC1A09051E57A4BB0055B12C /* TSKPinningValidatorResult.m in Sources */ = {isa = PBXBuildFile; fileRef = FC1A08FF1E57A4BB0055B12C /* TSKPinningValidatorResult.m */; }; FC1A09061E57A4BB0055B12C /* TSKPinningValidatorResult.m in Sources */ = {isa = PBXBuildFile; fileRef = FC1A08FF1E57A4BB0055B12C /* TSKPinningValidatorResult.m */; }; @@ -245,6 +245,10 @@ FCE7D62F1EE9F6610081EEEF /* TSKTrustKitConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = FCE7D62C1EE9F6610081EEEF /* TSKTrustKitConfig.m */; }; FCE7D6301EE9F6610081EEEF /* TSKTrustKitConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = FCE7D62C1EE9F6610081EEEF /* TSKTrustKitConfig.m */; }; FCE7D6311EE9F66A0081EEEF /* TSKTrustKitConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = FCE7D62C1EE9F6610081EEEF /* TSKTrustKitConfig.m */; }; + FCE7D6321EE9FDFD0081EEEF /* TSKPublicKeyAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = FC1A09121E57C6820055B12C /* TSKPublicKeyAlgorithm.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FCE7D6331EE9FE080081EEEF /* TSKPublicKeyAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = FC1A09121E57C6820055B12C /* TSKPublicKeyAlgorithm.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FCE7D6341EE9FE260081EEEF /* TSKPublicKeyAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = FC1A09121E57C6820055B12C /* TSKPublicKeyAlgorithm.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FCE7D6351EE9FE2F0081EEEF /* TSKPublicKeyAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = FC1A09121E57C6820055B12C /* TSKPublicKeyAlgorithm.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -318,7 +322,6 @@ 6B032D3F1AF1AEB600EAFA69 /* TSKReporterTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TSKReporterTests.m; sourceTree = ""; }; 6B2B06AC1B05154A00FC749E /* TSKBackgroundReporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TSKBackgroundReporter.h; path = Reporting/TSKBackgroundReporter.h; sourceTree = ""; }; 6B2B06AE1B05157400FC749E /* TSKBackgroundReporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSKBackgroundReporter.m; path = Reporting/TSKBackgroundReporter.m; sourceTree = ""; }; - 8C0C90111E3C196A003851A8 /* TrustKit.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = TrustKit.modulemap; sourceTree = ""; }; 8C0C90471E3C41F3003851A8 /* TSKPinningValidator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = TSKPinningValidator.h; sourceTree = ""; }; 8C0C90481E3C41F3003851A8 /* TSKPinningValidator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = TSKPinningValidator.m; sourceTree = ""; }; 8C15F99E1B16094D00F06C0E /* TSKPinFailureReport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TSKPinFailureReport.h; path = Reporting/TSKPinFailureReport.h; sourceTree = ""; }; @@ -330,7 +333,6 @@ 8C5D98B21CEFF079008E654B /* parse_configuration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = parse_configuration.m; sourceTree = ""; }; 8C5D98B61CEFF103008E654B /* parse_configuration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = parse_configuration.h; sourceTree = ""; }; 8C8480471A896EE30017C155 /* TrustKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TrustKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 8C84804B1A896EE30017C155 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 8C84804C1A896EE30017C155 /* TrustKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TrustKit.h; sourceTree = ""; }; 8C8480521A896EE30017C155 /* TrustKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TrustKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 8C8480581A896EE30017C155 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -398,9 +400,11 @@ FC4CAC7A1E958E0500DAC41E /* TSKReportsRateLimiterTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSKReportsRateLimiterTests.m; sourceTree = ""; }; FC4CAC7E1E96917B00DAC41E /* TSKTrustKitConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TSKTrustKitConfig.h; sourceTree = ""; }; FC4CAC7F1E96A2D600DAC41E /* TSKLog.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TSKLog.h; sourceTree = ""; }; - FC4CAC801E96A95D00DAC41E /* TSKTrustKit-Umbrella.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TSKTrustKit-Umbrella.h"; sourceTree = ""; }; FCD0CC031E96ADF00076D431 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; FCE7D62C1EE9F6610081EEEF /* TSKTrustKitConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSKTrustKitConfig.m; sourceTree = ""; }; + FCE7D6381EEA04180081EEEF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + FCE7D6391EEA04180081EEEF /* TrustKit-umbrella.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TrustKit-umbrella.h"; sourceTree = ""; }; + FCE7D63A1EEA04180081EEEF /* TrustKit.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = TrustKit.modulemap; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -559,21 +563,11 @@ FC1A08FD1E579F630055B12C /* TSKPinValidatorResult.h */, FC1A08FE1E57A4BB0055B12C /* TSKPinningValidatorResult.h */, FC1A08FF1E57A4BB0055B12C /* TSKPinningValidatorResult.m */, - 8C84804A1A896EE30017C155 /* Supporting Files */, + FCE7D6371EEA04180081EEEF /* Framework */, ); path = TrustKit; sourceTree = ""; }; - 8C84804A1A896EE30017C155 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 8C0C90111E3C196A003851A8 /* TrustKit.modulemap */, - 8C84804B1A896EE30017C155 /* Info.plist */, - FC4CAC801E96A95D00DAC41E /* TSKTrustKit-Umbrella.h */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; 8C8480561A896EE30017C155 /* TrustKitTests */ = { isa = PBXGroup; children = ( @@ -777,6 +771,16 @@ name = Frameworks; sourceTree = ""; }; + FCE7D6371EEA04180081EEEF /* Framework */ = { + isa = PBXGroup; + children = ( + FCE7D6381EEA04180081EEEF /* Info.plist */, + FCE7D6391EEA04180081EEEF /* TrustKit-umbrella.h */, + FCE7D63A1EEA04180081EEEF /* TrustKit.modulemap */, + ); + path = Framework; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -786,6 +790,7 @@ files = ( 8C84CCDA1D6E5D5A009B3E7D /* registry_types.h in Headers */, FC1A09001E57A4BB0055B12C /* TSKPinningValidatorResult.h in Headers */, + FCE7D6321EE9FDFD0081EEEF /* TSKPublicKeyAlgorithm.h in Headers */, 8C0C904E1E3C4210003851A8 /* TSKPinningValidator.h in Headers */, 8CE9192D1AEA0F7E002B29AE /* domain_registry.h in Headers */, 8CD5F7491BCB535E005801D8 /* TSKNSURLSessionDelegateProxy.h in Headers */, @@ -811,7 +816,9 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + FC1A09021E57A4BB0055B12C /* TSKPinningValidatorResult.h in Headers */, 8C84CCDC1D6E5D5A009B3E7D /* registry_types.h in Headers */, + FCE7D6341EE9FE260081EEEF /* TSKPublicKeyAlgorithm.h in Headers */, 8C0C90501E3C4212003851A8 /* TSKPinningValidator.h in Headers */, 8C84CBA21D6E0981009B3E7D /* domain_registry.h in Headers */, 8C84CBA41D6E0981009B3E7D /* TSKNSURLSessionDelegateProxy.h in Headers */, @@ -826,7 +833,6 @@ 8C84CBA81D6E0981009B3E7D /* TSKReportsRateLimiter.h in Headers */, 8C84CCEE1D6E5D5A009B3E7D /* trie_search.h in Headers */, 8C84CBA91D6E0981009B3E7D /* RSSwizzle.h in Headers */, - FC1A09021E57A4BB0055B12C /* TSKPinningValidatorResult.h in Headers */, 8C84CBAA1D6E0981009B3E7D /* reporting_utils.h in Headers */, 8C84CBAB1D6E0981009B3E7D /* TrustKit.h in Headers */, 8C84CBAC1D6E0981009B3E7D /* TSKPinFailureReport.h in Headers */, @@ -838,8 +844,10 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + FC1A09011E57A4BB0055B12C /* TSKPinningValidatorResult.h in Headers */, 8C84CCDB1D6E5D5A009B3E7D /* registry_types.h in Headers */, 8C0C904F1E3C4212003851A8 /* TSKPinningValidator.h in Headers */, + FCE7D6331EE9FE080081EEEF /* TSKPublicKeyAlgorithm.h in Headers */, 8CA6CC251BAE2B6A00BDA419 /* TrustKit.h in Headers */, 8CD5F74A1BCB535E005801D8 /* TSKNSURLSessionDelegateProxy.h in Headers */, 8C4346D71E5B894A008023F9 /* configuration_utils.h in Headers */, @@ -855,7 +863,6 @@ 8CA6CC211BAE2B6A00BDA419 /* ssl_pin_verifier.h in Headers */, 8C84CCED1D6E5D5A009B3E7D /* trie_search.h in Headers */, 8CD5F7431BCB06F4005801D8 /* RSSwizzle.h in Headers */, - FC1A09011E57A4BB0055B12C /* TSKPinningValidatorResult.h in Headers */, 8CA6CC191BAE2B6600BDA419 /* TSKBackgroundReporter.h in Headers */, 8CA6CC271BAE2B7000BDA419 /* domain_registry.h in Headers */, 8CA6CC1D1BAE2B6600BDA419 /* reporting_utils.h in Headers */, @@ -866,7 +873,9 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + FC1A09031E57A4BB0055B12C /* TSKPinningValidatorResult.h in Headers */, 8CC5D2371D6E64D10074F515 /* registry_types.h in Headers */, + FCE7D6351EE9FE2F0081EEEF /* TSKPublicKeyAlgorithm.h in Headers */, 8C0C90511E3C4213003851A8 /* TSKPinningValidator.h in Headers */, 8CC5D2381D6E64D10074F515 /* domain_registry.h in Headers */, 8CC5D23A1D6E64D10074F515 /* TSKNSURLSessionDelegateProxy.h in Headers */, @@ -881,7 +890,6 @@ 8CC5D2431D6E64D10074F515 /* TSKReportsRateLimiter.h in Headers */, 8CC5D2441D6E64D10074F515 /* trie_search.h in Headers */, 8CC5D2451D6E64D10074F515 /* RSSwizzle.h in Headers */, - FC1A09031E57A4BB0055B12C /* TSKPinningValidatorResult.h in Headers */, 8CC5D2461D6E64D10074F515 /* reporting_utils.h in Headers */, 8CC5D2471D6E64D10074F515 /* TrustKit.h in Headers */, 8CC5D2481D6E64D10074F515 /* TSKPinFailureReport.h in Headers */, @@ -1395,7 +1403,6 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; ENABLE_BITCODE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1421,7 +1428,8 @@ GCC_WARN_UNKNOWN_PRAGMAS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MODULEMAP_FILE = "$(SRCROOT)/TrustKit/TrustKit.modulemap"; + HEADER_SEARCH_PATHS = "$(SRCROOT)/**"; + MODULEMAP_FILE = "$(SRCROOT)/TrustKit/Framework/TrustKit.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -1458,7 +1466,6 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; ENABLE_BITCODE = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -1479,7 +1486,8 @@ GCC_WARN_UNKNOWN_PRAGMAS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MODULEMAP_FILE = "$(SRCROOT)/TrustKit/TrustKit.modulemap"; + HEADER_SEARCH_PATHS = "$(SRCROOT)/**"; + MODULEMAP_FILE = "$(SRCROOT)/TrustKit/Framework/TrustKit.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; @@ -1504,12 +1512,11 @@ ENABLE_BITCODE = "$(inherited)"; GCC_GENERATE_TEST_COVERAGE_FILES = YES; GENERATE_PKGINFO_FILE = YES; - INFOPLIST_FILE = TrustKit/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MODULEMAP_FILE = "$(SRCROOT)/TrustKit/TrustKit.modulemap"; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1535,12 +1542,11 @@ ENABLE_BITCODE = "$(inherited)"; GCC_GENERATE_TEST_COVERAGE_FILES = YES; GENERATE_PKGINFO_FILE = YES; - INFOPLIST_FILE = TrustKit/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MODULEMAP_FILE = "$(SRCROOT)/TrustKit/TrustKit.modulemap"; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -1571,7 +1577,6 @@ INFOPLIST_FILE = TrustKitTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @loader_path/../Frameworks @executable_path/../Frameworks"; - MODULEMAP_FILE = ""; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1597,7 +1602,6 @@ INFOPLIST_FILE = TrustKitTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @loader_path/../Frameworks @executable_path/../Frameworks"; - MODULEMAP_FILE = ""; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1621,7 +1625,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = "$(inherited)"; GCC_GENERATE_TEST_COVERAGE_FILES = YES; - INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1653,7 +1657,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = "$(inherited)"; GCC_GENERATE_TEST_COVERAGE_FILES = YES; - INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1689,7 +1693,6 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = TrustKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @loader_path/../Frameworks @executable_path/../Frameworks"; - MODULEMAP_FILE = ""; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1716,7 +1719,6 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = TrustKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @loader_path/../Frameworks @executable_path/../Frameworks"; - MODULEMAP_FILE = ""; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1785,7 +1787,7 @@ FRAMEWORK_VERSION = A; GCC_GENERATE_TEST_COVERAGE_FILES = YES; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; @@ -1814,7 +1816,7 @@ FRAMEWORK_VERSION = A; GCC_GENERATE_TEST_COVERAGE_FILES = YES; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; @@ -1843,7 +1845,6 @@ INFOPLIST_FILE = TrustKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.9; - MODULEMAP_FILE = ""; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.TrustKit-OS-XTests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1868,7 +1869,6 @@ INFOPLIST_FILE = TrustKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.9; - MODULEMAP_FILE = ""; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.TrustKit-OS-XTests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1891,7 +1891,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = "$(inherited)"; GCC_GENERATE_TEST_COVERAGE_FILES = YES; - INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1923,7 +1923,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = "$(inherited)"; GCC_GENERATE_TEST_COVERAGE_FILES = YES; - INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; diff --git a/TrustKit/Info.plist b/TrustKit/Framework/Info.plist similarity index 100% rename from TrustKit/Info.plist rename to TrustKit/Framework/Info.plist diff --git a/TrustKit/Framework/TrustKit-umbrella.h b/TrustKit/Framework/TrustKit-umbrella.h new file mode 100644 index 0000000..5809f4e --- /dev/null +++ b/TrustKit/Framework/TrustKit-umbrella.h @@ -0,0 +1,17 @@ +// +// TrustKit.h +// TrustKit +// +// Created by Adam Kaplan on 6/8/17. +// Copyright © 2017 TrustKit. All rights reserved. +// + +#ifndef _TRUSTKIT_ +#define _TRUSTKIT_ + +#import +#import +#import +#import + +#endif /* _TRUSTKIT_ */ diff --git a/TrustKit/TrustKit.modulemap b/TrustKit/Framework/TrustKit.modulemap similarity index 61% rename from TrustKit/TrustKit.modulemap rename to TrustKit/Framework/TrustKit.modulemap index add7afd..0526b6f 100644 --- a/TrustKit/TrustKit.modulemap +++ b/TrustKit/Framework/TrustKit.modulemap @@ -1,5 +1,5 @@ framework module TrustKit { - umbrella header "TSKTrustKit-Umbrella.h" + umbrella header "TrustKit-umbrella.h" export * module * { export * } diff --git a/TrustKit/Reporting/TSKBackgroundReporter.m b/TrustKit/Reporting/TSKBackgroundReporter.m index 59f7b70..bd3ea3a 100644 --- a/TrustKit/Reporting/TSKBackgroundReporter.m +++ b/TrustKit/Reporting/TSKBackgroundReporter.m @@ -10,7 +10,6 @@ */ #import "TSKBackgroundReporter.h" -#import "../TrustKit.h" #import "../TSKTrustKitConfig.h" #import "../TSKLog.h" #import "TSKPinFailureReport.h" diff --git a/TrustKit/TSKLog.h b/TrustKit/TSKLog.h index 0c39404..38ed503 100644 --- a/TrustKit/TSKLog.h +++ b/TrustKit/TSKLog.h @@ -1,6 +1,6 @@ /* - TSKCommon.h + TSKLog.h TrustKit Copyright 2015 The TrustKit Project Authors @@ -11,8 +11,8 @@ // Common header with internal constants and defines. -#ifndef TSKCommon_h -#define TSKCommon_h +#ifndef TSKLog_h +#define TSKLog_h // The logging function we use within TrustKit #ifdef DEBUG @@ -21,4 +21,4 @@ #define TSKLog(format, ...) #endif -#endif /* TSKCommon_h */ +#endif /* TSKLog_h */ diff --git a/TrustKit/TSKPinningValidator.h b/TrustKit/TSKPinningValidator.h index bceb6f5..8482abf 100644 --- a/TrustKit/TSKPinningValidator.h +++ b/TrustKit/TSKPinningValidator.h @@ -10,7 +10,7 @@ */ #import "TSKPinValidatorResult.h" -#import "Pinning/TSKPublicKeyAlgorithm.h" +#import "TSKPublicKeyAlgorithm.h" @import Foundation; @class TSKPinningValidatorResult; diff --git a/TrustKit/TSKTrustKit-Umbrella.h b/TrustKit/TSKTrustKit-Umbrella.h deleted file mode 100644 index d9a12f7..0000000 --- a/TrustKit/TSKTrustKit-Umbrella.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// TSKTrustKit-Umbrella.h -// TrustKit -// -// Created by Adam Kaplan on 4/6/17. -// Copyright © 2017 TrustKit. All rights reserved. -// - -#ifndef TSKTrustKit_Umbrella_h -#define TSKTrustKit_Umbrella_h - -#import - -#import "TSKTrustKitConfig.h" -#import "TSKPinValidatorResult.h" -#import "Pinning/TSKPublicKeyAlgorithm.h" - -#endif /* TSKTrustKit_Umbrella_h */ diff --git a/TrustKit/TSKTrustKitConfig.m b/TrustKit/TSKTrustKitConfig.m index a3641a4..c815bbc 100644 --- a/TrustKit/TSKTrustKitConfig.m +++ b/TrustKit/TSKTrustKitConfig.m @@ -7,6 +7,8 @@ // #import "TSKTrustKitConfig.h" +NSString * const TrustKitVersion = @"1.5.0"; + // General keys const TSKGlobalConfigurationKey kTSKSwizzleNetworkDelegates = @"TSKSwizzleNetworkDelegates"; const TSKGlobalConfigurationKey kTSKPinnedDomains = @"TSKPinnedDomains"; diff --git a/TrustKit/TrustKit.h b/TrustKit/TrustKit.h index d674bf4..3a3d536 100644 --- a/TrustKit/TrustKit.h +++ b/TrustKit/TrustKit.h @@ -11,16 +11,16 @@ @import Foundation; -@class TSKPinningValidator; -@class TSKPinningValidatorResult; +#ifndef _TRUSTKIT_ +#define _TRUSTKIT_ + #import "TSKTrustKitConfig.h" + #import "TSKPublicKeyAlgorithm.h" + #import "TSKPinningValidator.h" + #import "TSKPinValidatorResult.h" +#endif /* _TRUSTKIT_ */ NS_ASSUME_NONNULL_BEGIN -/** - The version of TrustKit, such as "1.4.0". - */ -FOUNDATION_EXPORT NSString * const TrustKitVersion; - /** The default URI – maintained by DataTheorem – used for pinning failure reports if none is specified in the configuration. */ diff --git a/TrustKit/TrustKit.m b/TrustKit/TrustKit.m index 63f7c5f..4072e20 100644 --- a/TrustKit/TrustKit.m +++ b/TrustKit/TrustKit.m @@ -16,13 +16,9 @@ #import "Swizzling/TSKNSURLSessionDelegateProxy.h" #import "Pinning/TSKSPKIHashCache.h" #import "parse_configuration.h" -#import "TSKPinningValidator.h" #import "TSKPinningValidatorResult.h" -#import "TSKTrustKitConfig.h" #import "TSKLog.h" -NSString * const TrustKitVersion = @"1.5.0"; - // Info.plist key we read the public key hashes from static const NSString *kTSKConfiguration = @"TSKConfiguration";