Skip to content
/ arti Public

Commit 264b5e8

Browse files
committed
keymgr, key-forge: Use our ssh-* forks
Upstream `ssh-key` is missing some important features we need for arti-relay: * a bug fix without which we can't convert deserialized RSA keys to their rsa counterparts: RustCrypto/SSH#318 * @WesleyAC 's patch RustCrypto/SSH#412 for allowing insecure (1024 bits long) RSA keys (needed because the relay KS_relayid_rsa identity keys are 1024 bits long) We plan to switch back to mainline `ssh-key` when `ssh-key 0.7.0` comes out. See the discussion in #2398 for more details.
1 parent 6ab2f09 commit 264b5e8

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

Cargo.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/tor-key-forge/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ paste = "1.0.3"
3232
rand = "0.9.1"
3333
rsa = "0.9.0"
3434
signature = "2"
35-
ssh-key = { version = "0.6.1", features = ["std", "rsa"] }
35+
ssh-key = { version = "0.6.7", package = "ssh-key-fork-arti", features = ["std", "rsa"] }
3636
thiserror = "2"
3737
tor-bytes = { path = "../tor-bytes", version = "0.40.0", default-features = false }
3838
tor-cert = { path = "../tor-cert", version = "0.40.0", features = ["encode", "experimental-api"] }

crates/tor-keymgr/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ rand = "0.9.1"
6969
safelog = { path = "../safelog", version = "0.8.0" }
7070
serde = { version = "1.0.103", features = ["derive"] }
7171
signature = "2"
72-
ssh-key = { version = "0.6.1", features = ["std"] }
72+
ssh-key = { version = "0.6.7", package = "ssh-key-fork-arti", features = ["std"] }
7373
thiserror = "2"
7474
tor-basic-utils = { path = "../tor-basic-utils", version = "0.40.0" }
7575
tor-bytes = { path = "../tor-bytes", version = "0.40.0", default-features = false }

maint/keygen-openssh-test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ base32 = "0.5"
1414
clap = { version = "4.3.24", features = ["derive"] }
1515
rand = "0.9.1"
1616
rand_core = { version = "0.9.3", features = ["os_rng"] }
17-
ssh-key = { version = "0.6.1", features = ["dsa", "alloc", "rand_core", "std"] }
17+
ssh-key = { version = "0.6.7", package = "ssh-key-fork-arti", features = ["dsa", "alloc", "rand_core", "std"] }
1818
tor-basic-utils = { path = "../../crates/tor-basic-utils", version = "0.40" }
1919
tor-keymgr = { path = "../../crates/tor-keymgr", version = "0.40", features = ["keymgr"] }
2020
tor-llcrypto = { path = "../../crates/tor-llcrypto", version = "0.40", features = ["relay", "rng-compat", "cvt-x25519"] }

0 commit comments

Comments
 (0)