From aa307ce555fdd37f56b5759367d2bf9ab8794312 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Tue, 2 Sep 2025 15:24:13 -0700 Subject: [PATCH] Bump `hybrid-array` to 0.4.0 --- Cargo.lock | 86 ++++++++++++++++++++++---------------------- Cargo.toml | 7 ++++ dhkem/Cargo.toml | 4 +-- frodo-kem/Cargo.toml | 2 +- ml-kem/Cargo.toml | 2 +- 5 files changed, 54 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2ffe895..ea3e512 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,6 +55,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +[[package]] +name = "base16ct" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b59d472eab27ade8d770dcb11da7201c11234bef9f82ce7aa517be028d462b" + [[package]] name = "bincode" version = "1.3.3" @@ -95,9 +101,9 @@ checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" [[package]] name = "block-buffer" -version = "0.11.0-rc.4" +version = "0.11.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a229bfd78e4827c91b9b95784f69492c1b77c1ab75a45a8a037b139215086f94" +checksum = "e9ef36a6fcdb072aa548f3da057640ec10859eb4e91ddf526ee648d50c76a949" dependencies = [ "hybrid-array", ] @@ -331,9 +337,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.7.0-pre.4" +version = "0.7.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edaae5fb9dac79a07260e0b2006799ff4f1d342ab243fd7d0892215113b27904" +checksum = "7c069823f41bdc75e99546bfd59eb1ed27d69dc720e5c949fe502b82926f8448" dependencies = [ "hybrid-array", "num-traits", @@ -344,9 +350,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.2.0-rc.3" +version = "0.2.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a23fa214dea9efd4dacee5a5614646b30216ae0f05d4bb51bafb50e9da1c5be" +checksum = "6a8235645834fbc6832939736ce2f2d08192652269e11010a6240f61b908a1c6" dependencies = [ "hybrid-array", "rand_core", @@ -396,9 +402,9 @@ dependencies = [ [[package]] name = "der" -version = "0.8.0-rc.1" +version = "0.8.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82db698b33305f0134faf590b9d1259dc171b5481ac41d5c8146c3b3ee7d4319" +checksum = "7050e8041c28720851f7db83183195b6acf375bb7bb28e3b86f0fe6cbd69459d" dependencies = [ "const-oid", "zeroize", @@ -425,9 +431,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.11.0-rc.0" +version = "0.11.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "460dd7f37e4950526b54a5a6b1f41b6c8e763c58eb9a8fc8fc05ba5c2f44ca7b" +checksum = "3a4aae35a0fcbe22ff1be50fe96df72002d5a4a6fb4aae9193cf2da0daa36da2" dependencies = [ "block-buffer", "const-oid", @@ -443,11 +449,10 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" -version = "0.14.0-rc.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "541598dba361b5ba0321caad955ba99ae82a604f4047c4f2743724996abf62f4" +version = "0.14.0-rc.12" +source = "git+https://github.com/RustCrypto/traits.git#501b8854593a440a08fcb299a1ae421b16c76169" dependencies = [ - "base16ct", + "base16ct 0.3.0", "crypto-bigint", "digest", "ff", @@ -699,9 +704,9 @@ dependencies = [ [[package]] name = "hybrid-array" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dab50e193aebe510fe0e40230145820e02f48dae0cf339ea4204e6e708ff7bd" +checksum = "6fe39a812f039072707ce38020acbab2f769087952eddd9e2b890f37654b2349" dependencies = [ "typenum", "zeroize", @@ -719,9 +724,9 @@ dependencies = [ [[package]] name = "inout" -version = "0.2.0-rc.4" +version = "0.2.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac5e145e8ade9f74c0a5efc60ccb4e714b0144f7e2220b7ca64254feee71c57f" +checksum = "1603f76010ff924b616c8f44815a42eb10fb0b93d308b41deaa8da6d4251fd4b" dependencies = [ "hybrid-array", ] @@ -764,9 +769,8 @@ dependencies = [ [[package]] name = "k256" -version = "0.14.0-pre.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965f260e411081c718221184490688ac1706504299d85dfa72e6a99ea6c0d2e1" +version = "0.14.0-pre.9" +source = "git+https://github.com/RustCrypto/elliptic-curves.git#4cd8bde360c6b1c75cba4ec11c3be1772ad96b16" dependencies = [ "cfg-if", "elliptic-curve", @@ -784,7 +788,7 @@ dependencies = [ [[package]] name = "kem" version = "0.3.0-pre.0" -source = "git+https://github.com/RustCrypto/traits.git#a4d8074d024236f9c2c18d562340772f3f3cff79" +source = "git+https://github.com/RustCrypto/traits.git#501b8854593a440a08fcb299a1ae421b16c76169" dependencies = [ "rand_core", "zeroize", @@ -946,9 +950,8 @@ dependencies = [ [[package]] name = "p256" -version = "0.14.0-pre.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42c06f1f28ff328cb76c95cb7aebd6734a8333b98bdac393bdc124d16561dcb" +version = "0.14.0-pre.9" +source = "git+https://github.com/RustCrypto/elliptic-curves.git#4cd8bde360c6b1c75cba4ec11c3be1772ad96b16" dependencies = [ "elliptic-curve", "primefield", @@ -957,9 +960,8 @@ dependencies = [ [[package]] name = "p384" -version = "0.14.0-pre.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7594e57ef1ce505538e5a8e3485a21b930e99701bb65c8ede899a3a8213174" +version = "0.14.0-pre.9" +source = "git+https://github.com/RustCrypto/elliptic-curves.git#4cd8bde360c6b1c75cba4ec11c3be1772ad96b16" dependencies = [ "elliptic-curve", "primefield", @@ -968,11 +970,10 @@ dependencies = [ [[package]] name = "p521" -version = "0.14.0-pre.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9396e2414ace7de7e0f3d544a5a07f129e39b28b2f08a35b3b7febdea36fd8e9" +version = "0.14.0-pre.9" +source = "git+https://github.com/RustCrypto/elliptic-curves.git#4cd8bde360c6b1c75cba4ec11c3be1772ad96b16" dependencies = [ - "base16ct", + "base16ct 0.3.0", "elliptic-curve", "primefield", "primeorder", @@ -1058,9 +1059,8 @@ dependencies = [ [[package]] name = "primefield" -version = "0.14.0-pre.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bbeb92947a0d0d4b0cab5e2e6749acc44c81461eb3b1aff4dbb7acd0eb9f0ab" +version = "0.14.0-pre.4" +source = "git+https://github.com/RustCrypto/elliptic-curves.git#4cd8bde360c6b1c75cba4ec11c3be1772ad96b16" dependencies = [ "crypto-bigint", "ff", @@ -1071,9 +1071,9 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.14.0-pre.4" +version = "0.14.0-pre.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "979936340c6e8b108ad132b395a1682f02a0b179080ed3380320c2c888728429" +checksum = "af12dd34fc62d04416de85af032f4595369437fb7b0143d36ae60cecaf5cdddf" dependencies = [ "elliptic-curve", ] @@ -1301,11 +1301,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sec1" -version = "0.8.0-rc.4" +version = "0.8.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a017a4aa8f0bd51e9d0184d98042dfe9285218fec098493f47d9a8aa0f1a3f27" +checksum = "f5e67a3c9fb9a8f065af9fa30d65812fcc16a66cbf911eff1f6946957ce48f16" dependencies = [ - "base16ct", + "base16ct 0.3.0", "der", "hybrid-array", "subtle", @@ -1397,15 +1397,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f42f67da2385b51a5f9652db9c93d78aeaf7610bf5ec366080b6de810604af53" dependencies = [ - "base16ct", + "base16ct 0.2.0", "serde", ] [[package]] name = "sha2" -version = "0.11.0-rc.0" +version = "0.11.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa1d2e6b3cc4e43a8258a9a3b17aa5dfd2cc5186c7024bba8a64aa65b2c71a59" +checksum = "d1e3878ab0f98e35b2df35fe53201d088299b41a6bb63e3e34dada2ac4abd924" dependencies = [ "cfg-if", "cpufeatures", diff --git a/Cargo.toml b/Cargo.toml index 5757cf7..b548c99 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,4 +11,11 @@ members = [ debug = true [patch.crates-io] +elliptic-curve = { git = "https://github.com/RustCrypto/traits.git" } kem = { git = "https://github.com/RustCrypto/traits.git" } + +primefield = { git = "https://github.com/RustCrypto/elliptic-curves.git" } +k256 = { git = "https://github.com/RustCrypto/elliptic-curves.git" } +p256 = { git = "https://github.com/RustCrypto/elliptic-curves.git" } +p384 = { git = "https://github.com/RustCrypto/elliptic-curves.git" } +p521 = { git = "https://github.com/RustCrypto/elliptic-curves.git" } diff --git a/dhkem/Cargo.toml b/dhkem/Cargo.toml index 0ba7196..c0a5b48 100644 --- a/dhkem/Cargo.toml +++ b/dhkem/Cargo.toml @@ -18,7 +18,7 @@ kem = "0.3.0-pre.0" rand_core = "0.9.0" # optional dependencies -elliptic-curve = { version = "0.14.0-rc.5", optional = true, default-features = false } +elliptic-curve = { version = "0.14.0-rc.12", optional = true, default-features = false } k256 = { version = "0.14.0-pre.5", optional = true, default-features = false, features = ["arithmetic"] } p256 = { version = "0.14.0-pre.5", optional = true, default-features = false, features = ["arithmetic"] } p384 = { version = "0.14.0-pre.5", optional = true, default-features = false, features = ["arithmetic"] } @@ -40,7 +40,7 @@ zeroize = ["dep:zeroize"] hex-literal = "1" hkdf = "0.13.0-rc.0" rand = "0.9.0" -sha2 = "0.11.0-rc.0" +sha2 = "0.11.0-rc.2" [package.metadata.docs.rs] all-features = true diff --git a/frodo-kem/Cargo.toml b/frodo-kem/Cargo.toml index 66b2ccd..4c1751c 100644 --- a/frodo-kem/Cargo.toml +++ b/frodo-kem/Cargo.toml @@ -82,7 +82,7 @@ aes = "0.9.0-rc.0" bincode = "1.3" criterion = "0.5" hex = "0.4" -hybrid-array = "0.3" +hybrid-array = "0.4" rand_core = { version = "0.9", features = ["os_rng"] } rand_chacha = "0.9" rstest = "0.24" diff --git a/ml-kem/Cargo.toml b/ml-kem/Cargo.toml index ff001bb..08a0e3b 100644 --- a/ml-kem/Cargo.toml +++ b/ml-kem/Cargo.toml @@ -21,7 +21,7 @@ zeroize = ["dep:zeroize"] [dependencies] kem = "0.3.0-pre.0" -hybrid-array = { version = "0.3", features = ["extra-sizes"] } +hybrid-array = { version = "0.4", features = ["extra-sizes"] } rand_core = "0.9" sha3 = { version = "0.11.0-rc.0", default-features = false } zeroize = { version = "1.8.1", optional = true, default-features = false }