passepartoutvpn
/
openssl-apple
mirror of https://github.com/passepartoutvpn/openssl-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #135 from oneton/openssl-1_0_2k-1_1_0d 

OpenSSL 1.0.2k and 1.1.0d + Travis build with Xcode 8.2
This commit is contained in:
Felix Schulze 2017-01-28 08:31:13 +01:00 committed by GitHub
parent f11efc9224 fcfe48afdd
commit a28578a337
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -1,4 +1,4 @@
osx_image: xcode8 osx_image: xcode8.2
language: objective-c language: objective-c
before_install: before_install:
- ./travis-build.sh - ./travis-build.sh
@ -6,5 +6,3 @@ before_install:
script: script:
- xcodebuild -project OpenSSL-for-iOS.xcodeproj -scheme OpenSSL-for-iOS -sdk iphonesimulator clean build - 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 - 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

11
README.md
View File

@ -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. 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!** **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 ```bash
./build-libssl.sh ./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 ```bash
./build-libssl.sh --version=1.1.0c ./build-libssl.sh --version=1.1.0d
``` ```
For all options see the help 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. 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 ## 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. 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
* <http://www.x2on.de/2010/07/13/tutorial-iphone-app-with-compiled-openssl-1-0-0a-library/> * <http://www.x2on.de/2010/07/13/tutorial-iphone-app-with-compiled-openssl-1-0-0a-library/>
## Changelog ## 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-13: OpenSSL 1.1.0c
* 2016-11-07: Optional support for OpenSSL 1.1.0b * 2016-11-07: Optional support for OpenSSL 1.1.0b
* 2016-09-28: OpenSSL 1.0.2j * 2016-09-28: OpenSSL 1.0.2j

4
build-libssl.sh
View File

@ -4,7 +4,7 @@
# for iPhoneOS and iPhoneSimulator # for iPhoneOS and iPhoneSimulator
# #
# Created by Felix Schulze on 16.12.10. # 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"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -25,7 +25,7 @@ set -u
# SCRIPT DEFAULTS # SCRIPT DEFAULTS
# Default version in case no version is specified # 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 # 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" DEFAULTARCHS="x86_64 i386 arm64 armv7s armv7 tv_x86_64 tv_arm64"

2
travis-build.sh
View File

@ -19,7 +19,7 @@ PID_ARCHS=$!
mkdir targets mkdir targets
cd targets cd targets
cp -r ../include . 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=$! PID_TARGETS=$!
echo "SCRIPT Started jobs, waiting for jobs to finish" echo "SCRIPT Started jobs, waiting for jobs to finish"