From 30c3fdddfcf72125dbe3fc0199cacb96cd80ccaf Mon Sep 17 00:00:00 2001 From: Lucas Menge Date: Tue, 2 Mar 2021 12:00:29 +0100 Subject: [PATCH 1/2] Update to OpenSSL 1.1.1j --- OpenSSL-Apple.podspec | 2 +- README.md | 10 +++++----- build-libssl.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) mode change 100755 => 100644 build-libssl.sh diff --git a/OpenSSL-Apple.podspec b/OpenSSL-Apple.podspec index 7133078..ea2ca36 100644 --- a/OpenSSL-Apple.podspec +++ b/OpenSSL-Apple.podspec @@ -1,5 +1,5 @@ Pod::Spec.new do |s| - openssl_version = "1.1.1h" + openssl_version = "1.1.1j" openssl_targets = "ios-sim-cross-x86_64 ios-sim-cross-arm64 ios64-cross-arm64 ios64-cross-arm64e macos64-x86_64 macos64-arm64 mac-catalyst-x86_64 mac-catalyst-arm64" script_version = "10" diff --git a/README.md b/README.md index f388671..cf1ee84 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ![macOS Catalyst support](https://img.shields.io/badge/macOS%20Catalyst-10.15+-blue.svg) ![watchOS support](https://img.shields.io/badge/watchOS-4.0+-blue.svg) ![tvOS support](https://img.shields.io/badge/tvOS-12+-blue.svg) -![OpenSSL version](https://img.shields.io/badge/OpenSSL-1.1.1h-green.svg) +![OpenSSL version](https://img.shields.io/badge/OpenSSL-1.1.1j-green.svg) [![license](https://img.shields.io/badge/license-Apache%202.0-lightgrey.svg)](LICENSE) This is a fork of the popular work by [Felix Schulze](https://github.com/x2on), that is a set of scripts for using self-compiled builds of the OpenSSL library on the iPhone and the Apple TV. @@ -14,16 +14,16 @@ However, this repository focuses more on framework-based setups and also adds ma # Compile library -Compile OpenSSL 1.1.1h for all targets: +Compile OpenSSL 1.1.1j for all targets: ``` -./build-libssl.sh --version=1.1.1h +./build-libssl.sh --version=1.1.1j ``` -Compile OpenSSL 1.1.1h for specific targets: +Compile OpenSSL 1.1.1j for specific targets: ``` -./build-libssl.sh --version=1.1.1h --targets="ios64-cross-arm64 macos64-x86_64 macos64-arm64" +./build-libssl.sh --version=1.1.1j --targets="ios64-cross-arm64 macos64-x86_64 macos64-arm64" ``` For all options see: diff --git a/build-libssl.sh b/build-libssl.sh old mode 100755 new mode 100644 index df15197..686f887 --- 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.1.1h" +DEFAULTVERSION="1.1.1j" # Default (=full) set of targets (OpenSSL >= 1.1.1) to build DEFAULTTARGETS=`cat < Date: Tue, 2 Mar 2021 12:00:44 +0100 Subject: [PATCH 2/2] Add watchos-sim-cross-arm64 target --- build-libssl.sh | 13 ++++++++----- config/20-all-platforms.conf | 18 ++++++------------ 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/build-libssl.sh b/build-libssl.sh index 686f887..ebfe4b0 100644 --- a/build-libssl.sh +++ b/build-libssl.sh @@ -32,7 +32,7 @@ DEFAULTTARGETS=`cat < "iOS", }, - ## Apple macOS - - # Base (arm64) - "darwin64-arm64-cc" => { - inherit_from => [ "darwin-common", asm("aarch64_asm") ], - CFLAGS => add("-Wall"), - cflags => add("-arch arm64"), - lib_cppflags => add("-DL_ENDIAN"), - bn_ops => "SIXTY_FOUR_BIT_LONG", - perlasm_scheme => "ios64", - }, - # Device "macos64-x86_64" => { inherit_from => [ "darwin64-x86_64-cc", "macos-base" ], @@ -134,6 +122,12 @@ my %targets = (); defines => [ "HAVE_FORK=0" ], sys_id => "WatchOS", }, + "watchos-sim-cross-arm64" => { + inherit_from => [ "darwin64-arm64-cc", "watchos-cross-base"], + cflags => add("-target arm64-apple-watchos7.2-simulator -mwatchos-version-min=7.2 -fembed-bitcode"), + defines => [ "HAVE_FORK=0" ], + sys_id => "WatchOS", + }, "watchos-sim-cross-i386" => { inherit_from => [ "darwin-common", "watchos-cross-base"], cflags => add("-arch i386 -fembed-bitcode"),