Skip to content

Use ssh_exec from libgit2 #2787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lucasderraugh merged 1 commit into from
Jun 10, 2026
Merged

Use ssh_exec from libgit2 #2787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions GitUp/GitUp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
0A2F489223683DD60072C6FB /* AuthenticationWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0A2F489023683DD60072C6FB /* AuthenticationWindowController.xib */; };
0A3388BC2353BD630022528D /* WelcomeWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0A3388BA2353BD630022528D /* WelcomeWindowController.xib */; };
0A0C000126D8020000BEEF00 /* libgit2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0C001126D8020000BEEF00 /* libgit2.xcframework */; };
0A0C000226D8020000BEEF00 /* libssh2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0C001226D8020000BEEF00 /* libssh2.xcframework */; };
0A0C000326D8020000BEEF00 /* libssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0C001326D8020000BEEF00 /* libssl.xcframework */; };
0A0C000426D8020000BEEF00 /* libcrypto.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0C001426D8020000BEEF00 /* libcrypto.xcframework */; };
0A0C000526D8020000BEEF00 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0C001526D8020000BEEF00 /* Security.framework */; };
Expand Down Expand Up @@ -134,7 +133,6 @@
0AD4625A232711B000BE28D1 /* WelcomeWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WelcomeWindowController.m; sourceTree = "<group>"; };
0AE7F5EE2312C1B000B06050 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
0A0C001126D8020000BEEF00 /* libgit2.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libgit2.xcframework; path = "../GitUpKit/Third-Party/libgit2.xcframework"; sourceTree = SOURCE_ROOT; };
0A0C001226D8020000BEEF00 /* libssh2.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libssh2.xcframework; path = "../GitUpKit/Third-Party/libssh2.xcframework"; sourceTree = SOURCE_ROOT; };
0A0C001326D8020000BEEF00 /* libssl.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libssl.xcframework; path = "../GitUpKit/Third-Party/libssl.xcframework"; sourceTree = SOURCE_ROOT; };
0A0C001426D8020000BEEF00 /* libcrypto.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libcrypto.xcframework; path = "../GitUpKit/Third-Party/libcrypto.xcframework"; sourceTree = SOURCE_ROOT; };
0A0C001526D8020000BEEF00 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -184,7 +182,6 @@
0A0C000526D8020000BEEF00 /* Security.framework in Frameworks */,
0A0C000626D8020000BEEF00 /* CoreFoundation.framework in Frameworks */,
0A0C000126D8020000BEEF00 /* libgit2.xcframework in Frameworks */,
0A0C000226D8020000BEEF00 /* libssh2.xcframework in Frameworks */,
0A0C000326D8020000BEEF00 /* libssl.xcframework in Frameworks */,
0A0C000426D8020000BEEF00 /* libcrypto.xcframework in Frameworks */,
DBBEE685256B0A0200F96DAF /* libiconv.tbd in Frameworks */,
Expand Down Expand Up @@ -212,7 +209,6 @@
0A0C001426D8020000BEEF00 /* libcrypto.xcframework */,
0A0C001126D8020000BEEF00 /* libgit2.xcframework */,
DBBEE684256B0A0200F96DAF /* libiconv.tbd */,
0A0C001226D8020000BEEF00 /* libssh2.xcframework */,
0A0C001326D8020000BEEF00 /* libssl.xcframework */,
DBBEE687256B0A0A00F96DAF /* libz.tbd */,
0A0C001526D8020000BEEF00 /* Security.framework */,
Expand Down Expand Up @@ -497,7 +493,7 @@
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/sh;
shellScript = "# Information derived from https://stackoverflow.com/questions/77397157/mapbox-xcframework-ios-signature-couldn-t-be-copied-to-signatures-because-an-i\nif [ \"$XCODE_VERSION_MAJOR\" -ge \"1500\" ]; then\n echo \"Remove signature files (Xcode 15 workaround)\"\n find \"$BUILD_DIR/${CONFIGURATION}/libssl.xcframework-macos.signature\" -name \"*.signature\" -type f | xargs -r rm\n find \"$BUILD_DIR/${CONFIGURATION}/libcrypto.xcframework-macos.signature\" -name \"*.signature\" -type f | xargs -r rm\n find \"$BUILD_DIR/${CONFIGURATION}/libssh2.xcframework-macos.signature\" -name \"*.signature\" -type f | xargs -r rm\n find \"$BUILD_DIR/${CONFIGURATION}/Sparkle.xcframework-macos.signature\" -name \"*.signature\" -type f | xargs -r rm\nelse\n echo \"No signature files to remove (Xcode version is less than 1500)\"\nfi\n";
shellScript = "# Information derived from https://stackoverflow.com/questions/77397157/mapbox-xcframework-ios-signature-couldn-t-be-copied-to-signatures-because-an-i\nif [ \"$XCODE_VERSION_MAJOR\" -ge \"1500\" ]; then\n echo \"Remove signature files (Xcode 15 workaround)\"\n find \"$BUILD_DIR/${CONFIGURATION}/libssl.xcframework-macos.signature\" -name \"*.signature\" -type f | xargs -r rm\n find \"$BUILD_DIR/${CONFIGURATION}/libcrypto.xcframework-macos.signature\" -name \"*.signature\" -type f | xargs -r rm\n find \"$BUILD_DIR/${CONFIGURATION}/Sparkle.xcframework-macos.signature\" -name \"*.signature\" -type f | xargs -r rm\nelse\n echo \"No signature files to remove (Xcode version is less than 1500)\"\nfi\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down
2 changes: 0 additions & 2 deletions GitUpKit/Core/GCRepository.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#endif

#import <TargetConditionals.h>
#import <libssh2.h>
#import <pthread.h>
#if !TARGET_OS_IPHONE
#import <git2/sys/filter.h>
Expand Down Expand Up @@ -119,7 +118,6 @@ + (void)load {
assert(git_libgit2_features() & GIT_FEATURE_HTTPS);
assert(git_libgit2_features() & GIT_FEATURE_SSH);
assert(git_libgit2_init() >= 1);
assert(libssh2_init(0) == 0); // We can't have libgit2 using libssh2_session_init() and in turn calling this function on an arbitrary thread later on

#if !TARGET_OS_IPHONE
struct stat info;
Expand Down
8 changes: 0 additions & 8 deletions GitUpKit/GitUpKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,15 @@

/* Begin PBXBuildFile section */
0A0B000126D8010000BEEF00 /* libgit2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0B001126D8010000BEEF00 /* libgit2.xcframework */; };
0A0B000226D8010000BEEF00 /* libssh2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0B001226D8010000BEEF00 /* libssh2.xcframework */; };
0A0B000326D8010000BEEF00 /* libssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0B001326D8010000BEEF00 /* libssl.xcframework */; };
0A0B000426D8010000BEEF00 /* libcrypto.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0B001426D8010000BEEF00 /* libcrypto.xcframework */; };
0A0B000526D8010000BEEF00 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0B001526D8010000BEEF00 /* CoreFoundation.framework */; };
0A0B000626D8010000BEEF00 /* libgit2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0B001126D8010000BEEF00 /* libgit2.xcframework */; };
0A0B000726D8010000BEEF00 /* libssh2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0B001226D8010000BEEF00 /* libssh2.xcframework */; };
0A0B000826D8010000BEEF00 /* libssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0B001326D8010000BEEF00 /* libssl.xcframework */; };
0A0B000926D8010000BEEF00 /* libcrypto.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0B001426D8010000BEEF00 /* libcrypto.xcframework */; };
0A0B000A26D8010000BEEF00 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0B001526D8010000BEEF00 /* CoreFoundation.framework */; };
0A0B000B26D8010000BEEF00 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A1DA51D265806140041E737 /* Security.framework */; };
0A0B000C26D8010000BEEF00 /* libgit2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0B001126D8010000BEEF00 /* libgit2.xcframework */; };
0A0B000D26D8010000BEEF00 /* libssh2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0B001226D8010000BEEF00 /* libssh2.xcframework */; };
0A0B000E26D8010000BEEF00 /* libssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0B001326D8010000BEEF00 /* libssl.xcframework */; };
0A0B000F26D8010000BEEF00 /* libcrypto.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0B001426D8010000BEEF00 /* libcrypto.xcframework */; };
0A0B001026D8010000BEEF00 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A0B001526D8010000BEEF00 /* CoreFoundation.framework */; };
Expand Down Expand Up @@ -365,7 +362,6 @@

/* Begin PBXFileReference section */
0A0B001126D8010000BEEF00 /* libgit2.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libgit2.xcframework; path = "Third-Party/libgit2.xcframework"; sourceTree = "<group>"; };
0A0B001226D8010000BEEF00 /* libssh2.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libssh2.xcframework; path = "Third-Party/libssh2.xcframework"; sourceTree = "<group>"; };
0A0B001326D8010000BEEF00 /* libssl.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libssl.xcframework; path = "Third-Party/libssl.xcframework"; sourceTree = "<group>"; };
0A0B001426D8010000BEEF00 /* libcrypto.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libcrypto.xcframework; path = "Third-Party/libcrypto.xcframework"; sourceTree = "<group>"; };
0A0B001526D8010000BEEF00 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -600,7 +596,6 @@
0A0B000B26D8010000BEEF00 /* Security.framework in Frameworks */,
0A0B000A26D8010000BEEF00 /* CoreFoundation.framework in Frameworks */,
0A0B000626D8010000BEEF00 /* libgit2.xcframework in Frameworks */,
0A0B000726D8010000BEEF00 /* libssh2.xcframework in Frameworks */,
0A0B000826D8010000BEEF00 /* libssl.xcframework in Frameworks */,
0A0B000926D8010000BEEF00 /* libcrypto.xcframework in Frameworks */,
DBBEE674256B09B500F96DAF /* libiconv.tbd in Frameworks */,
Expand All @@ -616,7 +611,6 @@
0A1DA51E265806140041E737 /* Security.framework in Frameworks */,
0A0B000526D8010000BEEF00 /* CoreFoundation.framework in Frameworks */,
0A0B000126D8010000BEEF00 /* libgit2.xcframework in Frameworks */,
0A0B000226D8010000BEEF00 /* libssh2.xcframework in Frameworks */,
0A0B000326D8010000BEEF00 /* libssl.xcframework in Frameworks */,
0A0B000426D8010000BEEF00 /* libcrypto.xcframework in Frameworks */,
DBBEE655256B095000F96DAF /* libiconv.tbd in Frameworks */,
Expand All @@ -632,7 +626,6 @@
0A0B001626D8010000BEEF00 /* Security.framework in Frameworks */,
0A0B001026D8010000BEEF00 /* CoreFoundation.framework in Frameworks */,
0A0B000C26D8010000BEEF00 /* libgit2.xcframework in Frameworks */,
0A0B000D26D8010000BEEF00 /* libssh2.xcframework in Frameworks */,
0A0B000E26D8010000BEEF00 /* libssl.xcframework in Frameworks */,
0A0B000F26D8010000BEEF00 /* libcrypto.xcframework in Frameworks */,
1DADC0DE25A25D5D008C2C35 /* libiconv.tbd in Frameworks */,
Expand Down Expand Up @@ -661,7 +654,6 @@
0A0B001426D8010000BEEF00 /* libcrypto.xcframework */,
0A0B001126D8010000BEEF00 /* libgit2.xcframework */,
DBBEE654256B095000F96DAF /* libiconv.tbd */,
0A0B001226D8010000BEEF00 /* libssh2.xcframework */,
0A0B001326D8010000BEEF00 /* libssl.xcframework */,
DBBEE637256B08D300F96DAF /* libsqlite3.xcframework */,
DBBEE64C256B094000F96DAF /* libz.tbd */,
Expand Down
2 changes: 1 addition & 1 deletion GitUpKit/Third-Party/libgit2
Open in desktop
Submodule libgit2 updated 1 files
+1 −0 src/libgit2/transports/ssh_exec.c
12 changes: 6 additions & 6 deletions GitUpKit/Third-Party/libgit2.xcframework/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>macos-arm64_x86_64</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>libgit2.a</string>
<key>SupportedArchitectures</key>
Expand All @@ -35,15 +35,17 @@
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>macos</string>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>BinaryPath</key>
<string>libgit2.a</string>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<string>macos-arm64_x86_64</string>
<key>LibraryPath</key>
<string>libgit2.a</string>
<key>SupportedArchitectures</key>
Expand All @@ -52,9 +54,7 @@
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
<string>macos</string>
</dict>
</array>
<key>CFBundlePackageType</key>
Expand Down
Binary file modified GitUpKit/Third-Party/libgit2.xcframework/ios-arm64/libgit2.a
View file
Open in desktop
Binary file not shown.
Binary file modified GitUpKit/Third-Party/libgit2.xcframework/ios-arm64_x86_64-simulator/libgit2.a
View file
Open in desktop
Binary file not shown.
Binary file modified GitUpKit/Third-Party/libgit2.xcframework/macos-arm64_x86_64/libgit2.a
View file
Open in desktop
Binary file not shown.
11 changes: 2 additions & 9 deletions GitUpKit/Third-Party/rebuild-libgit2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ function build_arch_library() {
exit 1
fi

local LIBSSH2_PREFIX="$DIRNAME/libssh2.xcframework/$XCFRAMEWORK_SUBDIR"
local LIBSSL_PREFIX="$DIRNAME/libssl.xcframework/$XCFRAMEWORK_SUBDIR"
local LIBCRYPTO_PREFIX="$DIRNAME/libcrypto.xcframework/$XCFRAMEWORK_SUBDIR"
local SDKROOT="`xcrun --sdk "$PLATFORM" --show-sdk-path`"
local DEPLOYMENT_TARGET="$IOS_VERSION_MIN"
local REGEX_BACKEND="builtin"
Expand All @@ -45,17 +42,13 @@ function build_arch_library() {
-DBUILD_CLI=OFF \
-DBUILD_EXAMPLES=OFF \
-DBUILD_FUZZERS=OFF \
-DUSE_SSH=libssh2 \
-DUSE_SSH=exec \
-DUSE_HTTPS=SecureTransport \
-DUSE_SHA1=CollisionDetection \
-DUSE_SHA256=CommonCrypto \
-DREGEX_BACKEND="$REGEX_BACKEND" \
-DUSE_HTTP_PARSER=builtin \
-DPKG_CONFIG_EXECUTABLE=/usr/bin/false \
-DLIBSSH2_INCLUDE_DIR="$LIBSSH2_PREFIX/Headers" \
-DLIBSSH2_LIBRARY="$LIBSSH2_PREFIX/libssh2.a" \
-DHAVE_LIBSSH2_MEMORY_CREDENTIALS=1 \
-DCMAKE_REQUIRED_LIBRARIES="$LIBSSH2_PREFIX/libssh2.a;$LIBSSL_PREFIX/libssl.a;$LIBCRYPTO_PREFIX/libcrypto.a;z"
-DPKG_CONFIG_EXECUTABLE=/usr/bin/false

cmake --build "$BUILD_DIR" --target install --config Release
}
Expand Down
Loading