diff --git a/Cargo.lock b/Cargo.lock index 10d89f89..e925b65b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aes" -version = "0.8.4" +version = "0.9.0-pre.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +checksum = "e7856582c758ade85d71daf27ec6bcea6c1c73913692b07b8dffea2dc03531c9" dependencies = [ "cfg-if", "cipher", @@ -88,22 +88,13 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - [[package]] name = "block-buffer" version = "0.11.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17092d478f4fadfb35a7e082f62e49f0907fdf048801d9d706277e34f9df8a78" dependencies = [ - "crypto-common 0.2.0-rc.0", + "crypto-common", ] [[package]] @@ -159,11 +150,11 @@ dependencies = [ [[package]] name = "cipher" -version = "0.4.4" +version = "0.5.0-pre.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +checksum = "5b1425e6ce000f05a73096556cabcfb6a10a3ffe3bb4d75416ca8f00819c0b6a" dependencies = [ - "crypto-common 0.1.6", + "crypto-common", "inout", ] @@ -289,19 +280,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "crypto-common" -version = "0.2.0-rc.0" +version = "0.2.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c070b79a496dccd931229780ad5bbedd535ceff6c3565605a8e440e18e1aa2b" +checksum = "b0b8ce8218c97789f16356e7896b3714f26c2ee1079b79c0b7ae7064bb9089fa" dependencies = [ "getrandom", "hybrid-array", @@ -310,9 +291,9 @@ dependencies = [ [[package]] name = "ctr" -version = "0.9.2" +version = "0.10.0-pre.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +checksum = "77e1482d284b80d7fddb211666d513dc5e23b0cc3a03ad398ff70543827c789f" dependencies = [ "cipher", ] @@ -328,26 +309,15 @@ dependencies = [ "zeroize", ] -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer 0.10.4", - "crypto-common 0.1.6", - "subtle", -] - [[package]] name = "digest" version = "0.11.0-pre.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf2e3d6615d99707295a9673e889bf363a04b2a466bd320c65a72536f7577379" dependencies = [ - "block-buffer 0.11.0-rc.0", + "block-buffer", "const-oid", - "crypto-common 0.2.0-rc.0", + "crypto-common", "subtle", ] @@ -355,7 +325,7 @@ dependencies = [ name = "dsa" version = "0.7.0-pre.0" dependencies = [ - "digest 0.11.0-pre.9", + "digest", "num-bigint-dig", "num-traits", "pkcs8", @@ -363,7 +333,7 @@ dependencies = [ "rand_chacha", "rfc6979", "sha1", - "sha2 0.11.0-pre.4", + "sha2", "signature", "zeroize", ] @@ -373,12 +343,12 @@ name = "ecdsa" version = "0.17.0-pre.9" dependencies = [ "der", - "digest 0.11.0-pre.9", + "digest", "elliptic-curve", "hex-literal", "rfc6979", "serdect", - "sha2 0.11.0-pre.4", + "sha2", "signature", "spki", ] @@ -424,7 +394,7 @@ checksum = "cc43715037532dc2d061e5c97e81b684c28993d52a4fa4eb7d2ce2826d78f2f2" dependencies = [ "base16ct", "crypto-bigint", - "digest 0.11.0-pre.9", + "digest", "ff", "group", "hex-literal", @@ -480,16 +450,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "getrandom" version = "0.2.11" @@ -543,22 +503,13 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "hmac" version = "0.13.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4b1fb14e4df79f9406b434b60acef9f45c26c50062cccf1346c6103b8c47d58" dependencies = [ - "digest 0.11.0-pre.9", + "digest", ] [[package]] @@ -572,11 +523,11 @@ dependencies = [ [[package]] name = "inout" -version = "0.1.3" +version = "0.2.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "161ac07241f4d11c21b6d82f1fef1c05aec030c0bf568b35281efe453ea450a7" dependencies = [ - "generic-array", + "hybrid-array", ] [[package]] @@ -616,9 +567,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.5" +version = "0.2.0-pre.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" +checksum = "a7cdd4f0dc5807b9a2b25dd48a3f58e862606fe7bd47f41ecde36e97422d7e90" dependencies = [ "cpufeatures", ] @@ -654,13 +605,13 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" name = "lms-signature" version = "0.0.1" dependencies = [ - "digest 0.11.0-pre.9", + "digest", "hex", "hex-literal", "hybrid-array", "rand", "rand_core", - "sha2 0.11.0-pre.4", + "sha2", "signature", "static_assertions", "typenum", @@ -984,8 +935,8 @@ name = "rfc6979" version = "0.5.0-pre.4" dependencies = [ "hex-literal", - "hmac 0.13.0-pre.4", - "sha2 0.11.0-pre.4", + "hmac", + "sha2", "subtle", ] @@ -1103,18 +1054,7 @@ checksum = "9540978cef7a8498211c1b1c14e5ce920fe5bd524ea84f4a3d72d4602515ae93" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.11.0-pre.9", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -1125,16 +1065,16 @@ checksum = "540c0893cce56cdbcfebcec191ec8e0f470dd1889b6e7a0b503e310a94a168f5" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.11.0-pre.9", + "digest", ] [[package]] name = "sha3" -version = "0.10.8" +version = "0.11.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +checksum = "e485881f388c2818d709796dc883c1ffcadde9d1f0e054f3a5c14974185261a6" dependencies = [ - "digest 0.10.7", + "digest", "keccak", ] @@ -1144,7 +1084,7 @@ version = "2.3.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "054d71959c7051b9042c26af337f05cc930575ed2604d7d3ced3158383e59734" dependencies = [ - "digest 0.11.0-pre.9", + "digest", "rand_core", ] @@ -1156,10 +1096,10 @@ dependencies = [ "cipher", "criterion", "ctr", - "digest 0.10.7", + "digest", "hex", "hex-literal", - "hmac 0.12.1", + "hmac", "hybrid-array", "num-bigint", "paste", @@ -1170,7 +1110,7 @@ dependencies = [ "rand_core", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "sha3", "signature", "typenum", @@ -1274,12 +1214,6 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - [[package]] name = "wait-timeout" version = "0.2.0" diff --git a/slh-dsa/Cargo.toml b/slh-dsa/Cargo.toml index d044fdf3..147ac7a5 100644 --- a/slh-dsa/Cargo.toml +++ b/slh-dsa/Cargo.toml @@ -15,15 +15,15 @@ categories = ["cryptography"] keywords = ["crypto", "signature"] [dependencies] -hybrid-array = { version = "0.2.0-rc.8", features = ["extra-sizes"] } +hybrid-array = { version = "0.2.0-rc.10", features = ["extra-sizes"] } typenum = { version = "1.17.0", features = ["const-generics"] } -sha3 = { version = "0.10.8", default-features = false } +sha3 = { version = "=0.11.0-pre.4", default-features = false } zerocopy = { version = "0.7.34", features = ["derive"] } rand_core = { version = "0.6.4" } signature = { version = "2.3.0-pre.4", features = ["rand_core"] } -hmac = "0.12.1" -sha2 = { version = "0.10.8", default-features = false } -digest = "0.10.7" +hmac = "=0.13.0-pre.4" +sha2 = { version = "=0.11.0-pre.4", default-features = false } +digest = "=0.11.0-pre.9" [dev-dependencies] hex-literal = "0.4.1" @@ -33,9 +33,9 @@ quickcheck = "1" quickcheck_macros = "1" proptest = "1.4.0" criterion = "0.5" -aes = "0.8.4" -cipher = "0.4.4" -ctr = "0.9.2" +aes = "=0.9.0-pre.2" +cipher = "=0.5.0-pre.7" +ctr = "=0.10.0-pre.2" rand_core = "0.6.4" paste = "1.0.15" rand = "0.8.5" diff --git a/slh-dsa/src/hashes/sha2.rs b/slh-dsa/src/hashes/sha2.rs index 3d00d926..2fa8e19d 100644 --- a/slh-dsa/src/hashes/sha2.rs +++ b/slh-dsa/src/hashes/sha2.rs @@ -9,7 +9,7 @@ use crate::{ xmss::XmssParams, ParameterSet, }; use crate::{PkSeed, SkPrf, SkSeed}; -use digest::{Digest, Mac}; +use digest::{Digest, KeyInit, Mac}; use hmac::Hmac; use hybrid_array::{Array, ArraySize}; use sha2::{Sha256, Sha512};