From f06f91f5f57a9fa35ae8b78f9f05fcaea87447de Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Sun, 27 Jun 2021 12:10:22 +0300 Subject: [PATCH 1/5] chore: update version in the podspec file --- OpenVPNAdapter.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenVPNAdapter.podspec b/OpenVPNAdapter.podspec index faf1437..a343bbb 100644 --- a/OpenVPNAdapter.podspec +++ b/OpenVPNAdapter.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| # ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # s.name = "OpenVPNAdapter" - s.version = "0.7.0" + s.version = "0.8.0" s.summary = "Objective-C wrapper for OpenVPN library. Compatible with iOS and macOS." s.description = <<-DESC OpenVPNAdapter is an Objective-C framework that allows to easily configure and establish VPN connection using OpenVPN protocol. From 9fd2c480c91fdaa852f89f7203b717b381562057 Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Sun, 27 Jun 2021 12:11:14 +0300 Subject: [PATCH 2/5] chore: update version on the project settings --- OpenVPNAdapter.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenVPNAdapter.xcodeproj/project.pbxproj b/OpenVPNAdapter.xcodeproj/project.pbxproj index 66d9b4b..75e6829 100644 --- a/OpenVPNAdapter.xcodeproj/project.pbxproj +++ b/OpenVPNAdapter.xcodeproj/project.pbxproj @@ -1547,7 +1547,7 @@ "$(inherited)", "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx", ); - MARKETING_VERSION = 0.7.0; + MARKETING_VERSION = 0.8.0; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = OpenVPNAdapter; PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; @@ -1576,7 +1576,7 @@ "$(inherited)", "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx", ); - MARKETING_VERSION = 0.7.0; + MARKETING_VERSION = 0.8.0; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = OpenVPNAdapter; PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; From 840d4ee0f9fe98c9c0bf5d928f2f451e4c23a3ec Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Sun, 27 Jun 2021 12:20:10 +0300 Subject: [PATCH 3/5] chore: update version i the readme file --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fc49965..7086830 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ To install OpenVPNAdapter with Cocoapods, add the following lines to your `Podfi ```ruby target 'Your Target Name' do use_frameworks! - pod 'OpenVPNAdapter', :git => 'https://github.com/ss-abramchuk/OpenVPNAdapter.git', :tag => '0.7.0' + pod 'OpenVPNAdapter', :git => 'https://github.com/ss-abramchuk/OpenVPNAdapter.git', :tag => '0.8.0' end ``` From e51f8286801b5f4a436fcb99aea9ed3ed452bed8 Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Sun, 27 Jun 2021 12:24:20 +0300 Subject: [PATCH 4/5] chore: update example code so that it fits into github width --- README.md | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 7086830..7850f99 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,10 @@ class PacketTunnelProvider: NEPacketTunnelProvider { var startHandler: ((Error?) -> Void)? var stopHandler: (() -> Void)? - override func startTunnel(options: [String : NSObject]?, completionHandler: @escaping (Error?) -> Void) { + override func startTunnel( + options: [String : NSObject]?, + completionHandler: @escaping (Error?) -> Void + ) { // There are many ways to provide OpenVPN settings to the tunnel provider. For instance, // you can use `options` argument of `startTunnel(options:completionHandler:)` method or get // settings from `protocolConfiguration.providerConfiguration` property of `NEPacketTunnelProvider` @@ -240,7 +243,10 @@ class PacketTunnelProvider: NEPacketTunnelProvider { vpnAdapter.connect(using: packetFlow) } - override func stopTunnel(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) { + override func stopTunnel( + with reason: NEProviderStopReason, + completionHandler: @escaping () -> Void + ) { stopHandler = completionHandler if vpnReachability.isTracking { @@ -260,7 +266,11 @@ extension PacketTunnelProvider: OpenVPNAdapterDelegate { // `OpenVPNAdapterPacketFlow` method signatures are similar to `NEPacketTunnelFlow` so // you can just extend that class to adopt `OpenVPNAdapterPacketFlow` protocol and // send `self.packetFlow` to `completionHandler` callback. - func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, configureTunnelWithNetworkSettings networkSettings: NEPacketTunnelNetworkSettings?, completionHandler: @escaping (Error?) -> Void) { + func openVPNAdapter( + _ openVPNAdapter: OpenVPNAdapter, + configureTunnelWithNetworkSettings networkSettings: NEPacketTunnelNetworkSettings?, + completionHandler: @escaping (Error?) -> Void + ) { // In order to direct all DNS queries first to the VPN DNS servers before the primary DNS servers // send empty string to NEDNSSettings.matchDomains networkSettings?.dnsSettings?.matchDomains = [""] @@ -270,7 +280,11 @@ extension PacketTunnelProvider: OpenVPNAdapterDelegate { } // Process events returned by the OpenVPN library - func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, handleEvent event: OpenVPNAdapterEvent, message: String?) { + func openVPNAdapter( + _ openVPNAdapter: OpenVPNAdapter, + handleEvent event: + OpenVPNAdapterEvent, message: String? + ) { switch event { case .connected: if reasserting { @@ -303,9 +317,8 @@ extension PacketTunnelProvider: OpenVPNAdapterDelegate { // Handle errors thrown by the OpenVPN library func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, handleError error: Error) { // Handle only fatal errors - guard let fatal = (error as NSError).userInfo[OpenVPNAdapterErrorFatalKey] as? Bool, fatal == true else { - return - } + guard let fatal = (error as NSError).userInfo[OpenVPNAdapterErrorFatalKey] as? Bool, + fatal == true else { return } if vpnReachability.isTracking { vpnReachability.stopTracking() From ab12dff2f0e05e6a62b0fb32310ac16fc1cbba1e Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Sun, 27 Jun 2021 13:57:04 +0300 Subject: [PATCH 5/5] chore: update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15f2f1a..55bcd2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Unreleased +## 0.8.0 - **Added**: Configuration properties to override tls-cipher and tls-ciphersuites. - **Updated**: openvpn3 library to 3.6.1 version, ASIO library to 1.16.1 version. - **Fixed**: Broken support ot the SPM.