From 16c00410ed7432eb8adc0eb1d411aed047f01323 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Wed, 6 Oct 2021 18:19:28 +0200 Subject: [PATCH] Update OpenSSL to 1.1.1l --- CHANGELOG.md | 6 ++++ Gemfile.lock | 54 +++++++++++++++-------------- Podfile | 2 +- Podfile.lock | 10 +++--- README.md | 2 +- TunnelKit.podspec | 2 +- TunnelKit.xcodeproj/project.pbxproj | 10 +++--- 7 files changed, 47 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a9d7e1..3c104dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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/), 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) ### Added diff --git a/Gemfile.lock b/Gemfile.lock index 59cc3f1..d0dd2f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,14 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.3) - activesupport (5.2.6) + CFPropertyList (3.0.4) + rexml + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) algoliasearch (1.27.5) @@ -14,10 +16,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.10.1) - addressable (~> 2.6) + cocoapods (1.11.2) + addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.1) + cocoapods-core (= 1.11.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,26 +30,26 @@ GEM escape (~> 0.0.4) fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.6) + molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (~> 1.4) - xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.1) - activesupport (> 5.0, < 6) - addressable (~> 2.6) + ruby-macho (>= 1.0, < 3.0) + xcodeproj (>= 1.21.0, < 2.0) + cocoapods-core (1.11.2) + activesupport (>= 5.0, < 7) + addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) netrc (~> 0.11) - public_suffix + public_suffix (~> 4.0) typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.4.0) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (1.5.1) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) - cocoapods-trunk (1.5.0) + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) @@ -56,7 +58,7 @@ GEM escape (0.0.4) ethon (0.14.0) ffi (>= 1.15.0) - ffi (1.15.3) + ffi (1.15.4) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -65,25 +67,25 @@ GEM concurrent-ruby (~> 1.0) json (2.5.1) minitest (5.14.4) - molinillo (0.6.6) + molinillo (0.8.0) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) public_suffix (4.0.6) rexml (3.2.5) - ruby-macho (1.4.0) - thread_safe (0.3.6) + ruby-macho (2.5.1) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) - xcodeproj (1.20.0) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.3.0) rexml (~> 3.2.4) + zeitwerk (2.4.2) PLATFORMS ruby diff --git a/Podfile b/Podfile index 6b4fa55..8d984bc 100644 --- a/Podfile +++ b/Podfile @@ -3,7 +3,7 @@ use_frameworks! def shared_pods pod 'SwiftyBeaver' - pod 'OpenSSL-Apple', '~> 1.1.1k.11' + pod 'OpenSSL-Apple', '~> 1.1.1l.11' end def demo_pods diff --git a/Podfile.lock b/Podfile.lock index 3b994a9..b856930 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,9 +1,9 @@ PODS: - - OpenSSL-Apple (1.1.1k.11) + - OpenSSL-Apple (1.1.1l.11) - SwiftyBeaver (1.9.5) DEPENDENCIES: - - OpenSSL-Apple (~> 1.1.1k.11) + - OpenSSL-Apple (~> 1.1.1l.11) - SwiftyBeaver SPEC REPOS: @@ -12,9 +12,9 @@ SPEC REPOS: - SwiftyBeaver SPEC CHECKSUMS: - OpenSSL-Apple: 3104e6d32de21815b68aeba31edaa6a78d90e7e0 + OpenSSL-Apple: fb93d9a7ce4529054764ce19bb80947a38aee09b SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82 -PODFILE CHECKSUM: 5225b2616fd06cb0c4647192086e31d00e8377c1 +PODFILE CHECKSUM: acb440e8c365ee318f02b159fee4a173163fa454 -COCOAPODS: 1.10.1 +COCOAPODS: 1.11.2 diff --git a/README.md b/README.md index 1025b34..b5f5dc4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![iOS 12+](https://img.shields.io/badge/ios-12+-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) [![Travis-CI](https://api.travis-ci.org/passepartoutvpn/tunnelkit.svg?branch=master)](https://travis-ci.org/passepartoutvpn/tunnelkit) diff --git a/TunnelKit.podspec b/TunnelKit.podspec index 8b051c1..6b1563e 100644 --- a/TunnelKit.podspec +++ b/TunnelKit.podspec @@ -49,7 +49,7 @@ Pod::Spec.new do |s| "SWIFT_INCLUDE_PATHS" => "${PODS_TARGET_SRCROOT}/TunnelKit/Sources/Protocols/OpenVPN", "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/AppExtension" p.dependency "TunnelKit/Manager" diff --git a/TunnelKit.xcodeproj/project.pbxproj b/TunnelKit.xcodeproj/project.pbxproj index 0dbee0a..c8dc71b 100644 --- a/TunnelKit.xcodeproj/project.pbxproj +++ b/TunnelKit.xcodeproj/project.pbxproj @@ -1630,7 +1630,7 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ios-TunnelKitDemo-iOS/Pods-ios-TunnelKitDemo-iOS-frameworks.sh", "${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"; outputPaths = ( @@ -1672,7 +1672,7 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ios-TunnelKitTests-iOS/Pods-ios-TunnelKitTests-iOS-frameworks.sh", "${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"; outputPaths = ( @@ -1736,7 +1736,7 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ios-TunnelKitHost/Pods-ios-TunnelKitHost-frameworks.sh", "${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"; outputPaths = ( @@ -1822,7 +1822,7 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-macos-TunnelKitDemo-macOS/Pods-macos-TunnelKitDemo-macOS-frameworks.sh", "${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"; outputPaths = ( @@ -1908,7 +1908,7 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-macos-TunnelKitTests-macOS/Pods-macos-TunnelKitTests-macOS-frameworks.sh", "${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"; outputPaths = (