diff --git a/Cargo.lock b/Cargo.lock index b881944..2271202 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -189,30 +189,6 @@ dependencies = [ "cipher", ] -[[package]] -name = "curve25519-dalek" -version = "4.1.3" -source = "git+https://github.com/dalek-cryptography/curve25519-dalek.git?branch=rustcrypto-new-releases#44508ba8652ae3445608ad3c56b63ef528ddfb93" -dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest", - "fiat-crypto", - "rustc_version", - "subtle", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "git+https://github.com/dalek-cryptography/curve25519-dalek.git?branch=rustcrypto-new-releases#44508ba8652ae3445608ad3c56b63ef528ddfb93" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "der" version = "0.8.0-rc.0" @@ -274,26 +250,6 @@ dependencies = [ "spki", ] -[[package]] -name = "ed25519" -version = "2.3.0-pre.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bcc0730fbd27c8619332efad3dfa1de229dc5859a31495ab674e0ac0f9996b" -dependencies = [ - "signature", -] - -[[package]] -name = "ed25519-dalek" -version = "2.2.0-pre" -source = "git+https://github.com/dalek-cryptography/curve25519-dalek.git?branch=rustcrypto-new-releases#44508ba8652ae3445608ad3c56b63ef528ddfb93" -dependencies = [ - "curve25519-dalek", - "ed25519", - "sha2", - "subtle", -] - [[package]] name = "elliptic-curve" version = "0.14.0-pre.6" @@ -323,12 +279,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - [[package]] name = "getrandom" version = "0.2.15" @@ -678,15 +628,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - [[package]] name = "sec1" version = "0.8.0-rc.0" @@ -701,12 +642,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - [[package]] name = "serde" version = "1.0.204" @@ -819,11 +754,10 @@ dependencies = [ [[package]] name = "ssh-key" -version = "0.7.0-pre.0" +version = "0.7.0-pre.1" dependencies = [ "bcrypt-pbkdf", "dsa", - "ed25519-dalek", "hex-literal", "home", "num-bigint-dig", @@ -976,3 +910,8 @@ name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[patch.unused]] +name = "ed25519-dalek" +version = "2.2.0-pre" +source = "git+https://github.com/dalek-cryptography/curve25519-dalek.git?branch=rustcrypto-new-releases#44508ba8652ae3445608ad3c56b63ef528ddfb93" diff --git a/ssh-key/Cargo.toml b/ssh-key/Cargo.toml index 1b91828..8639c22 100644 --- a/ssh-key/Cargo.toml +++ b/ssh-key/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ssh-key" -version = "0.7.0-pre.0" +version = "0.7.0-pre.1" description = """ Pure Rust implementation of SSH key file format decoders/encoders as described in RFC4251/RFC4253 and OpenSSH key formats, as well as "sshsig" signatures and @@ -29,7 +29,7 @@ zeroize = { version = "1", default-features = false } bcrypt-pbkdf = { version = "=0.11.0-pre.1", optional = true, default-features = false, features = ["alloc"] } bigint = { package = "num-bigint-dig", version = "0.8", optional = true, default-features = false } dsa = { version = "=0.7.0-pre.0", optional = true, default-features = false } -ed25519-dalek = { version = "=2.2.0-pre", optional = true, default-features = false } +#ed25519-dalek = { version = "=2.2.0-pre", optional = true, default-features = false } home = { version = "0.5", optional = true } p256 = { version = "=0.14.0-pre.1", optional = true, default-features = false, features = ["ecdsa"] } p384 = { version = "=0.14.0-pre.1", optional = true, default-features = false, features = ["ecdsa"] } @@ -63,10 +63,10 @@ std = [ "dep:home" ] -crypto = ["ed25519", "p256", "p384", "p521", "rsa"] # NOTE: `dsa` is obsolete/weak +crypto = ["p256", "p384", "p521", "rsa"] # NOTE: `dsa` is obsolete/weak dsa = ["dep:bigint", "dep:dsa", "dep:sha1", "alloc", "signature/rand_core"] ecdsa = ["dep:sec1"] -ed25519 = ["dep:ed25519-dalek", "rand_core"] +#ed25519 = ["dep:ed25519-dalek", "rand_core"] encryption = [ "dep:bcrypt-pbkdf", "alloc", diff --git a/ssh-protocol/Cargo.toml b/ssh-protocol/Cargo.toml index 1a7ebbf..292ddd9 100644 --- a/ssh-protocol/Cargo.toml +++ b/ssh-protocol/Cargo.toml @@ -18,7 +18,7 @@ rust-version = "1.73" [dependencies] cipher = { package = "ssh-cipher", version = "=0.3.0-pre.1", default-features = false, path = "../ssh-cipher" } encoding = { package = "ssh-encoding", version = "=0.3.0-pre.1", default-features = false, path = "../ssh-encoding" } -key = { package = "ssh-key", version = "=0.7.0-pre.0", default-features = false, path = "../ssh-key" } +key = { package = "ssh-key", version = "=0.7.0-pre.1", default-features = false, path = "../ssh-key" } [features] default = ["std"]