Skip to content

Commit 01c9bba

Browse files
tarcieritarcieri
committed
Bump rand_core to v0.10.0-rc-2
This also accordingly bumps all of the underlying crates to versions which (transitively) depend on the `rand`/`rand_core` v0.10 release series. The `ssh-key` crate's `getrandom` feature has been temporarily disabled to simplify the upgrade.
1 parent 3920302 commit 01c9bba

File tree

8 files changed

+122
-201
lines changed

8 files changed

+122
-201
lines changed

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,12 @@ ssh-cipher = { path = "./ssh-cipher" }
1616
ssh-derive = { path = "./ssh-derive" }
1717
ssh-encoding = { path = "./ssh-encoding" }
1818
ssh-key = { path = "./ssh-key" }
19+
20+
ed25519-dalek = { git = "https://github.com/dalek-cryptography/curve25519-dalek", branch = "rand_core/v0.10-rc" }
21+
elliptic-curve = { git = "https://github.com/RustCrypto/traits" }
22+
ff = { git = "https://github.com/tarcieri/ff", branch = "rand_core/v0.10.0-rc-2" }
23+
group = { git = "https://github.com/tarcieri/group", branch = "rand_core/v0.10.0-rc-2" }
24+
p256 = { git = "https://github.com/RustCrypto/elliptic-curves" }
25+
p384 = { git = "https://github.com/RustCrypto/elliptic-curves" }
26+
p521 = { git = "https://github.com/RustCrypto/elliptic-curves" }
27+
primefield = { git = "https://github.com/RustCrypto/elliptic-curves " }

‎ssh-cipher/Cargo.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ cipher = "0.5.0-rc.1"
2323
encoding = { package = "ssh-encoding", version = "0.3.0-rc.2" }
2424

2525
# optional dependencies
26-
aead = { version = "0.6.0-rc.2", optional = true, default-features = false }
27-
aes = { version = "0.9.0-rc.1", optional = true, default-features = false }
28-
aes-gcm = { version = "0.11.0-rc.1", optional = true, default-features = false, features = ["aes"] }
29-
cbc = { version = "0.2.0-rc.1", optional = true }
30-
ctr = { version = "0.10.0-rc.1", optional = true, default-features = false }
31-
chacha20 = { version = "0.10.0-rc.2", optional = true, default-features = false, features = ["cipher", "legacy"] }
32-
des = { version = "0.9.0-rc.1", optional = true, default-features = false }
33-
poly1305 = { version = "0.9.0-rc.2", optional = true, default-features = false }
26+
aead = { version = "0.6.0-rc.3", optional = true, default-features = false }
27+
aes = { version = "0.9.0-rc.2", optional = true, default-features = false }
28+
aes-gcm = { version = "0.11.0-rc.2", optional = true, default-features = false, features = ["aes"] }
29+
cbc = { version = "0.2.0-rc.2", optional = true }
30+
ctr = { version = "0.10.0-rc.2", optional = true, default-features = false }
31+
chacha20 = { version = "0.10.0-rc.5", optional = true, default-features = false, features = ["cipher", "legacy"] }
32+
des = { version = "0.9.0-rc.2", optional = true, default-features = false }
33+
poly1305 = { version = "0.9.0-rc.3", optional = true, default-features = false }
3434
subtle = { version = "2", optional = true, default-features = false }
3535
zeroize = { version = "1", optional = true, default-features = false }
3636

‎ssh-encoding/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ rust-version = "1.85"
1717

1818
[dependencies]
1919
base64ct = { version = "1.7", optional = true }
20-
bigint = { package = "crypto-bigint", version = "0.7.0-rc.6", optional = true, default-features = false, features = ["alloc"] }
20+
bigint = { package = "crypto-bigint", version = "0.7.0-rc.10", optional = true, default-features = false, features = ["alloc"] }
2121
bytes = { version = "1", optional = true, default-features = false }
22-
digest = { version = "0.11.0-rc.3", optional = true, default-features = false }
22+
digest = { version = "0.11.0-rc.4", optional = true, default-features = false }
2323
pem-rfc7468 = { version = "1.0.0-rc.3", optional = true }
2424
ssh-derive = { version = "0.3.0-rc.0", optional = true }
2525
subtle = { version = "2", optional = true, default-features = false }

‎ssh-key/Cargo.toml‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,30 @@ rust-version = "1.85"
2020
[dependencies]
2121
cipher = { package = "ssh-cipher", version = "0.3.0-rc.3", features = ["zeroize"] }
2222
encoding = { package = "ssh-encoding", version = "0.3.0-rc.2", features = ["base64", "digest", "pem", "subtle", "zeroize"] }
23-
sha2 = { version = "0.11.0-rc.2", default-features = false }
24-
signature = { version = "3.0.0-rc.4", default-features = false }
23+
sha2 = { version = "0.11.0-rc.3", default-features = false }
24+
signature = { version = "3.0.0-rc.5", default-features = false }
2525
subtle = { version = "2", default-features = false }
2626
zeroize = { version = "1", default-features = false }
2727

2828
# optional dependencies
29-
argon2 = { version = "0.6.0-rc.1", optional = true, default-features = false, features = ["alloc"] }
30-
bcrypt-pbkdf = { version = "0.11.0-rc.1", optional = true, default-features = false, features = ["alloc"] }
31-
dsa = { version = "0.7.0-rc.6", optional = true, default-features = false, features = ["hazmat"] }
29+
argon2 = { version = "0.6.0-rc.2", optional = true, default-features = false, features = ["alloc"] }
30+
bcrypt-pbkdf = { version = "0.11.0-rc.2", optional = true, default-features = false, features = ["alloc"] }
31+
dsa = { version = "0.7.0-rc.7", optional = true, default-features = false, features = ["hazmat"] }
3232
ed25519-dalek = { version = "=3.0.0-pre.1", optional = true, default-features = false }
3333
hex = { version = "0.4", optional = true, default-features = false, features = ["alloc"] }
34-
hmac = { version = "0.13.0-rc.2", optional = true }
35-
p256 = { version = "0.14.0-pre.11", optional = true, default-features = false, features = ["ecdsa"] }
36-
p384 = { version = "0.14.0-pre.11", optional = true, default-features = false, features = ["ecdsa"] }
37-
p521 = { version = "0.14.0-pre.11", optional = true, default-features = false, features = ["ecdsa"] }
38-
rand_core = { version = "0.9", optional = true, default-features = false }
39-
rsa = { version = "0.10.0-rc.9", optional = true, default-features = false, features = ["sha2"] }
34+
hmac = { version = "0.13.0-rc.3", optional = true }
35+
p256 = { version = "0.14.0-rc.0", optional = true, default-features = false, features = ["ecdsa"] }
36+
p384 = { version = "0.14.0-rc.0", optional = true, default-features = false, features = ["ecdsa"] }
37+
p521 = { version = "0.14.0-rc.0", optional = true, default-features = false, features = ["ecdsa"] }
38+
rand_core = { version = "0.10.0-rc-2", optional = true, default-features = false }
39+
rsa = { version = "0.10.0-rc.10", optional = true, default-features = false, features = ["sha2"] }
4040
sec1 = { version = "0.8.0-rc.10", optional = true, default-features = false, features = ["point"] }
4141
serde = { version = "1.0.16", optional = true }
42-
sha1 = { version = "0.11.0-rc.2", optional = true, default-features = false, features = ["oid"] }
42+
sha1 = { version = "0.11.0-rc.3", optional = true, default-features = false, features = ["oid"] }
4343

4444
[dev-dependencies]
4545
hex-literal = "1"
46-
rand_chacha = "0.9"
46+
chacha20 = { version = "0.10.0-rc.5", features = ["rng"] }
4747

4848
[features]
4949
default = ["ecdsa", "rand_core", "std"]
@@ -63,7 +63,6 @@ encryption = [
6363
"cipher/chacha20poly1305",
6464
"rand_core"
6565
]
66-
getrandom = ["rand_core/os_rng"] # TODO(tarcieri): rename feature
6766
p256 = ["dep:p256", "ecdsa"]
6867
p384 = ["dep:p384", "ecdsa"]
6968
p521 = ["dep:p521", "ecdsa"]

‎ssh-key/src/lib.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
unused_lifetimes,
2121
unused_qualifications
2222
)]
23+
// TODO(tarcieri): fix `getrandom` feature
24+
#![allow(unexpected_cfgs)]
2325

2426
//! ## Usage
2527
//!

‎ssh-key/tests/certificate_builder.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
any(feature = "ed25519", feature = "p256")
77
))]
88

9+
use chacha20::{ChaCha8Rng, rand_core::SeedableRng};
910
use hex_literal::hex;
10-
use rand_chacha::{ChaCha8Rng, rand_core::SeedableRng};
1111
use ssh_key::{Algorithm, PrivateKey, certificate};
1212

1313
#[cfg(feature = "p256")]

‎ssh-key/tests/encrypted_private_key.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
//! Encrypted SSH private key tests.
22
33
#![cfg(feature = "alloc")]
4+
// TODO(tarcieri): fix `getrandom` feature
5+
#![allow(unexpected_cfgs)]
46

57
use hex_literal::hex;
68
use ssh_key::{Algorithm, Cipher, Kdf, KdfAlg, PrivateKey};

0 commit comments

Comments
 (0)