Skip to content

Commit 2847b9a

Browse files
build(deps): bump hybrid-array from 0.2.0-rc.8 to 0.2.0-rc.9 (#33)
* build(deps): bump hybrid-array from 0.2.0-rc.8 to 0.2.0-rc.9 Bumps [hybrid-array](https://github.com/RustCrypto/hybrid-array) from 0.2.0-rc.8 to 0.2.0-rc.9. - [Changelog](https://github.com/RustCrypto/hybrid-array/blob/master/CHANGELOG.md) - [Commits](RustCrypto/hybrid-array@v0.2.0-rc.8...v0.2.0-rc.9) --- updated-dependencies: - dependency-name: hybrid-array dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * ml-kem: use `try_from` instead of deprecated `from_slice` (#34) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: supinie <[email protected]>
1 parent 4fed1c1 commit 2847b9a

File tree

4 files changed

+27
-24
lines changed

4 files changed

+27
-24
lines changed

Cargo.lock

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

ml-kem/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ deterministic = [] # Expose deterministic generation and encapsulation functions
2121

2222
[dependencies]
2323
kem = "0.3.0-pre.0"
24-
hybrid-array = { version = "0.2.0-rc.8", features = ["extra-sizes"] }
24+
hybrid-array = { version = "0.2.0-rc.9", features = ["extra-sizes"] }
2525
rand_core = "0.6.4"
2626
sha3 = { version = "0.10.8", default-features = false }
2727

ml-kem/src/crypto.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,10 @@ mod test {
169169

170170
#[test]
171171
fn prf() {
172-
let s = B32::from_slice("Input s to an invocation of PRF2".as_bytes());
172+
let s = B32::try_from("Input s to an invocation of PRF2".as_bytes())
173+
.expect("Failed to create B32 from slice");
173174
let b = b'b';
174-
let actual = PRF::<U2>(s, b);
175+
let actual = PRF::<U2>(&s, b);
175176
let expected = hex!(
176177
"54c002415c2219b564d5c17b0df0c82f83ddf3fdecc7d814ed5d85457c06c2c3\
177178
ed0b0584f926dffb1e57c6105f8604e81c4605b93f8284e44585104101042075\
@@ -180,9 +181,10 @@ mod test {
180181
);
181182
assert_eq!(actual, expected);
182183

183-
let s = B32::from_slice("Input s to an invocation of PRF3".as_bytes());
184+
let s = B32::try_from("Input s to an invocation of PRF3".as_bytes())
185+
.expect("Failed to create B32 from slice");
184186
let b = b'b';
185-
let actual = PRF::<U3>(s, b);
187+
let actual = PRF::<U3>(&s, b);
186188
let expected = hex!(
187189
"5e12028f67479b862a12713cda833e21b8ccd51bff9ddc2bfb9ab2910a9dc2e6\
188190
c58264a3f51ccc9ef4ff936a15505e016f60c36ffe300be01b9fb12eacd57867\
@@ -196,11 +198,12 @@ mod test {
196198

197199
#[test]
198200
fn xof() {
199-
let rho = B32::from_slice("Input rho, to an XOF invocation!".as_bytes());
201+
let rho = B32::try_from("Input rho, to an XOF invocation!".as_bytes())
202+
.expect("Failed to create B32 from slice");
200203
let i = b'i';
201204
let j = b'j';
202205

203-
let mut reader = XOF(rho, i, j);
206+
let mut reader = XOF(&rho, i, j);
204207
let mut actual = [0u8; 32];
205208
reader.read(&mut actual);
206209

ml-kem/tests/vectors.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ pub struct GenerateVector {
1313

1414
impl GenerateVector {
1515
pub fn verify<K: KemCore>(&self) {
16-
let d = Array::from_slice(&self.d);
17-
let z = Array::from_slice(&self.z);
18-
let (dk, ek) = K::generate_deterministic(d, z);
16+
let d = Array::try_from(self.d).unwrap();
17+
let z = Array::try_from(self.z).unwrap();
18+
let (dk, ek) = K::generate_deterministic(&d, &z);
1919
assert_eq!(dk.as_bytes().as_slice(), self.dk);
2020
assert_eq!(ek.as_bytes().as_slice(), self.ek);
2121

22-
let dk_bytes = Encoded::<K::DecapsulationKey>::from_slice(self.dk);
23-
assert_eq!(dk, K::DecapsulationKey::from_bytes(dk_bytes));
22+
let dk_bytes = Encoded::<K::DecapsulationKey>::try_from(self.dk).unwrap();
23+
assert_eq!(dk, K::DecapsulationKey::from_bytes(&dk_bytes));
2424

25-
let ek_bytes = Encoded::<K::EncapsulationKey>::from_slice(self.ek);
26-
assert_eq!(ek, K::EncapsulationKey::from_bytes(ek_bytes));
25+
let ek_bytes = Encoded::<K::EncapsulationKey>::try_from(self.ek).unwrap();
26+
assert_eq!(ek, K::EncapsulationKey::from_bytes(&ek_bytes));
2727
}
2828
}
2929

@@ -36,10 +36,10 @@ pub struct EncapsulateVector {
3636

3737
impl EncapsulateVector {
3838
pub fn verify<K: KemCore>(&self) {
39-
let m = Array::from_slice(&self.m);
40-
let ek_bytes = Encoded::<K::EncapsulationKey>::from_slice(self.ek);
41-
let ek = K::EncapsulationKey::from_bytes(ek_bytes);
42-
let (c, k) = ek.encapsulate_deterministic(m).unwrap();
39+
let m = Array::try_from(self.m).unwrap();
40+
let ek_bytes = Encoded::<K::EncapsulationKey>::try_from(self.ek).unwrap();
41+
let ek = K::EncapsulationKey::from_bytes(&ek_bytes);
42+
let (c, k) = ek.encapsulate_deterministic(&m).unwrap();
4343
assert_eq!(k.as_slice(), &self.k);
4444
assert_eq!(c.as_slice(), self.c);
4545
}
@@ -53,11 +53,11 @@ pub struct DecapsulateVector {
5353

5454
impl DecapsulateVector {
5555
pub fn verify<K: KemCore>(&self) {
56-
let dk_bytes = Encoded::<K::DecapsulationKey>::from_slice(self.dk);
57-
let dk = K::DecapsulationKey::from_bytes(dk_bytes);
56+
let dk_bytes = Encoded::<K::DecapsulationKey>::try_from(self.dk).unwrap();
57+
let dk = K::DecapsulationKey::from_bytes(&dk_bytes);
5858

59-
let c_bytes = Ciphertext::<K>::from_slice(self.c);
60-
let k = dk.decapsulate(c_bytes).unwrap();
59+
let c_bytes = Ciphertext::<K>::try_from(self.c).unwrap();
60+
let k = dk.decapsulate(&c_bytes).unwrap();
6161
assert_eq!(k.as_slice(), &self.k);
6262
}
6363
}

0 commit comments

Comments
 (0)