Skip to content

Commit bc56544

Browse files
tarcieritarcieri
authored
Bump dependency requirements in Cargo.toml (#466)
Bumps `rand_core` to v0.10 Includes fixes for breaking changes: - `cipher::crypto_common` => `cipher::common` - `elliptic-curve`: `*EncodedPoint` => `*Sec1Point` Bumps the following additional dependency requirements: - `argon2` v0.6.0-rc.7 - `bcrypt-pbkdf` v0.11.0-rc.6 - `chacha20` v0.10.0-rc.10 - `crypto-bigint` v0.7.0-rc.25 - `digest` v0.11.0-rc.5 - `dsa` v0.7.0-rc.12 - `hmac` v0.13.0-rc.5 - `p256` v0.14.0-rc.7 - `p384` v0.14.0-rc7 - `p521` v0.14.0-rc.7 - `rsa` v0.10.0-rc.15 - `sha1` v0.11.0-rc.5 - `sha2` v0.11.0-rc.5 - `signature` v3.0.0-rc.10
1 parent 29d8374 commit bc56544

File tree

8 files changed

+115
-108
lines changed

8 files changed

+115
-108
lines changed

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ 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+
curve25519-dalek = { git = "https://github.com/dalek-cryptography/curve25519-dalek" }

‎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.6"
2323
encoding = { package = "ssh-encoding", version = "0.3.0-rc.6" }
2424

2525
# optional dependencies
26-
aead = { version = "0.6.0-rc.8", 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.9", 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 }
26+
aead = { version = "0.6.0-rc.10", optional = true, default-features = false }
27+
aes = { version = "0.9.0-rc.4", optional = true, default-features = false }
28+
aes-gcm = { version = "0.11.0-rc.3", optional = true, default-features = false, features = ["aes"] }
29+
cbc = { version = "0.2.0-rc.3", optional = true }
30+
ctr = { version = "0.10.0-rc.3", optional = true, default-features = false }
31+
chacha20 = { version = "0.10.0-rc.10", optional = true, default-features = false, features = ["cipher", "legacy"] }
32+
des = { version = "0.9.0-rc.3", optional = true, default-features = false }
33+
poly1305 = { version = "0.9.0-rc.5", 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.8", optional = true }
20-
bigint = { package = "crypto-bigint", version = "0.7.0-rc.22", optional = true, default-features = false, features = ["alloc"] }
20+
bigint = { package = "crypto-bigint", version = "0.7.0-rc.25", optional = true, default-features = false, features = ["alloc"] }
2121
bytes = { version = "1", optional = true, default-features = false }
22-
digest = { version = "0.11.0-rc.9", optional = true, default-features = false }
22+
digest = { version = "0.11.0-rc.11", optional = true, default-features = false }
2323
pem-rfc7468 = { version = "1", 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 & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,30 @@ package = "ssh-encoding"
3030
features = ["base64", "digest", "pem", "subtle", "zeroize"]
3131

3232
[dependencies]
33-
sha2 = { version = "0.11.0-rc.4", default-features = false }
34-
signature = { version = "3.0.0-rc.9", default-features = false }
33+
sha2 = { version = "0.11.0-rc.5", default-features = false }
34+
signature = { version = "3.0.0-rc.10", default-features = false }
3535
subtle = { version = "2", default-features = false }
3636
zeroize = { version = "1", default-features = false }
3737

3838
# optional dependencies
39-
argon2 = { version = "0.6.0-rc.6", optional = true, default-features = false, features = ["alloc"] }
40-
bcrypt-pbkdf = { version = "0.11.0-rc.3", optional = true, default-features = false, features = ["alloc"] }
41-
dsa = { version = "0.7.0-rc.11", optional = true, default-features = false, features = ["hazmat"] }
39+
argon2 = { version = "0.6.0-rc.7", optional = true, default-features = false, features = ["alloc"] }
40+
bcrypt-pbkdf = { version = "0.11.0-rc.6", optional = true, default-features = false, features = ["alloc"] }
41+
dsa = { version = "0.7.0-rc.12", optional = true, default-features = false, features = ["hazmat"] }
4242
ed25519-dalek = { version = "=3.0.0-pre.5", optional = true, default-features = false }
4343
hex = { version = "0.4", optional = true, default-features = false, features = ["alloc"] }
44-
hmac = { version = "0.13.0-rc.4", optional = true }
45-
p256 = { version = "0.14.0-rc.6", optional = true, default-features = false, features = ["ecdsa"] }
46-
p384 = { version = "0.14.0-rc.6", optional = true, default-features = false, features = ["ecdsa"] }
47-
p521 = { version = "0.14.0-rc.6", optional = true, default-features = false, features = ["ecdsa"] }
48-
rand_core = { version = "0.10.0-rc-6", optional = true, default-features = false }
49-
rsa = { version = "0.10.0-rc.14", optional = true, default-features = false, features = ["sha2"] }
44+
hmac = { version = "0.13.0-rc.5", optional = true }
45+
p256 = { version = "0.14.0-rc.7", optional = true, default-features = false, features = ["ecdsa"] }
46+
p384 = { version = "0.14.0-rc.7", optional = true, default-features = false, features = ["ecdsa"] }
47+
p521 = { version = "0.14.0-rc.7", optional = true, default-features = false, features = ["ecdsa"] }
48+
rand_core = { version = "0.10", optional = true, default-features = false }
49+
rsa = { version = "0.10.0-rc.15", optional = true, default-features = false, features = ["sha2"] }
5050
sec1 = { version = "0.8.0-rc.13", optional = true, default-features = false, features = ["point"] }
5151
serde = { version = "1.0.16", optional = true }
52-
sha1 = { version = "0.11.0-rc.4", optional = true, default-features = false, features = ["oid"] }
52+
sha1 = { version = "0.11.0-rc.5", optional = true, default-features = false, features = ["oid"] }
5353

5454
[dev-dependencies]
5555
hex-literal = "1"
56-
chacha20 = { version = "0.10.0-rc.9", features = ["rng"] }
56+
chacha20 = { version = "0.10.0-rc.10", features = ["rng"] }
5757

5858
[features]
5959
default = ["ecdsa", "rand_core", "std"]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use rand_core::CryptoRng;
1414
feature = "rand_core",
1515
any(feature = "p256", feature = "p384", feature = "p521")
1616
))]
17-
use cipher::cipher::crypto_common::Generate;
17+
use cipher::cipher::common::Generate;
1818

1919
/// Elliptic Curve Digital Signature Algorithm (ECDSA) private key.
2020
#[derive(Clone)]

‎ssh-key/src/public/ecdsa.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,7 @@ macro_rules! impl_ecdsa_for_curve {
173173
fn try_from(public_key: &EcdsaPublicKey) -> Result<$krate::ecdsa::VerifyingKey> {
174174
match public_key {
175175
EcdsaPublicKey::$curve(key) => {
176-
$krate::ecdsa::VerifyingKey::from_encoded_point(key)
177-
.map_err(|_| Error::Crypto)
176+
$krate::ecdsa::VerifyingKey::from_sec1_point(key).map_err(|_| Error::Crypto)
178177
}
179178
_ => Err(Error::AlgorithmUnknown),
180179
}
@@ -191,7 +190,7 @@ macro_rules! impl_ecdsa_for_curve {
191190
#[cfg(feature = $feature)]
192191
impl From<&$krate::ecdsa::VerifyingKey> for EcdsaPublicKey {
193192
fn from(key: &$krate::ecdsa::VerifyingKey) -> EcdsaPublicKey {
194-
EcdsaPublicKey::$curve(key.to_encoded_point(false))
193+
EcdsaPublicKey::$curve(key.to_sec1_point(false))
195194
}
196195
}
197196
};

‎ssh-key/src/signature.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ impl Verifier<Signature> for public::SkEcdsaSha2NistP256 {
459459
fn verify(&self, message: &[u8], signature: &Signature) -> signature::Result<()> {
460460
let (signature_bytes, flags_and_counter) = split_sk_signature(signature)?;
461461
let signature = p256_signature_from_openssh_bytes(signature_bytes)?;
462-
p256::ecdsa::VerifyingKey::from_encoded_point(self.ec_point())?.verify(
462+
p256::ecdsa::VerifyingKey::from_sec1_point(self.ec_point())?.verify(
463463
&make_sk_signed_data(self.application(), flags_and_counter, message),
464464
&signature,
465465
)

0 commit comments

Comments
 (0)