From c59e79dbc526a8e1c1c158ad9ccabcf6eafb53ce Mon Sep 17 00:00:00 2001
From: Eidolon <furyhunter600@gmail.com>
Date: Sat, 20 Apr 2024 19:15:46 -0500
Subject: [PATCH] git: Always use OpenSSL on win32

By default, libssh2 uses Windows Cryptography Next Generation when targeting
win32. The wincng backend does not support ED25519, which is a widely-used
algorithm among git hosting services, and in some cases may be the only option
on remotes in certain configurations.

This change adds the feature `openssl-on-win32`, enabling the same one in
`libssh2-sys`, and enables it in the CI release flow, ensuring that release
builds are able to communicate with hosts using ED25519.

Fixes #3322
---
 .github/workflows/release.yml | 2 +-
 CHANGELOG.md                  | 3 +++
 Cargo.lock                    | 2 ++
 Cargo.toml                    | 1 +
 cli/Cargo.toml                | 4 ++++
 lib/Cargo.toml                | 4 +++-
 6 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0541a0fb87..bc65d65879 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -46,7 +46,7 @@ jobs:
         toolchain: stable
         target: ${{ matrix.target }}
     - name: Build release binary
-      run: cargo build --target ${{ matrix.target }} --verbose --release --features packaging,vendored-openssl
+      run: cargo build --target ${{ matrix.target }} --verbose --release --features packaging,openssl-on-win32,vendored-openssl
     - name: Build archive
       shell: bash
       run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1445e289ef..f21c95748b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed bugs
 
+* When built with the `openssl-on-win32` feature, ED25519 host keys are supported
+  when connecting to Git+SSH remotes on Windows.
+
 ## [0.17.1] - 2024-05-07
 
 ### Fixed bugs
diff --git a/Cargo.lock b/Cargo.lock
index 9e6a1f3355..f61877fb08 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1694,6 +1694,7 @@ dependencies = [
  "jj-cli",
  "jj-lib",
  "libc",
+ "libssh2-sys",
  "maplit",
  "minus",
  "once_cell",
@@ -1744,6 +1745,7 @@ dependencies = [
  "insta",
  "itertools 0.12.1",
  "jj-lib-proc-macros",
+ "libssh2-sys",
  "maplit",
  "num_cpus",
  "once_cell",
diff --git a/Cargo.toml b/Cargo.toml
index 4c78c3ae6f..2f88f73388 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -60,6 +60,7 @@ indoc = "2.0.4"
 insta = { version = "1.38.0", features = ["filters"] }
 itertools = "0.12.1"
 libc = { version = "0.2.154" }
+libssh2-sys = { version = "0.3.0" }
 maplit = "1.0.2"
 minus = { version = "5.6.1", features = ["dynamic_output", "search"] }
 num_cpus = "1.16.0"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 8d2b41c514..153d3d4d5a 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -89,6 +89,9 @@ unicode-width = { workspace = true }
 [target.'cfg(unix)'.dependencies]
 libc = { workspace = true }
 
+[target.'cfg(windows)'.dependencies]
+libssh2-sys = { workspace = true }
+
 [dev-dependencies]
 anyhow = { workspace = true }
 assert_cmd = { workspace = true }
@@ -104,6 +107,7 @@ jj-cli = { path = ".", features = ["test-fakes"], default-features = false }
 [features]
 default = ["watchman"]
 bench = ["dep:criterion"]
+openssl-on-win32 = ["libssh2-sys/openssl-on-win32", "jj-lib/openssl-on-win32"]
 packaging = []
 test-fakes = ["jj-lib/testing"]
 vendored-openssl = ["git2/vendored-openssl", "jj-lib/vendored-openssl"]
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
index d7a68f6a13..19b6d348e8 100644
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -49,6 +49,7 @@ hex = { workspace = true }
 ignore = { workspace = true }
 itertools = { workspace = true }
 jj-lib-proc-macros = { workspace = true }
+libssh2-sys = { workspace = true }
 maplit = { workspace = true }
 once_cell = { workspace = true }
 pest = { workspace = true }
@@ -92,6 +93,7 @@ tokio = { workspace = true, features = ["full"] }
 
 [features]
 default = []
-vendored-openssl = ["git2/vendored-openssl"]
+openssl-on-win32 = ["libssh2-sys/openssl-on-win32"]
+vendored-openssl = ["git2/vendored-openssl", "libssh2-sys/openssl-on-win32"]
 watchman = ["dep:tokio", "dep:watchman_client"]
 testing = []