passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert to TunnelKit with OpenSSL 

- Remove extra "Frameworks" in .appex
- Restore TLS security level 0
- Disable Bitcode for OpenSSL to link properly
This commit is contained in:
Davide De Rosa 2021-11-24 11:40:53 +01:00
parent 922ed26d73
commit 46fef91f5c
9 changed files with 59 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Passepartout.xcodeproj/project.pbxproj
View File

@ -738,6 +738,7 @@
0E9AAACA259F806B003FAFF1 /* CopyFiles */,
0E5203C2259F5F3F00CBAB56 /* Embed App Extensions */,
0E5203F6259F60D600CBAB56 /* Embed Frameworks */,
0EBEF139274E4DAE00EAC689 /* Drop Extra Frameworks In Extensions */,
);
buildRules = (
);
@ -782,6 +783,7 @@
0E57F63620C83FC5008323CF /* Resources */,
0E3152B7223F9EF500F61841 /* Embed Frameworks */,
0EB2B14B2733FB6F007705AB /* Embed App Extensions */,
0EBEF138274E4C7F00EAC689 /* Drop Extra Frameworks In Extensions */,
);
buildRules = (
);
@ -984,6 +986,45 @@
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
0EBEF138274E4C7F00EAC689 /* Drop Extra Frameworks In Extensions */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Drop Extra Frameworks In Extensions";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nrm -rf \"${BUILT_PRODUCTS_DIR}/${PLUGINS_FOLDER_PATH}/PassepartoutTunnel.appex/Frameworks\"\n";
};
0EBEF139274E4DAE00EAC689 /* Drop Extra Frameworks In Extensions */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Drop Extra Frameworks In Extensions";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nrm -rf \"${BUILT_PRODUCTS_DIR}/${PLUGINS_FOLDER_PATH}/PassepartoutTunnel.appex/Contents/Frameworks\"\n";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
0E5202F3259F573500CBAB56 /* Sources */ = {
isa = PBXSourcesBuildPhase;
@ -1385,8 +1426,9 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1058;
CURRENT_PROJECT_VERSION = 1065;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
@ -1450,8 +1492,9 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1058;
CURRENT_PROJECT_VERSION = 1065;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;

4
Passepartout/App/iOS/CHANGELOG.md
View File

@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased
### Changed
- Revert to OpenSSL.
### Fixed
- Regression in TLS handshake on certain devices.

2
Passepartout/App/iOS/Info.plist
View File

@ -35,7 +35,7 @@
<key>CFBundleShortVersionString</key>
<string>1.17.2</string>
<key>CFBundleVersion</key>
<string>1058</string>
<string>1065</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>

4
Passepartout/App/macOS/CHANGELOG.md
View File

@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased
### Changed
- Revert to OpenSSL.
### Fixed
- Regression in TLS handshake on certain devices.

2
Passepartout/App/macOS/Info.plist
View File

@ -34,7 +34,7 @@
<key>CFBundleShortVersionString</key>
<string>1.17.2</string>
<key>CFBundleVersion</key>
<string>1058</string>
<string>1065</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>

2
Passepartout/App/macOS/Launcher/Info.plist
View File

@ -21,7 +21,7 @@
<key>CFBundleShortVersionString</key>
<string>1.17.2</string>
<key>CFBundleVersion</key>
<string>1058</string>
<string>1065</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>

2
Passepartout/Tunnel/Info.plist
View File

@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>1.17.2</string>
<key>CFBundleVersion</key>
<string>1058</string>
<string>1065</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSExtension</key>

2
PassepartoutCore/Package.swift
View File

@ -22,7 +22,7 @@ let package = Package(
// Dependencies declare other packages that this package depends on.
// .package(url: /* package url */, from: "1.0.0"),
// .package(name: "TunnelKit", url: "https://github.com/passepartoutvpn/tunnelkit", from: "4.0.1"),
.package(name: "TunnelKit", url: "https://github.com/passepartoutvpn/tunnelkit", .revision("c40863d36687c4d44985e7ba804cac41608038e0")),
.package(name: "TunnelKit", url: "https://github.com/passepartoutvpn/tunnelkit", .revision("b6d3cdc3b12a01816b9728b562c5cce700c8977b")),
// .package(name: "TunnelKit", path: "../../tunnelkit"),
.package(name: "Convenience", url: "https://github.com/keeshux/convenience", .revision("347105ec0ce27cd4255acf9875fd60ad1f213801")),
.package(url: "https://github.com/Cocoanetics/Kvitto", from: "1.0.0")

1
PassepartoutCore/Sources/PassepartoutCore/Model/Profiles/HostConnectionProfile.swift
View File

@ -108,6 +108,7 @@ public class HostConnectionProfile: ConnectionProfile, Codable, Equatable {
// forcibly override hostname with profile hostname (never nil)
var sessionBuilder = builder.sessionConfiguration.builder()
sessionBuilder.hostname = hostname
sessionBuilder.tlsSecurityLevel = 0 // lowest, tolerate widest range of certificates
if sessionBuilder.mtu == nil {
sessionBuilder.mtu = configuration.sessionConfiguration.mtu
}