From da5444c1b13cf006b52490282ddbfebca3a725de Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Fri, 26 Jul 2024 16:09:58 -0600 Subject: [PATCH] Bump `cipher` to v0.5.0-pre.6 (#430) --- Cargo.lock | 16 ++++++++-------- aes/Cargo.toml | 4 ++-- aria/Cargo.toml | 4 ++-- belt-block/Cargo.toml | 4 ++-- blowfish/Cargo.toml | 4 ++-- camellia/Cargo.toml | 4 ++-- cast5/Cargo.toml | 4 ++-- cast6/Cargo.toml | 4 ++-- des/Cargo.toml | 4 ++-- idea/Cargo.toml | 4 ++-- kuznyechik/Cargo.toml | 4 ++-- magma/Cargo.toml | 4 ++-- rc2/Cargo.toml | 4 ++-- rc2/tests/mod.rs | 3 +++ rc5/Cargo.toml | 4 ++-- rc5/tests/mod.rs | 1 + serpent/Cargo.toml | 4 ++-- sm4/Cargo.toml | 4 ++-- speck/Cargo.toml | 4 ++-- threefish/Cargo.toml | 4 ++-- threefish/tests/mod.rs | 1 + twofish/Cargo.toml | 4 ++-- 22 files changed, 49 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index abe3908f..a3a26479 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -81,9 +81,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cipher" -version = "0.5.0-pre.4" +version = "0.5.0-pre.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fba98785cecd0e308818a87c817576a40f99d8bab6405bf422bacd3efb6c1f" +checksum = "c71c893d5a1e8257048dbb29954d2e1f85f091a150304f1defe4ca2806da5d3f" dependencies = [ "blobby", "crypto-common", @@ -102,9 +102,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.2.0-pre.5" +version = "0.2.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7aa2ec04f5120b830272a481e8d9d8ba4dda140d2cda59b0f1110d5eb93c38e" +checksum = "8c070b79a496dccd931229780ad5bbedd535ceff6c3565605a8e440e18e1aa2b" dependencies = [ "hybrid-array", ] @@ -130,9 +130,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "hybrid-array" -version = "0.2.0-rc.5" +version = "0.2.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcda354500b318c287a6b91c1cfbc42edd53d52d259a80783ceb5e3986fca2b2" +checksum = "4d306b679262030ad8813a82d4915fc04efff97776e4db7f8eb5137039d56400" dependencies = [ "typenum", ] @@ -146,9 +146,9 @@ dependencies = [ [[package]] name = "inout" -version = "0.2.0-pre.4" +version = "0.2.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2cc35b920cc3b344af824e64e508ffc2c819fc2368ed4d253244446194d2fe" +checksum = "bbc33218cf9ce7b927426ee4ad3501bcc5d8c26bf5fb4a82849a083715aca427" dependencies = [ "hybrid-array", ] diff --git a/aes/Cargo.toml b/aes/Cargo.toml index 023b5996..2a45ef1b 100644 --- a/aes/Cargo.toml +++ b/aes/Cargo.toml @@ -14,14 +14,14 @@ categories = ["cryptography", "no-std"] [dependencies] cfg-if = "1" -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" zeroize = { version = "1.5.6", optional = true, default-features = false, features = ["aarch64"] } [target.'cfg(any(target_arch = "aarch64", target_arch = "x86_64", target_arch = "x86"))'.dependencies] cpufeatures = "0.2" [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.3" [features] diff --git a/aria/Cargo.toml b/aria/Cargo.toml index 2c64fad5..2485e7a3 100644 --- a/aria/Cargo.toml +++ b/aria/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "aria", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/belt-block/Cargo.toml b/belt-block/Cargo.toml index 91a7374d..6a7324ff 100644 --- a/belt-block/Cargo.toml +++ b/belt-block/Cargo.toml @@ -12,10 +12,10 @@ repository = "https://github.com/RustCrypto/block-ciphers" keywords = ["crypto", "belt-block", "belt", "stb"] [dependencies] -cipher = { version = "=0.5.0-pre.4", optional = true } +cipher = { version = "=0.5.0-pre.6", optional = true } [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/blowfish/Cargo.toml b/blowfish/Cargo.toml index e12c225c..35d68bee 100644 --- a/blowfish/Cargo.toml +++ b/blowfish/Cargo.toml @@ -13,11 +13,11 @@ keywords = ["crypto", "blowfish", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" byteorder = { version = "1.1", default-features = false } [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } [features] bcrypt = [] diff --git a/camellia/Cargo.toml b/camellia/Cargo.toml index 7ac550e4..23acdedc 100644 --- a/camellia/Cargo.toml +++ b/camellia/Cargo.toml @@ -14,10 +14,10 @@ categories = ["cryptography", "no-std"] [dependencies] byteorder = { version = "1.1", default-features = false } -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/cast5/Cargo.toml b/cast5/Cargo.toml index 8fddddc7..85c83308 100644 --- a/cast5/Cargo.toml +++ b/cast5/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "cast5", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/cast6/Cargo.toml b/cast6/Cargo.toml index 45e73383..66818705 100644 --- a/cast6/Cargo.toml +++ b/cast6/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "cast6", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/des/Cargo.toml b/des/Cargo.toml index 0d154427..b75731da 100644 --- a/des/Cargo.toml +++ b/des/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "des", "tdes", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/idea/Cargo.toml b/idea/Cargo.toml index 70bbe154..a05af49a 100644 --- a/idea/Cargo.toml +++ b/idea/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "idea", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/kuznyechik/Cargo.toml b/kuznyechik/Cargo.toml index 67d6451e..7846f846 100644 --- a/kuznyechik/Cargo.toml +++ b/kuznyechik/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "kuznyechik", "gost", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/magma/Cargo.toml b/magma/Cargo.toml index 4001847c..7de67f34 100644 --- a/magma/Cargo.toml +++ b/magma/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "magma", "gost", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/rc2/Cargo.toml b/rc2/Cargo.toml index da835c01..c126af72 100644 --- a/rc2/Cargo.toml +++ b/rc2/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "rc2", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/rc2/tests/mod.rs b/rc2/tests/mod.rs index b077d77f..5f8844dd 100644 --- a/rc2/tests/mod.rs +++ b/rc2/tests/mod.rs @@ -21,6 +21,7 @@ macro_rules! new_tests { } #[test] +#[allow(deprecated)] // uses `clone_from_slice` fn rc2() { let tests = new_tests!("1", "2", "3", "7"); for test in &tests { @@ -37,6 +38,7 @@ fn rc2() { } #[test] +#[allow(deprecated)] // uses `clone_from_slice` fn rc2_effective_key_64() { let tests = new_tests!("4", "5", "6"); for test in &tests { @@ -53,6 +55,7 @@ fn rc2_effective_key_64() { } #[test] +#[allow(deprecated)] // uses `clone_from_slice` fn rc2_effective_key_129() { let tests = new_tests!("8"); for test in &tests { diff --git a/rc5/Cargo.toml b/rc5/Cargo.toml index a0458d41..bb863b89 100644 --- a/rc5/Cargo.toml +++ b/rc5/Cargo.toml @@ -12,10 +12,10 @@ keywords = ["crypto", "rc5", "block-cipher"] categories = ["cryptography"] [dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["zeroize"] } +cipher = { version = "=0.5.0-pre.6", features = ["zeroize"] } [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } [features] zeroize = [] diff --git a/rc5/tests/mod.rs b/rc5/tests/mod.rs index 034b8378..f17416ed 100644 --- a/rc5/tests/mod.rs +++ b/rc5/tests/mod.rs @@ -1,5 +1,6 @@ /// generated using the code in: https://www.ietf.org/archive/id/draft-krovetz-rc6-rc5-vectors-00.txt #[cfg(test)] +#[allow(deprecated)] // uses `clone_from_slice` mod tests { use cipher::consts::*; use cipher::{array::Array, BlockCipherDecrypt, BlockCipherEncrypt, KeyInit}; diff --git a/serpent/Cargo.toml b/serpent/Cargo.toml index df861418..8536fa98 100644 --- a/serpent/Cargo.toml +++ b/serpent/Cargo.toml @@ -14,10 +14,10 @@ categories = ["cryptography", "no-std"] [dependencies] byteorder = { version = "1.1", default-features = false } -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/sm4/Cargo.toml b/sm4/Cargo.toml index 793b0338..136ecc9e 100644 --- a/sm4/Cargo.toml +++ b/sm4/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "sm4", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/speck/Cargo.toml b/speck/Cargo.toml index 8a5f6c7e..90229a6f 100644 --- a/speck/Cargo.toml +++ b/speck/Cargo.toml @@ -13,8 +13,8 @@ keywords = ["crypto", "speck", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.4" diff --git a/threefish/Cargo.toml b/threefish/Cargo.toml index 397f86cf..653ea214 100644 --- a/threefish/Cargo.toml +++ b/threefish/Cargo.toml @@ -13,11 +13,11 @@ keywords = ["crypto", "threefish", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = { version = "=0.5.0-pre.4", optional = true } +cipher = { version = "=0.5.0-pre.6", optional = true } zeroize = { version = "1.6", optional = true, default-features = false } [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"]} +cipher = { version = "=0.5.0-pre.6", features = ["dev"]} hex-literal = "0.4" [features] diff --git a/threefish/tests/mod.rs b/threefish/tests/mod.rs index 6b357600..7238e1e4 100644 --- a/threefish/tests/mod.rs +++ b/threefish/tests/mod.rs @@ -15,6 +15,7 @@ struct Vector { macro_rules! impl_test { {$name:ident, $cipher:ty, $tests:expr,} => { #[test] + #[allow(deprecated)] // uses `clone_from_slice` fn $name() { let vectors = $tests; for &Vector { key, tweak, pt, ct } in vectors.iter() { diff --git a/twofish/Cargo.toml b/twofish/Cargo.toml index 7ae94435..885c69cb 100644 --- a/twofish/Cargo.toml +++ b/twofish/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "twofish", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.4" [features]