Skip to content

Commit 8393edb

Browse files
tarcieritarcieri
authored
Bump dependency requirements in Cargo.toml(s) (#245)
NOTE: bumps `rand_core` to v0.10; `getrandom` to v0.4 (final) Also updates the following requirements: - `aes` v0.9.0-rc.4 - `chacha20` v0.10.0-rc.10 - `elliptic-curve` v0.14.0-rc.28 - `hkdf` v0.13.0-rc.5 - `k256` v0.14.0-rc.7 - `kem` v0.3.0-rc.4 - `p256` v0.14.0-rc.7 - `p384` v0.14.0-rc.7 - `p521` v0.14.0-rc.7 - `sha2` v0.11.0-rc.5 - `sha3` v0.11.0-rc.7
1 parent 9404362 commit 8393edb

File tree

8 files changed

+115
-110
lines changed

8 files changed

+115
-110
lines changed

‎Cargo.lock‎

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

‎dhkem/Cargo.toml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@ keywords = ["crypto", "ecdh", "ecc"]
1414
readme = "README.md"
1515

1616
[dependencies]
17-
hkdf = "0.13.0-rc.4"
18-
kem = "0.3.0-rc.3"
19-
rand_core = "0.10.0-rc-6"
17+
hkdf = "0.13.0-rc.5"
18+
kem = "0.3.0-rc.4"
19+
rand_core = "0.10"
2020

2121
# optional dependencies
22-
elliptic-curve = { version = "0.14.0-rc.25", optional = true, default-features = false }
23-
k256 = { version = "0.14.0-rc.6", optional = true, default-features = false, features = ["arithmetic"] }
24-
p256 = { version = "0.14.0-rc.6", optional = true, default-features = false, features = ["arithmetic"] }
25-
p384 = { version = "0.14.0-rc.6", optional = true, default-features = false, features = ["arithmetic"] }
26-
p521 = { version = "0.14.0-rc.6", optional = true, default-features = false, features = ["arithmetic"] }
22+
elliptic-curve = { version = "0.14.0-rc.28", optional = true, default-features = false }
23+
k256 = { version = "0.14.0-rc.7", optional = true, default-features = false, features = ["arithmetic"] }
24+
p256 = { version = "0.14.0-rc.7", optional = true, default-features = false, features = ["arithmetic"] }
25+
p384 = { version = "0.14.0-rc.7", optional = true, default-features = false, features = ["arithmetic"] }
26+
p521 = { version = "0.14.0-rc.7", optional = true, default-features = false, features = ["arithmetic"] }
2727
x25519 = { version = "=3.0.0-pre.5", package = "x25519-dalek", optional = true, default-features = false }
2828
zeroize = { version = "1.8.1", optional = true, default-features = false }
2929

3030
[dev-dependencies]
31-
getrandom = { version = "0.4.0-rc.1", features = ["sys_rng"] }
31+
getrandom = { version = "0.4", features = ["sys_rng"] }
3232
hex-literal = "1"
33-
hkdf = "0.13.0-rc.4"
34-
sha2 = "0.11.0-rc.4"
33+
hkdf = "0.13.0-rc.5"
34+
sha2 = "0.11.0-rc.5"
3535

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

‎dhkem/src/ecdh_kem.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ use core::marker::PhantomData;
55
use elliptic_curve::{
66
AffinePoint, CurveArithmetic, Error, FieldBytes, FieldBytesSize, PublicKey, SecretKey,
77
ecdh::EphemeralSecret,
8-
sec1::{
9-
FromEncodedPoint, ModulusSize, ToEncodedPoint, UncompressedPoint, UncompressedPointSize,
10-
},
8+
sec1::{FromSec1Point, ModulusSize, ToSec1Point, UncompressedPoint, UncompressedPointSize},
119
};
1210
use kem::{
1311
Ciphertext, Encapsulate, Generate, InvalidKey, Kem, KeyExport, KeySizeUser, SharedKey,
@@ -109,7 +107,7 @@ impl<C> TryDecapsulate<EcdhKem<C>> for EcdhDecapsulationKey<C>
109107
where
110108
C: CurveArithmetic,
111109
FieldBytesSize<C>: ModulusSize,
112-
AffinePoint<C>: FromEncodedPoint<C> + ToEncodedPoint<C>,
110+
AffinePoint<C>: FromSec1Point<C> + ToSec1Point<C>,
113111
{
114112
type Error = Error;
115113

@@ -154,7 +152,7 @@ impl<C> TryKeyInit for EcdhEncapsulationKey<C>
154152
where
155153
C: CurveArithmetic,
156154
FieldBytesSize<C>: ModulusSize,
157-
AffinePoint<C>: FromEncodedPoint<C> + ToEncodedPoint<C>,
155+
AffinePoint<C>: FromSec1Point<C> + ToSec1Point<C>,
158156
{
159157
fn new(encapsulation_key: &UncompressedPoint<C>) -> Result<Self, InvalidKey> {
160158
PublicKey::<C>::from_sec1_bytes(encapsulation_key)
@@ -175,7 +173,7 @@ impl<C> KeyExport for EcdhEncapsulationKey<C>
175173
where
176174
C: CurveArithmetic,
177175
FieldBytesSize<C>: ModulusSize,
178-
AffinePoint<C>: FromEncodedPoint<C> + ToEncodedPoint<C>,
176+
AffinePoint<C>: FromSec1Point<C> + ToSec1Point<C>,
179177
{
180178
fn to_bytes(&self) -> UncompressedPoint<C> {
181179
self.0.to_uncompressed_point()
@@ -195,7 +193,7 @@ impl<C> Encapsulate<EcdhKem<C>> for EcdhEncapsulationKey<C>
195193
where
196194
C: CurveArithmetic,
197195
FieldBytesSize<C>: ModulusSize,
198-
AffinePoint<C>: FromEncodedPoint<C> + ToEncodedPoint<C>,
196+
AffinePoint<C>: FromSec1Point<C> + ToSec1Point<C>,
199197
{
200198
fn encapsulate_with_rng<R>(
201199
&self,

‎dhkem/src/lib.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub use x25519_kem::{X25519DecapsulationKey, X25519EncapsulationKey, X25519Kem};
4747
#[cfg(feature = "ecdh")]
4848
use elliptic_curve::{
4949
CurveArithmetic, PublicKey, bigint,
50-
sec1::{self, FromEncodedPoint, ToEncodedPoint},
50+
sec1::{self, FromSec1Point, ToSec1Point},
5151
};
5252

5353
#[cfg(feature = "zeroize")]
@@ -103,26 +103,26 @@ impl<EK> From<EK> for EncapsulationKey<EK> {
103103
}
104104

105105
#[cfg(feature = "ecdh")]
106-
impl<C> FromEncodedPoint<C> for EcdhEncapsulationKey<C>
106+
impl<C> FromSec1Point<C> for EcdhEncapsulationKey<C>
107107
where
108108
C: CurveArithmetic,
109109
C::FieldBytesSize: sec1::ModulusSize,
110-
PublicKey<C>: FromEncodedPoint<C>,
110+
PublicKey<C>: FromSec1Point<C>,
111111
{
112-
fn from_encoded_point(point: &sec1::EncodedPoint<C>) -> bigint::CtOption<Self> {
113-
PublicKey::<C>::from_encoded_point(point).map(Into::into)
112+
fn from_sec1_point(point: &sec1::Sec1Point<C>) -> bigint::CtOption<Self> {
113+
PublicKey::<C>::from_sec1_point(point).map(Into::into)
114114
}
115115
}
116116

117117
#[cfg(feature = "ecdh")]
118-
impl<C> ToEncodedPoint<C> for EcdhEncapsulationKey<C>
118+
impl<C> ToSec1Point<C> for EcdhEncapsulationKey<C>
119119
where
120120
C: CurveArithmetic,
121121
C::FieldBytesSize: sec1::ModulusSize,
122-
PublicKey<C>: ToEncodedPoint<C>,
122+
PublicKey<C>: ToSec1Point<C>,
123123
{
124-
fn to_encoded_point(&self, compress: bool) -> sec1::EncodedPoint<C> {
125-
self.0.to_encoded_point(compress)
124+
fn to_sec1_point(&self, compress: bool) -> sec1::Sec1Point<C> {
125+
self.0.to_sec1_point(compress)
126126
}
127127
}
128128

‎frodo-kem/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,35 +57,35 @@ serde = ["std", "dep:hex", "dep:serde"]
5757
std = []
5858

5959
[dependencies]
60-
aes = { version = "0.9.0-rc.2", optional = true }
60+
aes = { version = "0.9.0-rc.4", optional = true }
6161
hex = { version = "0.4", optional = true }
6262
openssl-sys = { version = "0.9.104", optional = true }
63-
rand_core = { version = "0.10.0-rc-6", features = [] }
63+
rand_core = { version = "0.10", features = [] }
6464
serde = { version = "1.0", features = ["derive"], optional = true }
6565
serdect = "0.4"
6666
subtle = "2.6"
6767
thiserror = "2.0"
6868

6969
[target.'cfg(target_arch = "aarch64")'.dependencies]
70-
sha3 = { version = "0.11.0-rc.3", features = ["asm"] }
70+
sha3 = { version = "0.11.0-rc.7", features = ["asm"] }
7171
zeroize = { version = "1", features = ["aarch64"] }
7272

7373
[target.'cfg(any(target_arch = "x86_64", target_arch = "x86"))'.dependencies]
7474
zeroize = { version = "1", features = ["simd"] }
7575

7676
[target.'cfg(not(target_arch = "aarch64"))'.dependencies]
77-
sha3 = { version = "0.11.0-rc.0" }
77+
sha3 = { version = "0.11.0-rc.7" }
7878

7979
[target.'cfg(not(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64")))'.dependencies]
8080
zeroize = "1"
8181

8282
[dev-dependencies]
83-
aes = "0.9.0-rc.2"
83+
aes = "0.9.0-rc.4"
8484
criterion = "0.7"
8585
getrandom = { version = "0.4.0-rc.1", features = ["sys_rng"] }
8686
hex = "0.4"
8787
hybrid-array = "0.4"
88-
chacha20 = { version = "0.10.0-rc.9", features = ["rng"] }
88+
chacha20 = { version = "0.10.0-rc.10", features = ["rng"] }
8989
rstest = "0.26"
9090
postcard = { version = "1.0", features = ["use-std"] }
9191
serde_bare = "0.5"

‎ml-kem/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ zeroize = ["module-lattice/zeroize", "dep:zeroize"]
2727
[dependencies]
2828
array = { version = "0.4.7", package = "hybrid-array", features = ["extra-sizes", "subtle"] }
2929
module-lattice = { version = "0.1.0-rc.0", features = ["subtle"] }
30-
kem = "0.3.0-rc.3"
31-
rand_core = "0.10.0-rc-6"
32-
sha3 = { version = "0.11.0-rc.6", default-features = false }
30+
kem = "0.3.0-rc.4"
31+
rand_core = "0.10"
32+
sha3 = { version = "0.11.0-rc.7", default-features = false }
3333
subtle = { version = "2", default-features = false }
3434

3535
# optional dependencies
@@ -39,7 +39,7 @@ zeroize = { version = "1.8.1", optional = true, default-features = false }
3939

4040
[dev-dependencies]
4141
criterion = "0.7"
42-
getrandom = { version = "0.4.0-rc.1", features = ["sys_rng"] }
42+
getrandom = { version = "0.4", features = ["sys_rng"] }
4343
hex = { version = "0.4.3", features = ["serde"] }
4444
hex-literal = "1"
4545
num-rational = { version = "0.4.2", default-features = false, features = ["num-bigint"] }

‎module-lattice/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ subtle = { version = "2", optional = true, default-features = false }
2424
zeroize = { version = "1.8.1", optional = true, default-features = false }
2525

2626
[dev-dependencies]
27-
getrandom = { version = "0.4.0-rc.1", features = ["sys_rng"] }
27+
getrandom = { version = "0.4", features = ["sys_rng"] }
2828

2929
[features]
3030
subtle = ["dep:subtle", "array/subtle"]

‎x-wing/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ zeroize = ["dep:zeroize", "ml-kem/zeroize", "x25519-dalek/zeroize"]
1919
hazmat = []
2020

2121
[dependencies]
22-
kem = "0.3.0-rc.3"
22+
kem = "0.3.0-rc.4"
2323
ml-kem = { version = "=0.3.0-pre.6", default-features = false, features = ["hazmat"] }
24-
rand_core = { version = "0.10.0-rc-6", default-features = false }
25-
sha3 = { version = "0.11.0-rc.6", default-features = false }
24+
rand_core = { version = "0.10", default-features = false }
25+
sha3 = { version = "0.11.0-rc.7", default-features = false }
2626
x25519-dalek = { version = "=3.0.0-pre.5", default-features = false, features = ["static_secrets"] }
2727

2828
# optional dependencies
2929
zeroize = { version = "1.8.1", optional = true, default-features = true }
3030

3131
[dev-dependencies]
32-
getrandom = { version = "0.4.0-rc.1", features = ["sys_rng"] }
32+
getrandom = { version = "0.4", features = ["sys_rng"] }
3333
hex = { version = "0.4", features = ["serde"] }
34-
rand_core = "0.10.0-rc-6"
34+
rand_core = "0.10"
3535
serde = { version = "1", features = ["derive"] }
3636
serde_json = "1"
3737

0 commit comments

Comments
 (0)