diff --git a/OpenSSL-for-iOS.xcodeproj/project.pbxproj b/OpenSSL-for-iOS.xcodeproj/project.pbxproj index 274f72c..b347e02 100644 --- a/OpenSSL-for-iOS.xcodeproj/project.pbxproj +++ b/OpenSSL-for-iOS.xcodeproj/project.pbxproj @@ -7,14 +7,21 @@ objects = { /* Begin PBXBuildFile section */ + 2A1DDC8D1BFB1C5D00F7722A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 533ED30B1528C4840005C6FA /* main.m */; }; + 2A1DDC8F1BFB1DF600F7722A /* ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2A1DDC8E1BFB1DF600F7722A /* ViewController.xib */; }; + 2A8A9A7E1BFA59F7002944B4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2A8A9A7D1BFA59F7002944B4 /* Assets.xcassets */; }; + 2A8A9A851BFA5AFF002944B4 /* ViewController~tv.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2A8A9A841BFA5AFF002944B4 /* ViewController~tv.xib */; }; + 2A8A9A861BFA5B04002944B4 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 533ED3121528C4840005C6FA /* ViewController.m */; }; + 2A8A9A871BFA5B6A002944B4 /* FSOpenSSL.m in Sources */ = {isa = PBXBuildFile; fileRef = D1E97EE2A904D58DAE4231E2 /* FSOpenSSL.m */; }; + 2A8A9A8A1BFA5B85002944B4 /* libcrypto-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A8A9A881BFA5B85002944B4 /* libcrypto-tvOS.a */; }; + 2A8A9A8B1BFA5B85002944B4 /* libssl-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A8A9A891BFA5B85002944B4 /* libssl-tvOS.a */; }; + 2A8A9A8D1BFA7B79002944B4 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 533ED30F1528C4840005C6FA /* AppDelegate.m */; }; 533ED3001528C4840005C6FA /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 533ED2FF1528C4840005C6FA /* UIKit.framework */; }; 533ED3021528C4840005C6FA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 533ED3011528C4840005C6FA /* Foundation.framework */; }; 533ED3041528C4840005C6FA /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 533ED3031528C4840005C6FA /* CoreGraphics.framework */; }; - 533ED30A1528C4840005C6FA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 533ED3081528C4840005C6FA /* InfoPlist.strings */; }; 533ED30C1528C4840005C6FA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 533ED30B1528C4840005C6FA /* main.m */; }; 533ED3101528C4840005C6FA /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 533ED30F1528C4840005C6FA /* AppDelegate.m */; }; 533ED3131528C4840005C6FA /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 533ED3121528C4840005C6FA /* ViewController.m */; }; - 533ED3161528C4840005C6FA /* ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 533ED3141528C4840005C6FA /* ViewController.xib */; }; 533ED32C1528C53B0005C6FA /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 533ED32A1528C53B0005C6FA /* libcrypto.a */; }; 533ED32D1528C53B0005C6FA /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 533ED32B1528C53B0005C6FA /* libssl.a */; }; 534FB2AE180975D700B5F868 /* Icons.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 534FB2AD180975D700B5F868 /* Icons.xcassets */; }; @@ -37,19 +44,24 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 2A1DDC8E1BFB1DF600F7722A /* ViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ViewController.xib; sourceTree = ""; }; + 2A8A9A6F1BFA59F7002944B4 /* OpenSSL-for-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "OpenSSL-for-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 2A8A9A7D1BFA59F7002944B4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 2A8A9A7F1BFA59F7002944B4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 2A8A9A841BFA5AFF002944B4 /* ViewController~tv.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "ViewController~tv.xib"; sourceTree = ""; }; + 2A8A9A881BFA5B85002944B4 /* libcrypto-tvOS.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libcrypto-tvOS.a"; path = "lib/libcrypto-tvOS.a"; sourceTree = ""; }; + 2A8A9A891BFA5B85002944B4 /* libssl-tvOS.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libssl-tvOS.a"; path = "lib/libssl-tvOS.a"; sourceTree = ""; }; 533ED2FB1528C4840005C6FA /* OpenSSL.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenSSL.app; sourceTree = BUILT_PRODUCTS_DIR; }; 533ED2FF1528C4840005C6FA /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 533ED3011528C4840005C6FA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 533ED3031528C4840005C6FA /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 533ED3071528C4840005C6FA /* OpenSSL-for-iOS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OpenSSL-for-iOS-Info.plist"; sourceTree = ""; }; - 533ED3091528C4840005C6FA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 533ED30B1528C4840005C6FA /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 533ED30D1528C4840005C6FA /* OpenSSL-for-iOS-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OpenSSL-for-iOS-Prefix.pch"; sourceTree = ""; }; 533ED30E1528C4840005C6FA /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 533ED30F1528C4840005C6FA /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; 533ED3111528C4840005C6FA /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; 533ED3121528C4840005C6FA /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - 533ED3151528C4840005C6FA /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ViewController.xib; sourceTree = ""; }; 533ED32A1528C53B0005C6FA /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = lib/libcrypto.a; sourceTree = ""; }; 533ED32B1528C53B0005C6FA /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = lib/libssl.a; sourceTree = ""; }; 534FB2AD180975D700B5F868 /* Icons.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Icons.xcassets; sourceTree = ""; }; @@ -67,6 +79,15 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 2A8A9A6C1BFA59F7002944B4 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 2A8A9A8B1BFA5B85002944B4 /* libssl-tvOS.a in Frameworks */, + 2A8A9A8A1BFA5B85002944B4 /* libcrypto-tvOS.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 533ED2F81528C4840005C6FA /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -92,12 +113,22 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 2A8A9A701BFA59F7002944B4 /* OpenSSL-for-tvOS */ = { + isa = PBXGroup; + children = ( + 2A8A9A7D1BFA59F7002944B4 /* Assets.xcassets */, + 2A8A9A7F1BFA59F7002944B4 /* Info.plist */, + ); + path = "OpenSSL-for-tvOS"; + sourceTree = ""; + }; 533ED2F01528C4840005C6FA = { isa = PBXGroup; children = ( FD5896FC1B2F1FF900F3E5B5 /* README.md */, 533ED3051528C4840005C6FA /* OpenSSL-for-iOS */, 53572A50183AAFFE00B21832 /* OpenSSL-for-iOS_Tests */, + 2A8A9A701BFA59F7002944B4 /* OpenSSL-for-tvOS */, FD5896FD1B2F1FFC00F3E5B5 /* Scripts */, 533ED2FE1528C4840005C6FA /* Frameworks */, 533ED2FC1528C4840005C6FA /* Products */, @@ -109,6 +140,7 @@ children = ( 533ED2FB1528C4840005C6FA /* OpenSSL.app */, 53572A4B183AAFFE00B21832 /* OpenSSL-for-iOS_Tests.xctest */, + 2A8A9A6F1BFA59F7002944B4 /* OpenSSL-for-tvOS.app */, ); name = Products; sourceTree = ""; @@ -116,6 +148,8 @@ 533ED2FE1528C4840005C6FA /* Frameworks */ = { isa = PBXGroup; children = ( + 2A8A9A881BFA5B85002944B4 /* libcrypto-tvOS.a */, + 2A8A9A891BFA5B85002944B4 /* libssl-tvOS.a */, 533ED32A1528C53B0005C6FA /* libcrypto.a */, 533ED32B1528C53B0005C6FA /* libssl.a */, 533ED2FF1528C4840005C6FA /* UIKit.framework */, @@ -133,7 +167,8 @@ 533ED30F1528C4840005C6FA /* AppDelegate.m */, 533ED3111528C4840005C6FA /* ViewController.h */, 533ED3121528C4840005C6FA /* ViewController.m */, - 533ED3141528C4840005C6FA /* ViewController.xib */, + 2A1DDC8E1BFB1DF600F7722A /* ViewController.xib */, + 2A8A9A841BFA5AFF002944B4 /* ViewController~tv.xib */, 533ED3061528C4840005C6FA /* Supporting Files */, D1E97EE2A904D58DAE4231E2 /* FSOpenSSL.m */, D1E979D803ACC127411934DC /* FSOpenSSL.h */, @@ -146,7 +181,6 @@ isa = PBXGroup; children = ( 533ED3071528C4840005C6FA /* OpenSSL-for-iOS-Info.plist */, - 533ED3081528C4840005C6FA /* InfoPlist.strings */, 533ED30B1528C4840005C6FA /* main.m */, 533ED30D1528C4840005C6FA /* OpenSSL-for-iOS-Prefix.pch */, ); @@ -184,6 +218,23 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 2A8A9A6E1BFA59F7002944B4 /* OpenSSL-for-tvOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 2A8A9A821BFA59F7002944B4 /* Build configuration list for PBXNativeTarget "OpenSSL-for-tvOS" */; + buildPhases = ( + 2A8A9A6B1BFA59F7002944B4 /* Sources */, + 2A8A9A6C1BFA59F7002944B4 /* Frameworks */, + 2A8A9A6D1BFA59F7002944B4 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "OpenSSL-for-tvOS"; + productName = "OpenSSL-for-tvOS"; + productReference = 2A8A9A6F1BFA59F7002944B4 /* OpenSSL-for-tvOS.app */; + productType = "com.apple.product-type.application"; + }; 533ED2FA1528C4840005C6FA /* OpenSSL-for-iOS */ = { isa = PBXNativeTarget; buildConfigurationList = 533ED31C1528C4840005C6FA /* Build configuration list for PBXNativeTarget "OpenSSL-for-iOS" */; @@ -229,6 +280,9 @@ LastUpgradeCheck = 0710; ORGANIZATIONNAME = Immobilienscout24; TargetAttributes = { + 2A8A9A6E1BFA59F7002944B4 = { + CreatedOnToolsVersion = 7.1.1; + }; 53572A4A183AAFFE00B21832 = { TestTargetID = 533ED2FA1528C4840005C6FA; }; @@ -240,6 +294,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 533ED2F01528C4840005C6FA; productRefGroup = 533ED2FC1528C4840005C6FA /* Products */; @@ -248,17 +303,26 @@ targets = ( 533ED2FA1528C4840005C6FA /* OpenSSL-for-iOS */, 53572A4A183AAFFE00B21832 /* OpenSSL-for-iOS_Tests */, + 2A8A9A6E1BFA59F7002944B4 /* OpenSSL-for-tvOS */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 2A8A9A6D1BFA59F7002944B4 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 2A8A9A851BFA5AFF002944B4 /* ViewController~tv.xib in Resources */, + 2A8A9A7E1BFA59F7002944B4 /* Assets.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 533ED2F91528C4840005C6FA /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 533ED30A1528C4840005C6FA /* InfoPlist.strings in Resources */, - 533ED3161528C4840005C6FA /* ViewController.xib in Resources */, + 2A1DDC8F1BFB1DF600F7722A /* ViewController.xib in Resources */, 534FB2AE180975D700B5F868 /* Icons.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -292,6 +356,17 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 2A8A9A6B1BFA59F7002944B4 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 2A8A9A8D1BFA7B79002944B4 /* AppDelegate.m in Sources */, + 2A8A9A861BFA5B04002944B4 /* ViewController.m in Sources */, + 2A1DDC8D1BFB1C5D00F7722A /* main.m in Sources */, + 2A8A9A871BFA5B6A002944B4 /* FSOpenSSL.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 533ED2F71528C4840005C6FA /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -322,22 +397,6 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 533ED3081528C4840005C6FA /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 533ED3091528C4840005C6FA /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; - 533ED3141528C4840005C6FA /* ViewController.xib */ = { - isa = PBXVariantGroup; - children = ( - 533ED3151528C4840005C6FA /* en */, - ); - name = ViewController.xib; - sourceTree = ""; - }; 53572A53183AAFFE00B21832 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -349,6 +408,64 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 2A8A9A801BFA59F7002944B4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + DEBUG_INFORMATION_FORMAT = dwarf; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = "OpenSSL-for-tvOS/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/lib", + ); + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = "de.felixschulze.OpenSSL-for-tvOS"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = appletvos; + TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 9.0; + }; + name = Debug; + }; + 2A8A9A811BFA59F7002944B4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = "OpenSSL-for-tvOS/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/lib", + ); + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "de.felixschulze.OpenSSL-for-tvOS"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = appletvos; + TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 9.0; + }; + name = Release; + }; 533ED31A1528C4840005C6FA /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -382,10 +499,11 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "include/**"; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; + TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; }; @@ -414,10 +532,11 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "include/**"; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; + TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; }; name = Release; @@ -525,6 +644,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 2A8A9A821BFA59F7002944B4 /* Build configuration list for PBXNativeTarget "OpenSSL-for-tvOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2A8A9A801BFA59F7002944B4 /* Debug */, + 2A8A9A811BFA59F7002944B4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 533ED2F51528C4840005C6FA /* Build configuration list for PBXProject "OpenSSL-for-iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/OpenSSL-for-iOS/AppDelegate.h b/OpenSSL-for-iOS/AppDelegate.h index f773ae6..1e31642 100644 --- a/OpenSSL-for-iOS/AppDelegate.h +++ b/OpenSSL-for-iOS/AppDelegate.h @@ -10,11 +10,8 @@ #import -@class ViewController; - @interface AppDelegate : UIResponder @property (strong, nonatomic) UIWindow *window; -@property (strong, nonatomic) ViewController *viewController; @end diff --git a/OpenSSL-for-iOS/AppDelegate.m b/OpenSSL-for-iOS/AppDelegate.m index 20a290b..04952f5 100644 --- a/OpenSSL-for-iOS/AppDelegate.m +++ b/OpenSSL-for-iOS/AppDelegate.m @@ -13,14 +13,18 @@ @implementation AppDelegate -@synthesize window = _window; -@synthesize viewController = _viewController; - - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; - self.viewController = [[ViewController alloc] initWithNibName:@"ViewController" bundle:nil]; - self.window.rootViewController = self.viewController; + + UIViewController *viewController = [[ViewController alloc] init]; +#if TARGET_OS_TV + self.window.rootViewController = viewController; +#else + UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:viewController]; + navigationController.navigationBar.translucent = NO; + self.window.rootViewController = navigationController; +#endif [self.window makeKeyAndVisible]; return YES; } diff --git a/OpenSSL-for-iOS/OpenSSL-for-iOS-Info.plist b/OpenSSL-for-iOS/OpenSSL-for-iOS-Info.plist index 5e3f63d..cd2b0d7 100644 --- a/OpenSSL-for-iOS/OpenSSL-for-iOS-Info.plist +++ b/OpenSSL-for-iOS/OpenSSL-for-iOS-Info.plist @@ -39,6 +39,9 @@ UISupportedInterfaceOrientations UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight UISupportedInterfaceOrientations~ipad diff --git a/OpenSSL-for-iOS/OpenSSL-for-iOS-Prefix.pch b/OpenSSL-for-iOS/OpenSSL-for-iOS-Prefix.pch index b88b813..e9f9330 100644 --- a/OpenSSL-for-iOS/OpenSSL-for-iOS-Prefix.pch +++ b/OpenSSL-for-iOS/OpenSSL-for-iOS-Prefix.pch @@ -4,8 +4,8 @@ #import -#ifndef __IPHONE_4_0 -#warning "This project uses features only available in iOS SDK 4.0 and later." +#ifndef __IPHONE_8_0 +#warning "This project uses features only available in iOS SDK 8.0 and later." #endif #ifdef __OBJC__ diff --git a/OpenSSL-for-iOS/ViewController.h b/OpenSSL-for-iOS/ViewController.h index 33099d6..5876f69 100644 --- a/OpenSSL-for-iOS/ViewController.h +++ b/OpenSSL-for-iOS/ViewController.h @@ -17,7 +17,5 @@ @property (nonatomic, strong) IBOutlet UILabel *sha256TextField; - (IBAction)showInfo; -- (IBAction)calculateMD5:(id)sender; -- (IBAction)calculateSHA256:(id)sender; @end diff --git a/OpenSSL-for-iOS/ViewController.m b/OpenSSL-for-iOS/ViewController.m index 6e9fb63..05c0aa6 100644 --- a/OpenSSL-for-iOS/ViewController.m +++ b/OpenSSL-for-iOS/ViewController.m @@ -14,37 +14,58 @@ @implementation ViewController -@synthesize textField; -@synthesize md5TextField; -@synthesize sha256TextField; - -#pragma mark - -#pragma mark OpenSSL - -- (IBAction)calculateMD5:(id)sender +- (instancetype)init { - md5TextField.text = [FSOpenSSL md5FromString:textField.text]; - //Hide Keyboard after calculation - [textField resignFirstResponder]; + NSString *nibName = @"ViewController"; +#if TARGET_OS_TV + nibName = @"ViewController~tv"; +#endif + self = [super initWithNibName:nibName bundle:nil]; + if (self) { + + } + return self; } -- (IBAction)calculateSHA256:(id)sender +- (void)viewDidLoad { - sha256TextField.text = [FSOpenSSL sha256FromString:textField.text]; - //Hide Keyboard after calculation - [textField resignFirstResponder]; + self.title = @"OpenSSL-for-iOS"; + UIButton *infoButton = [UIButton buttonWithType:UIButtonTypeInfoLight]; + [infoButton addTarget:self action:@selector(showInfo) forControlEvents:UIControlEventTouchUpInside]; + self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:infoButton]; + + [_textField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; + + [self calculateHash]; + + [super viewDidLoad]; } -- (IBAction)showInfo +- (IBAction)textFieldDidChange:(id)sender +{ + [self calculateHash]; +} + +- (void)calculateHash +{ + if (_textField.text.length > 0) + { + _md5TextField.text = [FSOpenSSL md5FromString:_textField.text]; + _sha256TextField.text = [FSOpenSSL sha256FromString:_textField.text]; + } + else + { + _md5TextField.text = nil; + _sha256TextField.text = nil; + } +} + +- (IBAction)showInfo { NSString *message = [NSString stringWithFormat:@"OpenSSL-Version: %@\nLicense: See include/LICENSE\n\nCopyright 2010-2015 by Felix Schulze\n http://www.felixschulze.de", @OPENSSL_VERSION_TEXT]; - UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"OpenSSL-for-iOS" message:message delegate:nil cancelButtonTitle:@"Close" otherButtonTitles:nil]; - [alert show]; -} - -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation -{ - return (interfaceOrientation == UIInterfaceOrientationPortrait); + UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"OpenSSL-for-iOS" message:message preferredStyle:UIAlertControllerStyleAlert]; + [alertController addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleCancel handler:nil]]; + [self presentViewController:alertController animated:YES completion:nil]; } @end diff --git a/OpenSSL-for-iOS/en.lproj/ViewController.xib b/OpenSSL-for-iOS/ViewController.xib similarity index 55% rename from OpenSSL-for-iOS/en.lproj/ViewController.xib rename to OpenSSL-for-iOS/ViewController.xib index dcf0f85..eabb087 100644 --- a/OpenSSL-for-iOS/en.lproj/ViewController.xib +++ b/OpenSSL-for-iOS/ViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -15,62 +15,25 @@ - + - - - - - - - - - - - - - + - - - - - - - - - + - - - - + - - + + + diff --git a/OpenSSL-for-iOS/ViewController~tv.xib b/OpenSSL-for-iOS/ViewController~tv.xib new file mode 100644 index 0000000..b5dad3b --- /dev/null +++ b/OpenSSL-for-iOS/ViewController~tv.xib @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenSSL-for-iOS/en.lproj/InfoPlist.strings b/OpenSSL-for-iOS/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28f..0000000 --- a/OpenSSL-for-iOS/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Content.imageset/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Content.imageset/Contents.json new file mode 100644 index 0000000..0564959 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Content.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "tv", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Contents.json new file mode 100644 index 0000000..8bf75d9 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Contents.json @@ -0,0 +1,17 @@ +{ + "layers" : [ + { + "filename" : "Front.imagestacklayer" + }, + { + "filename" : "Middle.imagestacklayer" + }, + { + "filename" : "Back.imagestacklayer" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Content.imageset/Contents.json new file mode 100644 index 0000000..0564959 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Content.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "tv", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json new file mode 100644 index 0000000..0564959 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "tv", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Content.imageset/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Content.imageset/Contents.json new file mode 100644 index 0000000..0564959 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Content.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "tv", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Contents.json new file mode 100644 index 0000000..8bf75d9 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Contents.json @@ -0,0 +1,17 @@ +{ + "layers" : [ + { + "filename" : "Front.imagestacklayer" + }, + { + "filename" : "Middle.imagestacklayer" + }, + { + "filename" : "Back.imagestacklayer" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Content.imageset/Contents.json new file mode 100644 index 0000000..0564959 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Content.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "tv", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json new file mode 100644 index 0000000..0564959 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "tv", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json new file mode 100644 index 0000000..6a3dcfa --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json @@ -0,0 +1,26 @@ +{ + "assets" : [ + { + "size" : "1280x768", + "idiom" : "tv", + "filename" : "App Icon - Large.imagestack", + "role" : "primary-app-icon" + }, + { + "size" : "400x240", + "idiom" : "tv", + "filename" : "App Icon - Small.imagestack", + "role" : "primary-app-icon" + }, + { + "size" : "1920x720", + "idiom" : "tv", + "filename" : "Top Shelf Image.imageset", + "role" : "top-shelf-image" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json new file mode 100644 index 0000000..0564959 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "tv", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/OpenSSL-for-tvOS/Assets.xcassets/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/OpenSSL-for-tvOS/Assets.xcassets/LaunchImage.launchimage/Contents.json b/OpenSSL-for-tvOS/Assets.xcassets/LaunchImage.launchimage/Contents.json new file mode 100644 index 0000000..29d94c7 --- /dev/null +++ b/OpenSSL-for-tvOS/Assets.xcassets/LaunchImage.launchimage/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "orientation" : "landscape", + "idiom" : "tv", + "extent" : "full-screen", + "minimum-system-version" : "9.0", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/OpenSSL-for-tvOS/Info.plist b/OpenSSL-for-tvOS/Info.plist new file mode 100644 index 0000000..4f33860 --- /dev/null +++ b/OpenSSL-for-tvOS/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + arm64 + + + diff --git a/README.md b/README.md index 42a5707..8b7b833 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ If you have problems building for arm64 please uninstall MacPorts (see #28). * ## Changelog +* 2015-11-17: tvOS example app * 2015-11-16: tvOS support * 2015-10-25: Xcode 7.1 support * 2015-08-06: iOS 9.0 support, Bitcode support