Skip to content

Commit ee7ce7d

Browse files
tarcieritarcieri
authored
Bump dependency requirements in Cargo.tomls (#2202)
Updates the following dependency requirements which gets us onto releases which are all `rand_core` v0.10 / `getrandom` v0.4 compatible: - `aes` v0.9.0-rc.4 - `aes-kw` v0.3.0-rc.2 - `ansi-x963-kdf` v0.1.0-rc.2 - `cbc` v0.2.0-rc.3 - `cipher` v0.5.0-rc.8 - `digest` v0.11.0-rc.11 - `elliptic-curve` v0.14.0-rc.28 - `p256` v0.14.0-rc.7 - `pbkdf2` v0.13.0-rc.9 - `rsa` v0.10.0-rc.15 - `sha1` v0.11.0-rc.5 - `sha2` v0.11.0-rc.5 - `sha3` v0.11.0-rc.7
1 parent 6a0b81d commit ee7ce7d

File tree

9 files changed

+113
-113
lines changed

9 files changed

+113
-113
lines changed

‎Cargo.lock‎

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

‎cms/Cargo.toml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ spki = "0.8.0-rc.4"
2121
x509-cert = { version = "0.3.0-rc.4", default-features = false }
2222

2323
# optional dependencies
24-
aes = { version = "0.9.0-rc.2", optional = true }
25-
aes-kw = { version = "0.3.0-rc.1", optional = true }
26-
ansi-x963-kdf = { version = "0.1.0-rc.1", optional = true }
27-
cbc = { version = "0.2.0-rc.2", optional = true }
28-
cipher = { version = "0.5.0-rc.6", features = ["alloc", "block-padding", "rand_core"], optional = true }
29-
digest = { version = "0.11.0-rc.9", optional = true }
30-
elliptic-curve = { version = "0.14.0-rc.24", optional = true }
31-
rsa = { version = "0.10.0-rc.14", optional = true }
32-
sha1 = { version = "0.11.0-rc.4", optional = true }
33-
sha2 = { version = "0.11.0-rc.4", optional = true }
34-
sha3 = { version = "0.11.0-rc.4", optional = true }
35-
signature = { version = "3.0.0-rc.9", features = ["digest", "alloc"], optional = true }
24+
aes = { version = "0.9.0-rc.4", optional = true }
25+
aes-kw = { version = "0.3.0-rc.2", optional = true }
26+
ansi-x963-kdf = { version = "0.1.0-rc.2", optional = true }
27+
cbc = { version = "0.2.0-rc.3", optional = true }
28+
cipher = { version = "0.5.0-rc.8", features = ["alloc", "block-padding", "rand_core"], optional = true }
29+
digest = { version = "0.11.0-rc.11", optional = true }
30+
elliptic-curve = { version = "0.14.0-rc.28", optional = true }
31+
rsa = { version = "0.10.0-rc.15", optional = true }
32+
sha1 = { version = "0.11.0-rc.5", optional = true }
33+
sha2 = { version = "0.11.0-rc.5", optional = true }
34+
sha3 = { version = "0.11.0-rc.7", optional = true }
35+
signature = { version = "3.0.0-rc.10", features = ["digest", "alloc"], optional = true }
3636
zeroize = { version = "1.8.1", optional = true }
3737

3838
[dev-dependencies]
@@ -41,11 +41,11 @@ getrandom = "0.4"
4141
hex-literal = "1"
4242
pem-rfc7468 = "1"
4343
pkcs5 = "0.8.0-rc.13"
44-
pbkdf2 = "0.13.0-rc.6"
44+
pbkdf2 = "0.13.0-rc.9"
4545
rand = "0.10.0-rc.8"
46-
rsa = { version = "0.10.0-rc.14", features = ["sha2"] }
47-
ecdsa = { version = "0.17.0-rc.14", features = ["digest", "pem"] }
48-
p256 = "0.14.0-rc.6"
46+
rsa = { version = "0.10.0-rc.15", features = ["sha2"] }
47+
ecdsa = { version = "0.17.0-rc.16", features = ["digest", "pem"] }
48+
p256 = "0.14.0-rc.7"
4949
tokio = { version = "1.45.1", features = ["macros", "rt"] }
5050
x509-cert = { version = "0.3.0-rc.4", features = ["pem"] }
5151

‎cms/src/builder.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use alloc::{
2626
vec::Vec,
2727
};
2828
use cipher::{
29-
BlockModeEncrypt, Iv, Key, KeyIvInit, block_padding::Pkcs7, crypto_common::Generate,
29+
BlockModeEncrypt, Iv, Key, KeyIvInit, block_padding::Pkcs7, common::Generate,
3030
rand_core::CryptoRng,
3131
};
3232
use const_oid::ObjectIdentifier;

‎cms/src/builder/kari.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ use elliptic_curve::{
4848
AffinePoint, Curve, CurveArithmetic, FieldBytesSize, Generate, PublicKey,
4949
ecdh::{EphemeralSecret, SharedSecret},
5050
point::PointCompression,
51-
sec1::{FromEncodedPoint, ModulusSize, ToEncodedPoint},
51+
sec1::{FromSec1Point, ModulusSize, ToSec1Point},
5252
};
5353

5454
/// The `EccCmsSharedInfo` type is defined in [RFC 5753 Section 7.2].
@@ -256,7 +256,7 @@ where
256256
R: CryptoRng,
257257
KA: KeyAgreementAlgorithm + AssociatedOid,
258258
C: CurveArithmetic + AssociatedOid + PointCompression,
259-
AffinePoint<C>: FromEncodedPoint<C> + ToEncodedPoint<C>,
259+
AffinePoint<C>: FromSec1Point<C> + ToSec1Point<C>,
260260
FieldBytesSize<C>: ModulusSize,
261261
KW: KeyWrapAlgorithm,
262262
Enc: KeySizeUser,
@@ -307,7 +307,7 @@ where
307307
// Generate ephemeral key using ecdh
308308
let ephemeral_secret = EphemeralSecret::generate_from_rng(rng);
309309
let ephemeral_public_key_encoded_point =
310-
ephemeral_secret.public_key().to_encoded_point(false);
310+
ephemeral_secret.public_key().to_sec1_point(false);
311311

312312
// Compute a shared secret with recipient public key. Non-uniformly random, but will be used as input for KDF later.
313313
let non_uniformly_random_shared_secret =

‎pkcs12/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ zeroize = { version = "1.8.1", optional = true, default-features = false }
3030
hex-literal = "1"
3131
pkcs8 = { version = "0.11.0-rc.10", features = ["pkcs5"] }
3232
pkcs5 = { version = "0.8.0-rc.13", features = ["pbes2", "3des"] }
33-
sha2 = "0.11.0-rc.4"
34-
whirlpool = "0.11.0-rc.4"
33+
sha2 = "0.11.0-rc.5"
34+
whirlpool = "0.11.0-rc.5"
3535

3636
[features]
3737
default = ["pem"]

‎pkcs5/Cargo.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ der = { version = "0.8.0-rc.10", features = ["oid"] }
2020
spki = "0.8.0-rc.4"
2121

2222
# optional dependencies
23-
cbc = { version = "0.2.0-rc.2", optional = true }
24-
aes = { version = "0.9.0-rc.2", optional = true, default-features = false }
25-
aes-gcm = { version = "0.11.0-rc.2", optional = true, default-features = false, features = ["aes"] }
26-
des = { version = "0.9.0-rc.2", optional = true, default-features = false }
27-
pbkdf2 = { version = "0.13.0-rc.8", optional = true, default-features = false, features = ["hmac"] }
23+
cbc = { version = "0.2.0-rc.3", optional = true }
24+
aes = { version = "0.9.0-rc.4", optional = true, default-features = false }
25+
aes-gcm = { version = "0.11.0-rc.3", optional = true, default-features = false, features = ["aes"] }
26+
des = { version = "0.9.0-rc.3", optional = true, default-features = false }
27+
pbkdf2 = { version = "0.13.0-rc.9", optional = true, default-features = false, features = ["hmac"] }
2828
rand_core = { version = "0.10", optional = true, default-features = false }
29-
scrypt = { version = "0.12.0-rc.9", optional = true, default-features = false }
30-
sha1 = { version = "0.11.0-rc.4", optional = true, default-features = false }
31-
sha2 = { version = "0.11.0-rc.4", optional = true, default-features = false }
29+
scrypt = { version = "0.12.0-rc.10", optional = true, default-features = false }
30+
sha1 = { version = "0.11.0-rc.5", optional = true, default-features = false }
31+
sha2 = { version = "0.11.0-rc.5", optional = true, default-features = false }
3232

3333
[dev-dependencies]
3434
hex-literal = "1"

‎spki/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ der = { version = "0.8.0-rc.10", features = ["oid"] }
2121
# Optional dependencies
2222
arbitrary = { version = "1.4", features = ["derive"], optional = true }
2323
base64ct = { version = "1", optional = true, default-features = false }
24-
digest = { version = "0.11.0-rc.4", optional = true, default-features = false }
24+
digest = { version = "0.11.0-rc.5", optional = true, default-features = false }
2525
sha2 = { version = "0.11.0-rc.2", optional = true, default-features = false }
2626

2727
[dev-dependencies]

‎x509-cert/Cargo.toml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ spki = { version = "0.8.0-rc.4", features = ["alloc"] }
2222

2323
# optional dependencies
2424
arbitrary = { version = "1.4", features = ["derive"], optional = true }
25-
digest = { version = "0.11.0-rc.9", optional = true, default-features = false }
26-
sha1 = { version = "0.11.0-rc.4", default-features = false, optional = true }
27-
signature = { version = "3.0.0-rc.9", features = ["rand_core"], optional = true }
25+
digest = { version = "0.11.0-rc.11", optional = true, default-features = false }
26+
sha1 = { version = "0.11.0-rc.5", default-features = false, optional = true }
27+
signature = { version = "3.0.0-rc.10", features = ["rand_core"], optional = true }
2828
tls_codec = { version = "0.4", default-features = false, features = ["derive"], optional = true }
2929

3030
[dev-dependencies]
3131
hex-literal = "1"
3232
rand = "0.10.0-rc.8"
33-
rsa = { version = "0.10.0-rc.14", features = ["sha2"] }
34-
ecdsa = { version = "0.17.0-rc.14", features = ["digest", "pem"] }
35-
p256 = "0.14.0-rc.6"
33+
rsa = { version = "0.10.0-rc.15", features = ["sha2"] }
34+
ecdsa = { version = "0.17.0-rc.16", features = ["digest", "pem"] }
35+
p256 = "0.14.0-rc.7"
3636
rstest = "0.26"
37-
sha2 = { version = "0.11.0-rc.4", features = ["oid"] }
37+
sha2 = { version = "0.11.0-rc.5", features = ["oid"] }
3838
tempfile = "3.5"
3939
tokio = { version = "1.45", features = ["macros", "rt"] }
4040
x509-cert-test-support = { path = "./test-support" }

‎x509-ocsp/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ spki = { version = "0.8.0-rc.4", features = ["alloc"] }
2222
x509-cert = { version = "0.3.0-rc.4", default-features = false }
2323

2424
# Optional
25-
digest = { version = "0.11.0-rc.9", optional = true, default-features = false, features = ["oid"] }
25+
digest = { version = "0.11.0-rc.11", optional = true, default-features = false, features = ["oid"] }
2626
rand_core = { version = "0.10", optional = true, default-features = false }
27-
signature = { version = "3.0.0-rc.9", optional = true, default-features = false, features = ["digest", "rand_core"] }
27+
signature = { version = "3.0.0-rc.10", optional = true, default-features = false, features = ["digest", "rand_core"] }
2828

2929
[dev-dependencies]
3030
hex-literal = "1"
3131
lazy_static = "1.5.0"
3232
rand = "0.10.0-rc.8"
33-
rsa = { version = "0.10.0-rc.14", default-features = false, features = ["encoding", "sha2"] }
34-
sha1 = { version = "0.11.0-rc.4", default-features = false, features = ["oid"] }
35-
sha2 = { version = "0.11.0-rc.4", default-features = false, features = ["oid"] }
33+
rsa = { version = "0.10.0-rc.15", default-features = false, features = ["encoding", "sha2"] }
34+
sha1 = { version = "0.11.0-rc.5", default-features = false, features = ["oid"] }
35+
sha2 = { version = "0.11.0-rc.5", default-features = false, features = ["oid"] }
3636

3737
[features]
3838
rand = ["rand_core"]

0 commit comments

Comments
 (0)