diff --git a/Cargo.lock b/Cargo.lock index fc34dd4..70d4956 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,12 +1,11 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "aes" version = "0.9.0-pre.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7856582c758ade85d71daf27ec6bcea6c1c73913692b07b8dffea2dc03531c9" +source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo%2Fedition-2024#d939ffbc26209dbf8cbfa32ef5144b63ba371aff" dependencies = [ "cfg-if", "cipher", @@ -16,8 +15,7 @@ dependencies = [ [[package]] name = "belt-block" version = "0.2.0-pre.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df0a14d60362d7b6041d3fe85dfd787ced16c4928f93d72152142c67d01d0bc" +source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo%2Fedition-2024#d939ffbc26209dbf8cbfa32ef5144b63ba371aff" dependencies = [ "cipher", ] @@ -34,15 +32,15 @@ dependencies = [ [[package]] name = "blobby" -version = "0.3.1" +version = "0.4.0-pre.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "847495c209977a90e8aad588b959d0ca9f5dc228096d29a6bd3defd53f35eaec" +checksum = "4a859067dcb257cb2ae028cb821399b55140b76fb8b2a360e052fe109019db43" [[package]] name = "block-buffer" -version = "0.11.0-rc.3" +version = "0.11.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd016a0ddc7cb13661bf5576073ce07330a693f8608a1320b4e20561cc12cdc" +checksum = "a229bfd78e4827c91b9b95784f69492c1b77c1ab75a45a8a037b139215086f94" dependencies = [ "hybrid-array", ] @@ -66,9 +64,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cipher" -version = "0.5.0-pre.7" +version = "0.5.0-pre.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1425e6ce000f05a73096556cabcfb6a10a3ffe3bb4d75416ca8f00819c0b6a" +checksum = "276974d2acb7cf592603150941fc1ff6442acdeb1dc653ac2825928f4703c131" dependencies = [ "crypto-common", "inout", @@ -100,20 +98,17 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.2.0-rc.1" +version = "0.2.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b8ce8218c97789f16356e7896b3714f26c2ee1079b79c0b7ae7064bb9089fa" +checksum = "170d71b5b14dec99db7739f6fc7d6ec2db80b78c3acb77db48392ccc3d8a9ea0" dependencies = [ - "getrandom", "hybrid-array", - "rand_core", ] [[package]] name = "dbl" version = "0.4.0-rc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b317b5dd7fb52c79e017554049304992f65260689c5ddb55438ad52ba007f98d" +source = "git+https://github.com/RustCrypto/utils.git#eb0672a516e7db296a878c7cf268db932b31aa4b" dependencies = [ "hybrid-array", ] @@ -121,17 +116,16 @@ dependencies = [ [[package]] name = "des" version = "0.9.0-pre.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76239c731adb4b5204cfeec47bd06ec1071d9477a0d32bbb83dc7d8c599efe63" +source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo%2Fedition-2024#d939ffbc26209dbf8cbfa32ef5144b63ba371aff" dependencies = [ "cipher", ] [[package]] name = "digest" -version = "0.11.0-pre.9" +version = "0.11.0-pre.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2e3d6615d99707295a9673e889bf363a04b2a466bd320c65a72536f7577379" +checksum = "6c478574b20020306f98d61c8ca3322d762e1ff08117422ac6106438605ea516" dependencies = [ "blobby", "block-buffer", @@ -139,17 +133,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - [[package]] name = "hex-literal" version = "0.4.1" @@ -170,18 +153,19 @@ dependencies = [ [[package]] name = "hybrid-array" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2d35805454dc9f8662a98d6d61886ffe26bd465f5960e0e55345c70d5c0d2a9" +checksum = "4dab50e193aebe510fe0e40230145820e02f48dae0cf339ea4204e6e708ff7bd" dependencies = [ "typenum", + "zeroize", ] [[package]] name = "inout" -version = "0.2.0-rc.3" +version = "0.2.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de49db00f5add6dad75a57946b75de0f26287a6fc95f4f277d48419200422beb" +checksum = "ac5e145e8ade9f74c0a5efc60ccb4e714b0144f7e2220b7ca64254feee71c57f" dependencies = [ "hybrid-array", ] @@ -189,8 +173,7 @@ dependencies = [ [[package]] name = "kuznyechik" version = "0.9.0-pre.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd136ca56393426d0aeca01643adef06b1f30d667fdebf31f7cf11724cbd9051" +source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo%2Fedition-2024#d939ffbc26209dbf8cbfa32ef5144b63ba371aff" dependencies = [ "cfg-if", "cipher", @@ -205,8 +188,7 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "magma" version = "0.10.0-pre.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fd466f879a2c01f141f168c4e045a26dca5a60aef79efa8bb96e9c701bb8ea" +source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo%2Fedition-2024#d939ffbc26209dbf8cbfa32ef5144b63ba371aff" dependencies = [ "cipher", ] @@ -214,8 +196,7 @@ dependencies = [ [[package]] name = "md-5" version = "0.11.0-pre.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "117b97b6b9ae1ec9a396b357698efa3ecff4fc1f40e0ec59ae7c1270b460ac1d" +source = "git+https://github.com/RustCrypto/hashes.git?branch=edition_upgrade#cfe82a0f1a9a6c89c5b6d8309f2603c644dc97ea" dependencies = [ "cfg-if", "digest", @@ -231,15 +212,6 @@ dependencies = [ "digest", ] -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - [[package]] name = "retail-mac" version = "0.1.0-pre.0" @@ -254,8 +226,7 @@ dependencies = [ [[package]] name = "sha1" version = "0.11.0-pre.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9540978cef7a8498211c1b1c14e5ce920fe5bd524ea84f4a3d72d4602515ae93" +source = "git+https://github.com/RustCrypto/hashes.git?branch=edition_upgrade#cfe82a0f1a9a6c89c5b6d8309f2603c644dc97ea" dependencies = [ "cfg-if", "cpufeatures", @@ -265,8 +236,7 @@ dependencies = [ [[package]] name = "sha2" version = "0.11.0-pre.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540c0893cce56cdbcfebcec191ec8e0f470dd1889b6e7a0b503e310a94a168f5" +source = "git+https://github.com/RustCrypto/hashes.git?branch=edition_upgrade#cfe82a0f1a9a6c89c5b6d8309f2603c644dc97ea" dependencies = [ "cfg-if", "cpufeatures", @@ -276,8 +246,7 @@ dependencies = [ [[package]] name = "streebog" version = "0.11.0-pre.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb353b35a577917dbcc59b8bef4084ba206b36851577816d5ffe3dac9b0ad54" +source = "git+https://github.com/RustCrypto/hashes.git?branch=edition_upgrade#cfe82a0f1a9a6c89c5b6d8309f2603c644dc97ea" dependencies = [ "digest", ] @@ -294,12 +263,6 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - [[package]] name = "zeroize" version = "1.8.1" diff --git a/Cargo.toml b/Cargo.toml index 4e023fa..ebe9e8e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,3 +4,20 @@ members = ["belt-mac", "cbc-mac", "cmac", "hmac", "pmac", "retail-mac"] [profile.dev] opt-level = 2 + +[patch.crates-io] +# https://github.com/RustCrypto/hashes/pull/652 +md-5 = { git = "https://github.com/RustCrypto/hashes.git", branch = "edition_upgrade" } +sha1 = { git = "https://github.com/RustCrypto/hashes.git", branch = "edition_upgrade" } +sha2 = { git = "https://github.com/RustCrypto/hashes.git", branch = "edition_upgrade" } +streebog = { git = "https://github.com/RustCrypto/hashes.git", branch = "edition_upgrade" } + +# https://github.com/RustCrypto/block-ciphers/pull/472 +aes = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/edition-2024" } +des = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/edition-2024" } +belt-block = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/edition-2024" } +kuznyechik = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/edition-2024" } +magma = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/edition-2024" } + +# https://github.com/RustCrypto/utils/pull/1149 +dbl = { git = "https://github.com/RustCrypto/utils.git" } diff --git a/belt-mac/Cargo.toml b/belt-mac/Cargo.toml index cee8682..3fe6c19 100644 --- a/belt-mac/Cargo.toml +++ b/belt-mac/Cargo.toml @@ -14,11 +14,11 @@ categories = ["cryptography", "no-std"] [dependencies] belt-block = "0.2.0-pre.2" -cipher = "=0.5.0-pre.7" -digest = { version = "=0.11.0-pre.9", features = ["mac"] } +cipher = "=0.5.0-pre.8" +digest = { version = "=0.11.0-pre.10", features = ["mac"] } [dev-dependencies] -digest = { version = "=0.11.0-pre.9", features = ["dev"] } +digest = { version = "=0.11.0-pre.10", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/cbc-mac/Cargo.toml b/cbc-mac/Cargo.toml index dc6d336..d9508ea 100644 --- a/cbc-mac/Cargo.toml +++ b/cbc-mac/Cargo.toml @@ -12,11 +12,11 @@ repository = "https://github.com/RustCrypto/MACs" keywords = ["crypto", "mac", "daa"] [dependencies] -cipher = "=0.5.0-pre.7" -digest = { version = "=0.11.0-pre.9", features = ["mac"] } +cipher = "=0.5.0-pre.8" +digest = { version = "=0.11.0-pre.10", features = ["mac"] } [dev-dependencies] -digest = { version = "=0.11.0-pre.9", features = ["dev"] } +digest = { version = "=0.11.0-pre.10", features = ["dev"] } hex-literal = "0.4" aes = "0.9.0-pre.2" diff --git a/cmac/Cargo.toml b/cmac/Cargo.toml index dde63a9..6f56e86 100644 --- a/cmac/Cargo.toml +++ b/cmac/Cargo.toml @@ -14,12 +14,12 @@ categories = ["cryptography", "no-std"] exclude = ["tests/cavp_large.rs", "tests/data/cavp_aes128_large.blb"] [dependencies] -cipher = "=0.5.0-pre.7" -digest = { version = "=0.11.0-pre.9", features = ["mac"] } +cipher = "=0.5.0-pre.8" +digest = { version = "=0.11.0-pre.10", features = ["mac"] } dbl = "0.4.0-rc.0" [dev-dependencies] -digest = { version = "=0.11.0-pre.9", features = ["dev"] } +digest = { version = "=0.11.0-pre.10", features = ["dev"] } hex-literal = "0.4" aes = "0.9.0-pre.2" diff --git a/hmac/Cargo.toml b/hmac/Cargo.toml index 45eaad2..a23f3ad 100644 --- a/hmac/Cargo.toml +++ b/hmac/Cargo.toml @@ -13,10 +13,10 @@ categories = ["cryptography", "no-std"] rust-version = "1.85" [dependencies] -digest = { version = "=0.11.0-pre.9", features = ["mac"] } +digest = { version = "=0.11.0-pre.10", features = ["mac"] } [dev-dependencies] -digest = { version = "=0.11.0-pre.9", features = ["dev"] } +digest = { version = "=0.11.0-pre.10", features = ["dev"] } md-5 = { version = "=0.11.0-pre.4", default-features = false } sha1 = { version = "=0.11.0-pre.4", default-features = false } sha2 = { version = "=0.11.0-pre.4", default-features = false } diff --git a/pmac/Cargo.toml b/pmac/Cargo.toml index 5e91558..132dba1 100644 --- a/pmac/Cargo.toml +++ b/pmac/Cargo.toml @@ -13,13 +13,13 @@ keywords = ["crypto", "mac", "pmac"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.7" -digest = { version = "=0.11.0-pre.9", features = ["mac"] } +cipher = "=0.5.0-pre.8" +digest = { version = "=0.11.0-pre.10", features = ["mac"] } dbl = "0.4.0-rc.0" [dev-dependencies] aes = "0.9.0-pre.2" -digest = { version = "=0.11.0-pre.9", features = ["dev"] } +digest = { version = "=0.11.0-pre.10", features = ["dev"] } [features] std = ["digest/std"] diff --git a/retail-mac/Cargo.toml b/retail-mac/Cargo.toml index 1991932..6a4d4cc 100644 --- a/retail-mac/Cargo.toml +++ b/retail-mac/Cargo.toml @@ -12,11 +12,11 @@ repository = "https://github.com/RustCrypto/MACs" keywords = ["crypto", "mac"] [dependencies] -cipher = "=0.5.0-pre.7" -digest = { version = "=0.11.0-pre.9", features = ["mac"] } +cipher = "=0.5.0-pre.8" +digest = { version = "=0.11.0-pre.10", features = ["mac"] } [dev-dependencies] -digest = { version = "=0.11.0-pre.9", features = ["dev"] } +digest = { version = "=0.11.0-pre.10", features = ["dev"] } hex-literal = "0.4" aes = "0.9.0-pre.2"