From 39d1e04c7bffbabe8d728d79f4a2d8806f48a847 Mon Sep 17 00:00:00 2001 From: Felix Schulze Date: Thu, 25 May 2017 20:23:22 +0200 Subject: [PATCH 1/4] OpenSSL 1.0.2l --- build-libssl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-libssl.sh b/build-libssl.sh index 006d9ab..d7f0d68 100755 --- a/build-libssl.sh +++ b/build-libssl.sh @@ -25,7 +25,7 @@ set -u # SCRIPT DEFAULTS # Default version in case no version is specified -DEFAULTVERSION="1.0.2k" +DEFAULTVERSION="1.0.2l" # 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" From cb478bb451974d9db0decdd244ac15fc85d383bb Mon Sep 17 00:00:00 2001 From: Felix Schulze Date: Thu, 25 May 2017 20:25:56 +0200 Subject: [PATCH 2/4] OpenSSL 1.0.2l, 1.1.0f --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1459fcb..4dd7aaf 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.2k-lightgrey.svg)]() [![OpenSSL version](https://img.shields.io/badge/OpenSSL-1.1.0e-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)]() +# 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.2l-lightgrey.svg)]() [![OpenSSL version](https://img.shields.io/badge/OpenSSL-1.1.0f-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. @@ -11,7 +11,7 @@ You must build the OpenSSL-Libraries (1.0.2k) before running the sample with: To build OpenSSL 1.1.0e build the OpenSSL-Libraries with: ```bash -./build-libssl.sh --version=1.1.0e +./build-libssl.sh --version=1.1.0f ``` For all options see the help @@ -33,6 +33,7 @@ If you have problems building for arm64 please uninstall MacPorts (see [#28](htt * ## Changelog +* 2017-05-25: OpenSSL 1.0.2l, 1.1.0f * 2017-02-16: OpenSSL 1.1.0e * 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 From 9b5bf59d900f4ea2df815afaa2dfcc12331f8ea8 Mon Sep 17 00:00:00 2001 From: Felix Schulze Date: Thu, 25 May 2017 20:26:24 +0200 Subject: [PATCH 3/4] OpenSSL 1.0.2l, 1.1.0f --- travis-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-build.sh b/travis-build.sh index 7bc74f9..e6ddb6e 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.0e | log_output "TARGETS" & +../build-libssl.sh --noparallel --verbose-on-error --ec-nistp-64-gcc-128 --version=1.1.0f | log_output "TARGETS" & PID_TARGETS=$! echo "SCRIPT Started jobs, waiting for jobs to finish" From 491c7ae2510710ac576b393959911549bc3488c2 Mon Sep 17 00:00:00 2001 From: Felix Schulze Date: Tue, 30 May 2017 20:12:31 +0200 Subject: [PATCH 4/4] Update Xcode version on Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1f417c8..28720e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode8.2 +osx_image: xcode8.3 language: objective-c before_install: - ./travis-build.sh