Update OpenSSL to 1.1.1l

This commit is contained in:
Davide De Rosa 2021-10-06 18:19:28 +02:00
parent d107e485d1
commit 16c00410ed
7 changed files with 47 additions and 39 deletions

View File

@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## Unreleased
### Changed
- Upgrade OpenSSL to 1.1.1l.
## 3.4.0 (2021-08-07) ## 3.4.0 (2021-08-07)
### Added ### Added

View File

@ -1,12 +1,14 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
CFPropertyList (3.0.3) CFPropertyList (3.0.4)
activesupport (5.2.6) rexml
activesupport (6.1.4.1)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 1.6, < 2)
minitest (~> 5.1) minitest (>= 5.1)
tzinfo (~> 1.1) tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.0) addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.5) algoliasearch (1.27.5)
@ -14,10 +16,10 @@ GEM
json (>= 1.5.1) json (>= 1.5.1)
atomos (0.1.3) atomos (0.1.3)
claide (1.0.3) claide (1.0.3)
cocoapods (1.10.1) cocoapods (1.11.2)
addressable (~> 2.6) addressable (~> 2.8)
claide (>= 1.0.2, < 2.0) claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.10.1) cocoapods-core (= 1.11.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0)
@ -28,26 +30,26 @@ GEM
escape (~> 0.0.4) escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0) fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0) gh_inspector (~> 1.0)
molinillo (~> 0.6.6) molinillo (~> 0.8.0)
nap (~> 1.0) nap (~> 1.0)
ruby-macho (~> 1.4) ruby-macho (>= 1.0, < 3.0)
xcodeproj (>= 1.19.0, < 2.0) xcodeproj (>= 1.21.0, < 2.0)
cocoapods-core (1.10.1) cocoapods-core (1.11.2)
activesupport (> 5.0, < 6) activesupport (>= 5.0, < 7)
addressable (~> 2.6) addressable (~> 2.8)
algoliasearch (~> 1.0) algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1) concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4) fuzzy_match (~> 2.0.4)
nap (~> 1.0) nap (~> 1.0)
netrc (~> 0.11) netrc (~> 0.11)
public_suffix public_suffix (~> 4.0)
typhoeus (~> 1.0) typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4) cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.4.0) cocoapods-downloader (1.5.1)
cocoapods-plugins (1.0.0) cocoapods-plugins (1.0.0)
nap nap
cocoapods-search (1.0.0) cocoapods-search (1.0.1)
cocoapods-trunk (1.5.0) cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0) nap (>= 0.8, < 2.0)
netrc (~> 0.11) netrc (~> 0.11)
cocoapods-try (1.2.0) cocoapods-try (1.2.0)
@ -56,7 +58,7 @@ GEM
escape (0.0.4) escape (0.0.4)
ethon (0.14.0) ethon (0.14.0)
ffi (>= 1.15.0) ffi (>= 1.15.0)
ffi (1.15.3) ffi (1.15.4)
fourflusher (2.3.1) fourflusher (2.3.1)
fuzzy_match (2.0.4) fuzzy_match (2.0.4)
gh_inspector (1.1.3) gh_inspector (1.1.3)
@ -65,25 +67,25 @@ GEM
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
json (2.5.1) json (2.5.1)
minitest (5.14.4) minitest (5.14.4)
molinillo (0.6.6) molinillo (0.8.0)
nanaimo (0.3.0) nanaimo (0.3.0)
nap (1.1.0) nap (1.1.0)
netrc (0.11.0) netrc (0.11.0)
public_suffix (4.0.6) public_suffix (4.0.6)
rexml (3.2.5) rexml (3.2.5)
ruby-macho (1.4.0) ruby-macho (2.5.1)
thread_safe (0.3.6)
typhoeus (1.4.0) typhoeus (1.4.0)
ethon (>= 0.9.0) ethon (>= 0.9.0)
tzinfo (1.2.9) tzinfo (2.0.4)
thread_safe (~> 0.1) concurrent-ruby (~> 1.0)
xcodeproj (1.20.0) xcodeproj (1.21.0)
CFPropertyList (>= 2.3.3, < 4.0) CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3) atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0) claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1) colored2 (~> 3.1)
nanaimo (~> 0.3.0) nanaimo (~> 0.3.0)
rexml (~> 3.2.4) rexml (~> 3.2.4)
zeitwerk (2.4.2)
PLATFORMS PLATFORMS
ruby ruby

View File

@ -3,7 +3,7 @@ use_frameworks!
def shared_pods def shared_pods
pod 'SwiftyBeaver' pod 'SwiftyBeaver'
pod 'OpenSSL-Apple', '~> 1.1.1k.11' pod 'OpenSSL-Apple', '~> 1.1.1l.11'
end end
def demo_pods def demo_pods

View File

@ -1,9 +1,9 @@
PODS: PODS:
- OpenSSL-Apple (1.1.1k.11) - OpenSSL-Apple (1.1.1l.11)
- SwiftyBeaver (1.9.5) - SwiftyBeaver (1.9.5)
DEPENDENCIES: DEPENDENCIES:
- OpenSSL-Apple (~> 1.1.1k.11) - OpenSSL-Apple (~> 1.1.1l.11)
- SwiftyBeaver - SwiftyBeaver
SPEC REPOS: SPEC REPOS:
@ -12,9 +12,9 @@ SPEC REPOS:
- SwiftyBeaver - SwiftyBeaver
SPEC CHECKSUMS: SPEC CHECKSUMS:
OpenSSL-Apple: 3104e6d32de21815b68aeba31edaa6a78d90e7e0 OpenSSL-Apple: fb93d9a7ce4529054764ce19bb80947a38aee09b
SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82 SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
PODFILE CHECKSUM: 5225b2616fd06cb0c4647192086e31d00e8377c1 PODFILE CHECKSUM: acb440e8c365ee318f02b159fee4a173163fa454
COCOAPODS: 1.10.1 COCOAPODS: 1.11.2

View File

@ -1,6 +1,6 @@
![iOS 12+](https://img.shields.io/badge/ios-12+-green.svg) ![iOS 12+](https://img.shields.io/badge/ios-12+-green.svg)
![macOS 10.15+](https://img.shields.io/badge/macos-10.15+-green.svg) ![macOS 10.15+](https://img.shields.io/badge/macos-10.15+-green.svg)
[![OpenSSL 1.1.1k](https://img.shields.io/badge/openssl-1.1.1k-d69c68.svg)](https://www.openssl.org/news/openssl-1.1.1-notes.html) [![OpenSSL 1.1.1l](https://img.shields.io/badge/openssl-1.1.1l-d69c68.svg)](https://www.openssl.org/news/openssl-1.1.1-notes.html)
[![License GPLv3](https://img.shields.io/badge/license-GPLv3-lightgray.svg)](LICENSE) [![License GPLv3](https://img.shields.io/badge/license-GPLv3-lightgray.svg)](LICENSE)
[![Travis-CI](https://api.travis-ci.org/passepartoutvpn/tunnelkit.svg?branch=master)](https://travis-ci.org/passepartoutvpn/tunnelkit) [![Travis-CI](https://api.travis-ci.org/passepartoutvpn/tunnelkit.svg?branch=master)](https://travis-ci.org/passepartoutvpn/tunnelkit)

View File

@ -49,7 +49,7 @@ Pod::Spec.new do |s|
"SWIFT_INCLUDE_PATHS" => "${PODS_TARGET_SRCROOT}/TunnelKit/Sources/Protocols/OpenVPN", "SWIFT_INCLUDE_PATHS" => "${PODS_TARGET_SRCROOT}/TunnelKit/Sources/Protocols/OpenVPN",
"APPLICATION_EXTENSION_API_ONLY" => "YES" } "APPLICATION_EXTENSION_API_ONLY" => "YES" }
p.dependency "OpenSSL-Apple", "~> 1.1.1k.11" p.dependency "OpenSSL-Apple", "~> 1.1.1l.11"
p.dependency "TunnelKit/Core" p.dependency "TunnelKit/Core"
p.dependency "TunnelKit/AppExtension" p.dependency "TunnelKit/AppExtension"
p.dependency "TunnelKit/Manager" p.dependency "TunnelKit/Manager"

View File

@ -1630,7 +1630,7 @@
inputPaths = ( inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ios-TunnelKitDemo-iOS/Pods-ios-TunnelKitDemo-iOS-frameworks.sh", "${PODS_ROOT}/Target Support Files/Pods-ios-TunnelKitDemo-iOS/Pods-ios-TunnelKitDemo-iOS-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/SwiftyBeaver-iOS/SwiftyBeaver.framework", "${BUILT_PRODUCTS_DIR}/SwiftyBeaver-iOS/SwiftyBeaver.framework",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/openssl/openssl.framework/openssl", "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Apple/openssl.framework/openssl",
); );
name = "[CP] Embed Pods Frameworks"; name = "[CP] Embed Pods Frameworks";
outputPaths = ( outputPaths = (
@ -1672,7 +1672,7 @@
inputPaths = ( inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ios-TunnelKitTests-iOS/Pods-ios-TunnelKitTests-iOS-frameworks.sh", "${PODS_ROOT}/Target Support Files/Pods-ios-TunnelKitTests-iOS/Pods-ios-TunnelKitTests-iOS-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/SwiftyBeaver-iOS/SwiftyBeaver.framework", "${BUILT_PRODUCTS_DIR}/SwiftyBeaver-iOS/SwiftyBeaver.framework",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/openssl/openssl.framework/openssl", "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Apple/openssl.framework/openssl",
); );
name = "[CP] Embed Pods Frameworks"; name = "[CP] Embed Pods Frameworks";
outputPaths = ( outputPaths = (
@ -1736,7 +1736,7 @@
inputPaths = ( inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ios-TunnelKitHost/Pods-ios-TunnelKitHost-frameworks.sh", "${PODS_ROOT}/Target Support Files/Pods-ios-TunnelKitHost/Pods-ios-TunnelKitHost-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/SwiftyBeaver-iOS/SwiftyBeaver.framework", "${BUILT_PRODUCTS_DIR}/SwiftyBeaver-iOS/SwiftyBeaver.framework",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/openssl/openssl.framework/openssl", "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Apple/openssl.framework/openssl",
); );
name = "[CP] Embed Pods Frameworks"; name = "[CP] Embed Pods Frameworks";
outputPaths = ( outputPaths = (
@ -1822,7 +1822,7 @@
inputPaths = ( inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-macos-TunnelKitDemo-macOS/Pods-macos-TunnelKitDemo-macOS-frameworks.sh", "${PODS_ROOT}/Target Support Files/Pods-macos-TunnelKitDemo-macOS/Pods-macos-TunnelKitDemo-macOS-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/SwiftyBeaver-macOS/SwiftyBeaver.framework", "${BUILT_PRODUCTS_DIR}/SwiftyBeaver-macOS/SwiftyBeaver.framework",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/openssl/openssl.framework/openssl", "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Apple/openssl.framework/openssl",
); );
name = "[CP] Embed Pods Frameworks"; name = "[CP] Embed Pods Frameworks";
outputPaths = ( outputPaths = (
@ -1908,7 +1908,7 @@
inputPaths = ( inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-macos-TunnelKitTests-macOS/Pods-macos-TunnelKitTests-macOS-frameworks.sh", "${PODS_ROOT}/Target Support Files/Pods-macos-TunnelKitTests-macOS/Pods-macos-TunnelKitTests-macOS-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/SwiftyBeaver-macOS/SwiftyBeaver.framework", "${BUILT_PRODUCTS_DIR}/SwiftyBeaver-macOS/SwiftyBeaver.framework",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/openssl/openssl.framework/openssl", "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Apple/openssl.framework/openssl",
); );
name = "[CP] Embed Pods Frameworks"; name = "[CP] Embed Pods Frameworks";
outputPaths = ( outputPaths = (