From c460cee3a039eb25b16be9fa63ab175b25323568 Mon Sep 17 00:00:00 2001 From: Felix Schulze Date: Sun, 18 Sep 2016 10:59:49 +0200 Subject: [PATCH] Add support for Xcode 8 / iOS 10.0 --- .travis.yml | 2 +- OpenSSL-for-iOS.xcodeproj/project.pbxproj | 15 +++++++++- .../xcschemes/OpenSSL-for-iOS.xcscheme | 2 +- OpenSSL-for-iOS/AppDelegate.swift | 6 ++-- .../AppIcon.appiconset/Contents.json | 26 ++++++++++++++++++ .../AppIcon.appiconset/Icon-83.5@2x-1.png | Bin 0 -> 15699 bytes OpenSSL-for-iOS/ViewController.swift | 18 ++++++------ README.md | 7 +++-- 8 files changed, 58 insertions(+), 18 deletions(-) create mode 100644 OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-83.5@2x-1.png diff --git a/.travis.yml b/.travis.yml index e573a53..964dd1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode7.3 +osx_image: xcode8 language: objective-c before_install: - ./build-libssl.sh verbose-on-error diff --git a/OpenSSL-for-iOS.xcodeproj/project.pbxproj b/OpenSSL-for-iOS.xcodeproj/project.pbxproj index 2282fd5..563ad82 100644 --- a/OpenSSL-for-iOS.xcodeproj/project.pbxproj +++ b/OpenSSL-for-iOS.xcodeproj/project.pbxproj @@ -271,13 +271,17 @@ 533ED2F21528C4840005C6FA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0710; + LastUpgradeCheck = 0800; ORGANIZATIONNAME = Immobilienscout24; TargetAttributes = { 2A8A9A6E1BFA59F7002944B4 = { CreatedOnToolsVersion = 7.1.1; }; + 533ED2FA1528C4840005C6FA = { + LastSwiftMigration = 0800; + }; 53572A4A183AAFFE00B21832 = { + LastSwiftMigration = 0800; TestTargetID = 533ED2FA1528C4840005C6FA; }; }; @@ -469,7 +473,9 @@ CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; @@ -510,7 +516,9 @@ CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; @@ -529,6 +537,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; @@ -553,6 +562,7 @@ PRODUCT_NAME = OpenSSL; SWIFT_OBJC_BRIDGING_HEADER = "OpenSSL-for-iOS/OpenSSL-for-iOS-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; WRAPPER_EXTENSION = app; }; name = Debug; @@ -574,6 +584,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "de.felixschulze.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = OpenSSL; SWIFT_OBJC_BRIDGING_HEADER = "OpenSSL-for-iOS/OpenSSL-for-iOS-Bridging-Header.h"; + SWIFT_VERSION = 3.0; WRAPPER_EXTENSION = app; }; name = Release; @@ -607,6 +618,7 @@ ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "de.felixschulze.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 3.0; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; }; @@ -637,6 +649,7 @@ INFOPLIST_FILE = "OpenSSL-for-iOS_Tests/OpenSSL-for-iOS_Tests-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = "de.felixschulze.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 3.0; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; }; diff --git a/OpenSSL-for-iOS.xcodeproj/xcshareddata/xcschemes/OpenSSL-for-iOS.xcscheme b/OpenSSL-for-iOS.xcodeproj/xcshareddata/xcschemes/OpenSSL-for-iOS.xcscheme index 3df6a15..0f8dea8 100644 --- a/OpenSSL-for-iOS.xcodeproj/xcshareddata/xcschemes/OpenSSL-for-iOS.xcscheme +++ b/OpenSSL-for-iOS.xcodeproj/xcshareddata/xcschemes/OpenSSL-for-iOS.xcscheme @@ -1,6 +1,6 @@ Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { - self.window = UIWindow(frame: UIScreen.mainScreen().bounds) + self.window = UIWindow(frame: UIScreen.main.bounds) #if os(tvOS) self.window?.rootViewController = ViewController(nibName: "ViewController~tv", bundle: nil) #else let navigationController = UINavigationController(rootViewController: ViewController()) - navigationController.navigationBar.translucent = false + navigationController.navigationBar.isTranslucent = false self.window?.rootViewController = navigationController #endif diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Contents.json b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Contents.json index 86648a0..1e8eae0 100644 --- a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Contents.json +++ b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "size" : "29x29", "idiom" : "iphone", @@ -36,6 +46,16 @@ "filename" : "Icon-60@3x.png", "scale" : "3x" }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, { "size" : "29x29", "idiom" : "ipad", @@ -71,6 +91,12 @@ "idiom" : "ipad", "filename" : "Icon-76@2x.png", "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-83.5@2x-1.png", + "scale" : "2x" } ], "info" : { diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-83.5@2x-1.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-83.5@2x-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4dbb35c53ebc8b7830d8ceac51a8f82e7fa49b85 GIT binary patch literal 15699 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 PZO#g^sxoy_pF;m10*HT> literal 0 HcmV?d00001 diff --git a/OpenSSL-for-iOS/ViewController.swift b/OpenSSL-for-iOS/ViewController.swift index 5ebb342..7dc894b 100644 --- a/OpenSSL-for-iOS/ViewController.swift +++ b/OpenSSL-for-iOS/ViewController.swift @@ -18,21 +18,21 @@ class ViewController: UIViewController { @IBAction func showInfo() { - let message = "OpenSSL-Version: \(OPENSSL_VERSION_TEXT)\nLicense: See include/LICENSE\n\nCopyright 2010-2015 by Felix Schulze\n http://www.felixschulze.de" - let alertController = UIAlertController(title: "OpenSSL-for-iOS", message: message, preferredStyle: .Alert) - alertController.addAction(UIAlertAction(title: "Ok", style: .Cancel, handler: nil)) - self.presentViewController(alertController, animated: true, completion: nil) + let message = "OpenSSL-Version: \(OPENSSL_VERSION_TEXT)\nLicense: See include/LICENSE\n\nCopyright 2010-2016 by Felix Schulze\n http://www.felixschulze.de" + let alertController = UIAlertController(title: "OpenSSL-for-iOS", message: message, preferredStyle: .alert) + alertController.addAction(UIAlertAction(title: "Ok", style: .cancel, handler: nil)) + self.present(alertController, animated: true, completion: nil) } override func viewDidLoad() { super.viewDidLoad() self.title = "OpenSSL-for-iOS" - let infoButton = UIButton(type: .InfoLight) - infoButton.addTarget(self, action: #selector(ViewController.showInfo), forControlEvents: .TouchDown) + let infoButton = UIButton(type: .infoLight) + infoButton.addTarget(self, action: #selector(ViewController.showInfo), for: .touchDown) self.navigationItem.rightBarButtonItem = UIBarButtonItem(customView: infoButton) - self.textField.addTarget(self, action: #selector(ViewController.textFieldDidChange), forControlEvents: .EditingChanged) + self.textField.addTarget(self, action: #selector(ViewController.textFieldDidChange), for: .editingChanged) self.calculateHash() } @@ -42,8 +42,8 @@ class ViewController: UIViewController { func calculateHash() { if textField.text!.characters.count > 0 { - md5Label.text = FSOpenSSL.md5FromString(textField.text) - sh256Label.text = FSOpenSSL.sha256FromString(textField.text) + md5Label.text = FSOpenSSL.md5(from: textField.text) + sh256Label.text = FSOpenSSL.sha256(from: textField.text) } else { md5Label.text = nil diff --git a/README.md b/README.md index 74f3f86..54ca1a6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# OpenSSL-for-iOS [![Build Status](https://travis-ci.org/x2on/OpenSSL-for-iPhone.svg)](https://travis-ci.org/x2on/OpenSSL-for-iPhone) [![license](https://img.shields.io/github/license/x2on/OpenSSL-for-iPhone.svg)](https://github.com/x2on/OpenSSL-for-iPhone/blob/master/LICENSE) [![OpenSSL version](https://img.shields.io/badge/OpenSSL-1.0.2h-lightgrey.svg)]() [![iOS support](https://img.shields.io/badge/iOS-7.0%20--%209.3-lightgrey.svg)]() [![tvOS support](https://img.shields.io/badge/tvOS-9.2-lightgrey.svg)]() +# OpenSSL-for-iOS [![Build Status](https://travis-ci.org/x2on/OpenSSL-for-iPhone.svg)](https://travis-ci.org/x2on/OpenSSL-for-iPhone) [![license](https://img.shields.io/github/license/x2on/OpenSSL-for-iPhone.svg)](https://github.com/x2on/OpenSSL-for-iPhone/blob/master/LICENSE) [![OpenSSL version](https://img.shields.io/badge/OpenSSL-1.0.2h-lightgrey.svg)]() [![iOS support](https://img.shields.io/badge/iOS-7.0%20--%2010.0-lightgrey.svg)]() [![tvOS support](https://img.shields.io/badge/tvOS-9.2--%2010.0-lightgrey.svg)]() This is a script for using self-compiled builds of the OpenSSL-library on the iPhone. You can build apps with Xcode and the official SDK from Apple with this. I also made a small example-app for using the libraries with Xcode and the iPhone/iPhone-Simulator. @@ -9,10 +9,10 @@ You must build the OpenSSL-Libraries before running the sample with: ./build-libssl.sh ``` -This repository contains an iOS 9.1 Xcode Project which uses the OpenSSL Libraries. The examples uses the MD5 or SHA256-algorithm to calculate an md5 or sha256 hash from an UITextfield. +This repository contains an iOS 10.0 Xcode Project which uses the OpenSSL Libraries. The examples uses the MD5 or SHA256-algorithm to calculate an md5 or sha256 hash from an UITextfield. ## System support -**iOS 7.0 - iOS 9.3 (i386, x86_64, armv7, armv7s, armv64, bitcode) and tvOS are currently supported.** +**iOS 7.0 - iOS 10.0 (i386, x86_64, armv7, armv7s, armv64, bitcode) and tvOS are currently supported.** For iOS < 7.0 you must use Xcode < 7 and an older version of the build script. @@ -23,6 +23,7 @@ If you have problems building for arm64 please uninstall MacPorts (see [#28](htt * ## Changelog +* 2016-09-18: Xcode 8 support, iOS 10.0 * 2016-08-09: Xcode 7.3 support, iOS 9.3 * 2016-05-04: OpenSSL 1.0.2h * 2015-12-11: Xcode 7.2 support, iOS 9.2