diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48ed027a..0573ad37 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
+
+- OpenVPN: Regressions from the upgrade to OpenSSL 3. [tunnelkit#403](https://github.com/passepartoutvpn/tunnelkit/issues/403)
+
## 2.3.0 (2023-12-31)
### Added
diff --git a/Gemfile.lock b/Gemfile.lock
index 59126344..9df26f42 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,13 +8,13 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.3.0)
- aws-partitions (1.876.0)
+ aws-partitions (1.877.0)
aws-sdk-core (3.190.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
- aws-sdk-kms (1.75.0)
+ aws-sdk-kms (1.76.0)
aws-sdk-core (~> 3, >= 3.188.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.142.0)
@@ -35,7 +35,7 @@ GEM
domain_name (0.6.20231109)
dotenv (2.8.1)
emoji_regex (3.2.3)
- excon (0.108.0)
+ excon (0.109.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
@@ -65,7 +65,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.3.0)
- fastlane (2.217.0)
+ fastlane (2.218.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
@@ -92,7 +92,7 @@ GEM
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
- optparse (~> 0.1.1)
+ optparse (>= 0.1.1)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.3)
@@ -157,7 +157,7 @@ GEM
multipart-post (2.3.0)
nanaimo (0.3.0)
naturally (2.2.1)
- optparse (0.1.1)
+ optparse (0.4.0)
os (1.1.4)
plist (3.7.1)
public_suffix (5.0.4)
diff --git a/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index c0ad5312..3f13c4aa 100644
--- a/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -50,7 +50,7 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/passepartoutvpn/tunnelkit",
"state" : {
- "revision" : "708c785e615f5715ce08386c772c92fb45730a3a"
+ "revision" : "f2c0fb079e2a318a4717d5fb8daa8f149174dadd"
}
},
{
@@ -58,7 +58,6 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/passepartoutvpn/wireguard-apple",
"state" : {
- "branch" : "develop",
"revision" : "b79f0f150356d8200a64922ecf041dd020140aa0"
}
}
diff --git a/Passepartout/App/Info.plist b/Passepartout/App/Info.plist
index c790fac9..fc4bc58d 100644
--- a/Passepartout/App/Info.plist
+++ b/Passepartout/App/Info.plist
@@ -32,7 +32,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.3.0
+ 2.3.1
CFBundleVersion
3562
ITSAppUsesNonExemptEncryption
diff --git a/Passepartout/App/L10n/OpenVPN+L10n.swift b/Passepartout/App/L10n/OpenVPN+L10n.swift
index ae2ede96..5fd05f63 100644
--- a/Passepartout/App/L10n/OpenVPN+L10n.swift
+++ b/Passepartout/App/L10n/OpenVPN+L10n.swift
@@ -259,7 +259,7 @@ extension TunnelKitOpenVPNError: LocalizedError {
case .serverCompression, .lzo:
return V.compression
- case .networkChanged, .linkError:
+ case .networkChanged:
return V.network
case .routing:
diff --git a/Passepartout/Launcher/Info.plist b/Passepartout/Launcher/Info.plist
index 8ae9a9d4..4b86cf9d 100644
--- a/Passepartout/Launcher/Info.plist
+++ b/Passepartout/Launcher/Info.plist
@@ -3,7 +3,7 @@
CFBundleShortVersionString
- 2.3.0
+ 2.3.1
CFBundleVersion
3562
LSBackgroundOnly
diff --git a/Passepartout/Mac/Info.plist b/Passepartout/Mac/Info.plist
index 2c53873b..3ba396d8 100644
--- a/Passepartout/Mac/Info.plist
+++ b/Passepartout/Mac/Info.plist
@@ -5,7 +5,7 @@
CFBundleIdentifier
$(PRODUCT_BUNDLE_IDENTIFIER)
CFBundleShortVersionString
- 2.3.0
+ 2.3.1
CFBundleVersion
3562
NSPrincipalClass
diff --git a/Passepartout/Tunnel/Info.plist b/Passepartout/Tunnel/Info.plist
index 79dea1bd..389552d3 100644
--- a/Passepartout/Tunnel/Info.plist
+++ b/Passepartout/Tunnel/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 2.3.0
+ 2.3.1
CFBundleVersion
3562
LSMinimumSystemVersion
diff --git a/PassepartoutLibrary/Package.swift b/PassepartoutLibrary/Package.swift
index 5d3e7fd4..d602ad80 100644
--- a/PassepartoutLibrary/Package.swift
+++ b/PassepartoutLibrary/Package.swift
@@ -33,8 +33,8 @@ let package = Package(
dependencies: [
// Dependencies declare other packages that this package depends on.
// .package(url: /* package url */, from: "1.0.0"),
-// .package(url: "https://github.com/passepartoutvpn/tunnelkit", from: "6.3.0"),
- .package(url: "https://github.com/passepartoutvpn/tunnelkit", revision: "708c785e615f5715ce08386c772c92fb45730a3a"),
+// .package(url: "https://github.com/passepartoutvpn/tunnelkit", from: "6.3.2"),
+ .package(url: "https://github.com/passepartoutvpn/tunnelkit", revision: "f2c0fb079e2a318a4717d5fb8daa8f149174dadd"),
// .package(name: "TunnelKit", path: "../../tunnelkit"),
.package(url: "https://github.com/zoul/generic-json-swift", from: "2.0.0"),
.package(url: "https://github.com/SwiftyBeaver/SwiftyBeaver", from: "1.9.0")