From 20302274fb32e2bd114da8e456a6d936f0bf4e19 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Tue, 2 Apr 2019 00:42:07 +0200 Subject: [PATCH] Upgrade TunnelKit with PKCS#8 fix Fixes #43 --- CHANGELOG.md | 6 ++++++ Podfile | 4 ++-- Podfile.lock | 24 ++++++++++++------------ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2617cd19..05af51d3 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 + +### Fixed + +- Support PKCS#8 encrypted cert keys. [#43](https://github.com/passepartoutvpn/passepartout-ios/issues/43), [tunnelkit#80](https://github.com/keeshux/tunnelkit/issues/80) + ## 1.3.0 Beta 1525 (2019-04-02) ### Added diff --git a/Podfile b/Podfile index 2b016252..577574f9 100644 --- a/Podfile +++ b/Podfile @@ -5,8 +5,8 @@ use_frameworks! def shared_pods #pod 'TunnelKit', '~> 1.5.0' #pod 'TunnelKit/LZO', '~> 1.5.0' - pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => 'a638767' - pod 'TunnelKit/LZO', :git => 'https://github.com/keeshux/tunnelkit', :commit => 'a638767' + pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '670c4c3' + pod 'TunnelKit/LZO', :git => 'https://github.com/keeshux/tunnelkit', :commit => '670c4c3' #pod 'TunnelKit', :path => '../../personal/tunnelkit' #pod 'TunnelKit/LZO', :path => '../../personal/tunnelkit' end diff --git a/Podfile.lock b/Podfile.lock index 0b186b9a..0d3c09ce 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -2,21 +2,21 @@ PODS: - MBProgressHUD (1.1.0) - OpenSSL-Apple (1.1.0i.2) - SwiftyBeaver (1.7.0) - - TunnelKit (1.5.2): - - TunnelKit/AppExtension (= 1.5.2) - - TunnelKit/Core (= 1.5.2) - - TunnelKit/AppExtension (1.5.2): + - TunnelKit (1.5.3): + - TunnelKit/AppExtension (= 1.5.3) + - TunnelKit/Core (= 1.5.3) + - TunnelKit/AppExtension (1.5.3): - SwiftyBeaver - TunnelKit/Core - - TunnelKit/Core (1.5.2): + - TunnelKit/Core (1.5.3): - OpenSSL-Apple (~> 1.1.0i.2) - SwiftyBeaver - - TunnelKit/LZO (1.5.2) + - TunnelKit/LZO (1.5.3) DEPENDENCIES: - MBProgressHUD - - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `a638767`) - - TunnelKit/LZO (from `https://github.com/keeshux/tunnelkit`, commit `a638767`) + - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `670c4c3`) + - TunnelKit/LZO (from `https://github.com/keeshux/tunnelkit`, commit `670c4c3`) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -26,20 +26,20 @@ SPEC REPOS: EXTERNAL SOURCES: TunnelKit: - :commit: a638767 + :commit: 670c4c3 :git: https://github.com/keeshux/tunnelkit CHECKOUT OPTIONS: TunnelKit: - :commit: a638767 + :commit: 670c4c3 :git: https://github.com/keeshux/tunnelkit SPEC CHECKSUMS: MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9 OpenSSL-Apple: 37a8c0b04df4bb8971deef4671cc29222861319c SwiftyBeaver: 4cc0080d2e23f980652e28978db11a5c9da39165 - TunnelKit: 9d8089c4600ea9b3a54841391b4969f2faa9c17f + TunnelKit: 21f5d336698d2de6126232f6b5d7e9be4d999af0 -PODFILE CHECKSUM: 41cfe6321ea8695a6288fd8009199854a1a8fbe2 +PODFILE CHECKSUM: 83e474ac5fe305876100383bab8d7dcf11e7ba6f COCOAPODS: 1.6.1