Skip to content

Commit 65e149b

Browse files
authored
Bump signature crate dependency to v2 (#58)
Release notes: RustCrypto/traits#1211 This also bumps the following crates: - `dsa` v0.5 - `ed25519-dalek` "2.0" (via git) - `p256` v0.12 - `p384` v0.12 - `rsa` v0.8 (via git)
1 parent 0d88a39 commit 65e149b

3 files changed

Lines changed: 59 additions & 61 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ members = [
88
[profile.dev]
99
opt-level = 2
1010

11-
[patch.crates-io.ed25519-dalek]
12-
git = "https://github.com/dalek-cryptography/ed25519-dalek"
13-
branch = "release/2.0"
11+
[patch.crates-io]
12+
curve25519-dalek = { git = "https://github.com/dalek-cryptography/curve25519-dalek" }
13+
ed25519-dalek = { git = "https://github.com/dalek-cryptography/ed25519-dalek", branch = "release/2.0" }
14+
rsa = { git = "https://github.com/rustcrypto/rsa", branch = "v0.8.0" }

ssh-key/Cargo.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ rust-version = "1.60"
1919
[dependencies]
2020
encoding = { package = "ssh-encoding", version = "0.1", features = ["base64", "pem", "sha2"], path = "../ssh-encoding" }
2121
sha2 = { version = "0.10.6", default-features = false }
22-
signature = { version = "=2.0.0-pre.3", default-features = false }
22+
signature = { version = "2", default-features = false }
2323
subtle = { version = "2", default-features = false }
2424
zeroize = { version = "1", default-features = false }
2525

@@ -28,15 +28,16 @@ aes = { version = "0.8", optional = true, default-features = false }
2828
ctr = { version = "0.9", optional = true, default-features = false }
2929
bcrypt-pbkdf = { version = "0.9", optional = true, default-features = false }
3030
bigint = { package = "num-bigint-dig", version = "0.8", optional = true, default-features = false }
31-
dsa = { version = "=0.5.0-pre.1", optional = true, default-features = false }
31+
dsa = { version = "0.5", optional = true, default-features = false }
3232
ed25519-dalek = { version = "1.0.1", optional = true, default-features = false }
33-
p256 = { version = "=0.12.0-pre.1", optional = true, default-features = false, features = ["ecdsa"] }
34-
p384 = { version = "=0.12.0-pre.1", optional = true, default-features = false, features = ["ecdsa"] }
33+
p256 = { version = "0.12", optional = true, default-features = false, features = ["ecdsa"] }
34+
p384 = { version = "0.12", optional = true, default-features = false, features = ["ecdsa"] }
3535
rand_core = { version = "0.6", optional = true, default-features = false }
36-
rsa = { version = "0.8.0-pre.0", optional = true, default-features = false }
36+
rsa = { version = "0.8", optional = true, default-features = false }
3737
sec1 = { version = "0.3", optional = true, default-features = false, features = ["point"] }
3838
serde = { version = "1", optional = true }
3939
sha1 = { version = "0.10", optional = true, default-features = false }
40+
4041
[dev-dependencies]
4142
hex-literal = "0.3.4"
4243
rand_chacha = "0.3"
@@ -60,7 +61,7 @@ std = [
6061
"signature/std"
6162
]
6263

63-
dsa = ["dep:bigint", "dep:dsa", "dep:sha1", "alloc", "signature/rand-preview"]
64+
dsa = ["dep:bigint", "dep:dsa", "dep:sha1", "alloc", "signature/rand_core"]
6465
ecdsa = ["dep:sec1"]
6566
ed25519 = ["dep:ed25519-dalek", "rand_core"]
6667
encryption = [ "alloc", "dep:aes", "dep:bcrypt-pbkdf", "dep:ctr", "rand_core"]

0 commit comments

Comments
 (0)