From fcfe48afddf7365265dd4991441191b815370286 Mon Sep 17 00:00:00 2001 From: Anton Tieleman Date: Fri, 27 Jan 2017 22:21:12 +0100 Subject: [PATCH] OpenSSL 1.0.2k and 1.1.0d + Travis build with Xcode 8.2 - Also remove xctool lines since they won't support building for Xcode 8 --- .travis.yml | 4 +--- README.md | 11 ++++++----- build-libssl.sh | 4 ++-- travis-build.sh | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 884aac4..1f417c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode8 +osx_image: xcode8.2 language: objective-c before_install: - ./travis-build.sh @@ -6,5 +6,3 @@ before_install: script: - xcodebuild -project OpenSSL-for-iOS.xcodeproj -scheme OpenSSL-for-iOS -sdk iphonesimulator clean build - cd targets && xcodebuild -project OpenSSL-for-iOS.xcodeproj -scheme OpenSSL-for-iOS -sdk iphonesimulator clean build - # xctool 0.2.9 doesn't support Xcode 8 yet (see https://github.com/facebook/xctool/issues/704) - #- xctool -project OpenSSL-for-iOS.xcodeproj -scheme OpenSSL-for-iOS -sdk iphonesimulator clean build diff --git a/README.md b/README.md index 39f58a6..710a769 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ -# 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.2j-lightgrey.svg)]() [![OpenSSL version](https://img.shields.io/badge/OpenSSL-1.1.0c-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)]() +# 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.2k-lightgrey.svg)]() [![OpenSSL version](https://img.shields.io/badge/OpenSSL-1.1.0d-lightgrey.svg)]() [![iOS support](https://img.shields.io/badge/iOS-7.0%20--%2010.2-lightgrey.svg)]() [![tvOS support](https://img.shields.io/badge/tvOS-9.2--%2010.1-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. **Enjoy OpenSSL on the iPhone!** -You must build the OpenSSL-Libraries (1.0.2j) before running the sample with: +You must build the OpenSSL-Libraries (1.0.2k) before running the sample with: ```bash ./build-libssl.sh ``` -To build OpenSSL 1.1.0c build the OpenSSL-Libraries with: +To build OpenSSL 1.1.0d build the OpenSSL-Libraries with: ```bash -./build-libssl.sh --version=1.1.0c +./build-libssl.sh --version=1.1.0d ``` For all options see the help @@ -22,7 +22,7 @@ For all options see the help 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 10.0 (i386, x86_64, armv7, armv7s, armv64, bitcode) and tvOS 9.2 - tvOS 10.0 (x86_64, arm64, bitcode) are currently supported.** +**iOS 7.0 - iOS 10.2 (i386, x86_64, armv7, armv7s, armv64, bitcode) and tvOS 9.2 - tvOS 10.1 (x86_64, arm64, bitcode) are currently supported.** For iOS < 7.0 you must use Xcode < 7 and an older version of the build script. @@ -33,6 +33,7 @@ If you have problems building for arm64 please uninstall MacPorts (see [#28](htt * ## Changelog +* 2017-01-28: OpenSSL 1.0.2k, 1.1.0d, Xcode 8.2 (iOS 10.2 and tvOS 10.1) * 2016-11-13: OpenSSL 1.1.0c * 2016-11-07: Optional support for OpenSSL 1.1.0b * 2016-09-28: OpenSSL 1.0.2j diff --git a/build-libssl.sh b/build-libssl.sh index 45a4576..0e3f703 100755 --- a/build-libssl.sh +++ b/build-libssl.sh @@ -4,7 +4,7 @@ # for iPhoneOS and iPhoneSimulator # # Created by Felix Schulze on 16.12.10. -# Copyright 2010-2016 Felix Schulze. All rights reserved. +# Copyright 2010-2017 Felix Schulze. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ set -u # SCRIPT DEFAULTS # Default version in case no version is specified -DEFAULTVERSION="1.0.2j" +DEFAULTVERSION="1.0.2k" # Default (=full) set of architectures (OpenSSL <= 1.0.2) or targets (OpenSSL >= 1.1.0) to build DEFAULTARCHS="x86_64 i386 arm64 armv7s armv7 tv_x86_64 tv_arm64" diff --git a/travis-build.sh b/travis-build.sh index 5f830c9..5865dbf 100755 --- a/travis-build.sh +++ b/travis-build.sh @@ -19,7 +19,7 @@ PID_ARCHS=$! mkdir targets cd targets cp -r ../include . -../build-libssl.sh --noparallel --verbose-on-error --ec-nistp-64-gcc-128 --version=1.1.0c | log_output "TARGETS" & +../build-libssl.sh --noparallel --verbose-on-error --ec-nistp-64-gcc-128 --version=1.1.0d | log_output "TARGETS" & PID_TARGETS=$! echo "SCRIPT Started jobs, waiting for jobs to finish"