Skip to content

Commit 07482c0

Browse files
baloobaloo
committed
bump dependencies to pre-releases
1 parent 8abfc94 commit 07482c0

File tree

8 files changed

+214
-133
lines changed

8 files changed

+214
-133
lines changed

‎Cargo.lock

+164-105
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+22
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,25 @@ members = [
88

99
[profile.dev]
1010
opt-level = 2
11+
12+
[patch.crates-io]
13+
p256 = { git = "https://github.com/RustCrypto/elliptic-curves.git" }
14+
p384 = { git = "https://github.com/RustCrypto/elliptic-curves.git" }
15+
p521 = { git = "https://github.com/RustCrypto/elliptic-curves.git" }
16+
17+
ed25519 = { git = "https://github.com/baloo/signatures.git", branch = "baloo/pkcs8-0.11.0-pre.0" }
18+
ed25519-dalek = { git = "https://github.com/baloo/curve25519-dalek.git", branch = "baloo/rust-crypto/digest-sha2-bumps" }
19+
20+
dsa = { git = "https://github.com/RustCrypto/signatures.git" }
21+
22+
bcrypt-pbkdf = { git = "https://github.com/RustCrypto/password-hashes.git" }
23+
24+
chacha20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" }
25+
26+
# https://github.com/RustCrypto/block-ciphers/pull/411
27+
aes = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/bump-cipher/0.5.0-pre.3" }
28+
des = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/bump-cipher/0.5.0-pre.3" }
29+
30+
# https://github.com/RustCrypto/block-modes/pull/56
31+
cbc = { git = "https://github.com/baloo/block-modes.git", branch = "baloo/bump-prereleases" }
32+
ctr = { git = "https://github.com/baloo/block-modes.git", branch = "baloo/bump-prereleases" }

‎ssh-cipher/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ edition = "2021"
1818
rust-version = "1.60"
1919

2020
[dependencies]
21-
cipher = "0.4"
21+
cipher = "=0.5.0-pre.3"
2222
encoding = { package = "ssh-encoding", version = "0.2", path = "../ssh-encoding" }
2323

2424
# optional dependencies
25-
aes = { version = "0.8", optional = true, default-features = false }
25+
aes = { version = "=0.9.0-pre", optional = true, default-features = false }
2626
aes-gcm = { version = "0.10", optional = true, default-features = false, features = ["aes"] }
27-
cbc = { version = "0.1", optional = true }
28-
ctr = { version = "0.9", optional = true, default-features = false }
29-
chacha20 = { version = "0.9", optional = true, default-features = false }
30-
des = { version = "0.8", optional = true, default-features = false }
31-
poly1305 = { version = "0.8", optional = true, default-features = false }
27+
cbc = { version = "=0.2.0-pre", optional = true }
28+
ctr = { version = "=0.10.0-pre", optional = true, default-features = false }
29+
chacha20 = { version = "=0.10.0-pre", optional = true, default-features = false }
30+
des = { version = "=0.9.0-pre", optional = true, default-features = false }
31+
poly1305 = { version = "0.8.0", optional = true, default-features = false }
3232
subtle = { version = "2", optional = true, default-features = false }
3333

3434
[features]

‎ssh-encoding/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ rust-version = "1.60"
1717
[dependencies]
1818
base64 = { package = "base64ct", version = "1.4", optional = true }
1919
bytes = { version = "1", optional = true, default-features = false }
20-
pem = { package = "pem-rfc7468", version = "0.7", optional = true }
21-
sha2 = { version = "0.10", optional = true, default-features = false }
20+
pem = { package = "pem-rfc7468", version = "=1.0.0-pre.0", optional = true }
21+
sha2 = { version = "=0.11.0-pre.3", optional = true, default-features = false }
2222

2323
[dev-dependencies]
2424
hex-literal = "0.4.1"

‎ssh-encoding/tests/encode.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fn encode_byte_slice() {
4343
#[test]
4444
fn encode_byte_vec() {
4545
let mut out = Vec::new();
46-
Vec::from(b"example".as_ref()).encode(&mut out).unwrap();
46+
Vec::from(b"example").encode(&mut out).unwrap();
4747
assert_eq!(out, hex!("000000076578616d706c65"));
4848
}
4949

‎ssh-key/Cargo.toml

+11-11
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@ rust-version = "1.65"
1919
[dependencies]
2020
cipher = { package = "ssh-cipher", version = "0.2", path = "../ssh-cipher" }
2121
encoding = { package = "ssh-encoding", version = "0.2", features = ["base64", "pem", "sha2"], path = "../ssh-encoding" }
22-
sha2 = { version = "0.10.8", default-features = false }
23-
signature = { version = "2", default-features = false }
22+
sha2 = { version = "=0.11.0-pre.3", default-features = false }
23+
signature = { version = "=2.3.0-pre.3", default-features = false }
2424
subtle = { version = "2", default-features = false }
2525
zeroize = { version = "1", default-features = false }
2626

2727
# optional dependencies
28-
bcrypt-pbkdf = { version = "0.10", optional = true, default-features = false, features = ["alloc"] }
28+
bcrypt-pbkdf = { version = "=0.11.0-pre.0", optional = true, default-features = false, features = ["alloc"] }
2929
bigint = { package = "num-bigint-dig", version = "0.8", optional = true, default-features = false }
30-
dsa = { version = "0.6", optional = true, default-features = false }
31-
ed25519-dalek = { version = "2", optional = true, default-features = false }
32-
p256 = { version = "0.13", optional = true, default-features = false, features = ["ecdsa"] }
33-
p384 = { version = "0.13", optional = true, default-features = false, features = ["ecdsa"] }
34-
p521 = { version = "0.13.3", optional = true, default-features = false, features = ["ecdsa", "getrandom"] } # TODO(tarcieri): RFC6979
30+
dsa = { version = "=0.7.0-pre", optional = true, default-features = false }
31+
ed25519-dalek = { version = "=2.2.0-pre", optional = true, default-features = false }
32+
p256 = { version = "=0.14.0-pre.0", optional = true, default-features = false, features = ["ecdsa"] }
33+
p384 = { version = "=0.14.0-pre", optional = true, default-features = false, features = ["ecdsa"] }
34+
p521 = { version = "=0.14.0-pre", optional = true, default-features = false, features = ["ecdsa", "getrandom"] } # TODO(tarcieri): RFC6979
3535
rand_core = { version = "0.6.4", optional = true, default-features = false }
36-
rsa = { version = "0.9", optional = true, default-features = false, features = ["sha2"] }
37-
sec1 = { version = "0.7.3", optional = true, default-features = false, features = ["point"] }
36+
rsa = { version = "=0.10.0-pre.1", optional = true, default-features = false, features = ["sha2"] }
37+
sec1 = { version = "=0.8.0-pre.1", optional = true, default-features = false, features = ["point"] }
3838
serde = { version = "1", optional = true }
39-
sha1 = { version = "0.10", optional = true, default-features = false }
39+
sha1 = { version = "=0.11.0-pre.3", optional = true, default-features = false }
4040

4141
[dev-dependencies]
4242
hex-literal = "0.4.1"

‎ssh-key/src/lib.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@
5454
//! if let Some(ed25519_public_key) = public_key.key_data().ed25519() {
5555
//! assert_eq!(
5656
//! ed25519_public_key.as_ref(),
57-
//! [
57+
//! &[
5858
//! 0xb3, 0x3e, 0xae, 0xf3, 0x7e, 0xa2, 0xdf, 0x7c, 0xaa, 0x1, 0xd, 0xef, 0xde, 0xa3,
5959
//! 0x4e, 0x24, 0x1f, 0x65, 0xf1, 0xb5, 0x29, 0xa4, 0xf4, 0x3e, 0xd1, 0x43, 0x27, 0xf5,
6060
//! 0xc5, 0x4a, 0xab, 0x62
61-
//! ].as_ref()
61+
//! ]
6262
//! );
6363
//! }
6464
//! # Ok(())
@@ -103,20 +103,20 @@
103103
//! if let Some(ed25519_keypair) = private_key.key_data().ed25519() {
104104
//! assert_eq!(
105105
//! ed25519_keypair.public.as_ref(),
106-
//! [
106+
//! &[
107107
//! 0xb3, 0x3e, 0xae, 0xf3, 0x7e, 0xa2, 0xdf, 0x7c, 0xaa, 0x1, 0xd, 0xef, 0xde, 0xa3,
108108
//! 0x4e, 0x24, 0x1f, 0x65, 0xf1, 0xb5, 0x29, 0xa4, 0xf4, 0x3e, 0xd1, 0x43, 0x27, 0xf5,
109109
//! 0xc5, 0x4a, 0xab, 0x62
110-
//! ].as_ref()
110+
//! ]
111111
//! );
112112
//!
113113
//! assert_eq!(
114114
//! ed25519_keypair.private.as_ref(),
115-
//! [
115+
//! &[
116116
//! 0xb6, 0x6, 0xc2, 0x22, 0xd1, 0xc, 0x16, 0xda, 0xe1, 0x6c, 0x70, 0xa4, 0xd4, 0x51,
117117
//! 0x73, 0x47, 0x2e, 0xc6, 0x17, 0xe0, 0x5c, 0x65, 0x69, 0x20, 0xd2, 0x6e, 0x56, 0xc0,
118118
//! 0x8f, 0xb5, 0x91, 0xed
119-
//! ].as_ref()
119+
//! ]
120120
//! )
121121
//! }
122122
//! # Ok(())

‎ssh-key/src/private/ed25519.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ impl Encode for Ed25519Keypair {
237237

238238
fn encode(&self, writer: &mut impl Writer) -> encoding::Result<()> {
239239
self.public.encode(writer)?;
240-
Zeroizing::new(self.to_bytes()).as_ref().encode(writer)?;
240+
Zeroizing::new(self.to_bytes()).as_slice().encode(writer)?;
241241
Ok(())
242242
}
243243
}

0 commit comments

Comments
 (0)