From 6bbd3f8816f17359b6a3628d55a0798dcde22cf6 Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Fri, 26 Jul 2024 20:10:21 -0600 Subject: [PATCH] Bump `cipher` to v0.5.0-pre.6 (#65) --- Cargo.lock | 40 ++++++++++++++++++++++------------------ Cargo.toml | 8 -------- belt-ctr/Cargo.toml | 8 ++++---- cbc/Cargo.toml | 6 +++--- cfb-mode/Cargo.toml | 8 ++++---- cfb8/Cargo.toml | 6 +++--- cfb8/src/decrypt.rs | 1 + cfb8/src/encrypt.rs | 1 + ctr/Cargo.toml | 10 +++++----- ige/Cargo.toml | 6 +++--- ige/src/decrypt.rs | 1 + ige/src/encrypt.rs | 1 + ofb/Cargo.toml | 6 +++--- pcbc/Cargo.toml | 6 +++--- 14 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 855d3cf..4e473ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,8 +4,9 @@ version = 3 [[package]] name = "aes" -version = "0.9.0-pre.0" -source = "git+https://github.com/RustCrypto/block-ciphers.git#ae1892c8600131227531504812260e3d2821d01e" +version = "0.9.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "183b3b4639f8f7237857117abb74f3dc8648b77e67ff78d9cb6959fd7e76f387" dependencies = [ "cfg-if", "cipher", @@ -14,8 +15,9 @@ dependencies = [ [[package]] name = "belt-block" -version = "0.2.0-pre.0" -source = "git+https://github.com/RustCrypto/block-ciphers.git#ae1892c8600131227531504812260e3d2821d01e" +version = "0.2.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3342994f00336827ff9ae0e20e21d38eb88aa4e40aa1795a2a4d14d7af264a5b" dependencies = [ "cipher", ] @@ -37,9 +39,9 @@ checksum = "847495c209977a90e8aad588b959d0ca9f5dc228096d29a6bd3defd53f35eaec" [[package]] name = "block-padding" -version = "0.4.0-pre.4" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ab21a8964437caf2e83a92a1221ce65e356a2a9b8b52d58bece04005fe114e" +checksum = "0d7992d59cd95a984bde8833d4d025886eec3718777971ad15c58df0b070254a" dependencies = [ "hybrid-array", ] @@ -80,9 +82,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", @@ -101,9 +103,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 = [ "getrandom", "hybrid-array", @@ -140,9 +142,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "hybrid-array" -version = "0.2.0-rc.8" +version = "0.2.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53668f5da5a41d9eaf4bf7064be46d1ebe6a4e1ceed817f387587b18f2b51047" +checksum = "4d306b679262030ad8813a82d4915fc04efff97776e4db7f8eb5137039d56400" dependencies = [ "typenum", ] @@ -158,9 +160,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 = [ "block-padding", "hybrid-array", @@ -168,8 +170,9 @@ dependencies = [ [[package]] name = "kuznyechik" -version = "0.9.0-pre.0" -source = "git+https://github.com/RustCrypto/block-ciphers.git#ae1892c8600131227531504812260e3d2821d01e" +version = "0.9.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7984e78a88c94f87c94a1a17f8fb3bff3f466c2b8bddf341ae9616d7519c888" dependencies = [ "cipher", ] @@ -182,8 +185,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "magma" -version = "0.10.0-pre.0" -source = "git+https://github.com/RustCrypto/block-ciphers.git#ae1892c8600131227531504812260e3d2821d01e" +version = "0.10.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef645dc7cf374c71e44deb3f045f59873da9bbfaab4e062fcfd3529ee9e52318" dependencies = [ "cipher", ] diff --git a/Cargo.toml b/Cargo.toml index fbf08a4..947bb0f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,11 +10,3 @@ members = [ "ofb", "pcbc", ] - -[patch.crates-io] -# please re-enable the minimal-versions when you remove those patches. -# https://github.com/RustCrypto/block-ciphers/pull/413 -aes = { git = "https://github.com/RustCrypto/block-ciphers.git" } -belt-block = { git = "https://github.com/RustCrypto/block-ciphers.git" } -kuznyechik = { git = "https://github.com/RustCrypto/block-ciphers.git" } -magma = { git = "https://github.com/RustCrypto/block-ciphers.git" } diff --git a/belt-ctr/Cargo.toml b/belt-ctr/Cargo.toml index 3a02510..c3e9dcf 100644 --- a/belt-ctr/Cargo.toml +++ b/belt-ctr/Cargo.toml @@ -13,13 +13,13 @@ keywords = ["crypto", "block-mode", "stream-cipher", "ciphers", "belt"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" -belt-block = "=0.2.0-pre.0" +cipher = "=0.5.0-pre.6" +belt-block = "=0.2.0-pre.1" [dev-dependencies] hex-literal = "0.4" -belt-block = "=0.2.0-pre.0" -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +belt-block = "=0.2.0-pre.1" +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } [features] alloc = ["cipher/alloc"] diff --git a/cbc/Cargo.toml b/cbc/Cargo.toml index 745a25b..4f7dc6f 100644 --- a/cbc/Cargo.toml +++ b/cbc/Cargo.toml @@ -13,11 +13,11 @@ keywords = ["crypto", "block-mode", "ciphers"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -aes = "=0.9.0-pre.0" -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +aes = "=0.9.0-pre.1" +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/cfb-mode/Cargo.toml b/cfb-mode/Cargo.toml index fd75ca6..b202822 100644 --- a/cfb-mode/Cargo.toml +++ b/cfb-mode/Cargo.toml @@ -13,12 +13,12 @@ keywords = ["crypto", "block-mode", "stream-cipher", "ciphers"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -aes = "=0.9.0-pre.0" -belt-block = "=0.2.0-pre.0" -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +aes = "=0.9.0-pre.1" +belt-block = "=0.2.0-pre.1" +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/cfb8/Cargo.toml b/cfb8/Cargo.toml index 4168f9c..0bf80a8 100644 --- a/cfb8/Cargo.toml +++ b/cfb8/Cargo.toml @@ -13,11 +13,11 @@ keywords = ["crypto", "block-mode", "stream-cipher", "ciphers"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -aes = "=0.9.0-pre.0" -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +aes = "=0.9.0-pre.1" +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/cfb8/src/decrypt.rs b/cfb8/src/decrypt.rs index a69f673..a759964 100644 --- a/cfb8/src/decrypt.rs +++ b/cfb8/src/decrypt.rs @@ -174,6 +174,7 @@ where let mut t = self.iv.clone(); self.backend.proc_block((&mut t).into()); let r = block.get(0).clone_in(); + #[allow(deprecated)] block.xor_in2out(Array::from_slice(&t[..1])); let n = self.iv.len(); for i in 0..n - 1 { diff --git a/cfb8/src/encrypt.rs b/cfb8/src/encrypt.rs index ea15ead..80a5987 100644 --- a/cfb8/src/encrypt.rs +++ b/cfb8/src/encrypt.rs @@ -172,6 +172,7 @@ where fn proc_block(&mut self, mut block: InOut<'_, '_, Block>) { let mut t = self.iv.clone(); self.backend.proc_block((&mut t).into()); + #[allow(deprecated)] block.xor_in2out(Array::from_slice(&t[..1])); let r = block.get_out()[0]; let n = self.iv.len(); diff --git a/ctr/Cargo.toml b/ctr/Cargo.toml index ba26c7b..5b51235 100644 --- a/ctr/Cargo.toml +++ b/ctr/Cargo.toml @@ -13,13 +13,13 @@ keywords = ["crypto", "block-mode", "stream-cipher", "ciphers"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -aes = "=0.9.0-pre.0" -magma = "=0.10.0-pre.0" -kuznyechik = "=0.9.0-pre.0" -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +aes = "=0.9.0-pre.1" +magma = "=0.10.0-pre.1" +kuznyechik = "=0.9.0-pre.1" +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/ige/Cargo.toml b/ige/Cargo.toml index dfbb5fc..dda583d 100644 --- a/ige/Cargo.toml +++ b/ige/Cargo.toml @@ -13,11 +13,11 @@ keywords = ["crypto", "block-mode", "ciphers"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -aes = "=0.9.0-pre.0" -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +aes = "=0.9.0-pre.1" +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/ige/src/decrypt.rs b/ige/src/decrypt.rs index 17de4f1..92f4458 100644 --- a/ige/src/decrypt.rs +++ b/ige/src/decrypt.rs @@ -71,6 +71,7 @@ where IgeIvSize: ArraySize, { #[inline] + #[allow(deprecated)] // clone_from_slice fn inner_iv_init(cipher: C, iv: &Iv) -> Self { let (y, x) = iv.split_at(C::BlockSize::to_usize()); Self { diff --git a/ige/src/encrypt.rs b/ige/src/encrypt.rs index 6aab60d..171af96 100644 --- a/ige/src/encrypt.rs +++ b/ige/src/encrypt.rs @@ -73,6 +73,7 @@ where #[inline] fn inner_iv_init(cipher: C, iv: &Iv) -> Self { let (y, x) = iv.split_at(C::BlockSize::to_usize()); + #[allow(deprecated)] // clone_from_slice Self { cipher, x: Array::clone_from_slice(x), diff --git a/ofb/Cargo.toml b/ofb/Cargo.toml index dfc6924..22db8bb 100644 --- a/ofb/Cargo.toml +++ b/ofb/Cargo.toml @@ -13,11 +13,11 @@ keywords = ["crypto", "block-mode", "stream-cipher", "ciphers"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -aes = "=0.9.0-pre.0" -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +aes = "=0.9.0-pre.1" +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/pcbc/Cargo.toml b/pcbc/Cargo.toml index 5557454..b7df0e6 100644 --- a/pcbc/Cargo.toml +++ b/pcbc/Cargo.toml @@ -13,11 +13,11 @@ keywords = ["crypto", "block-mode", "ciphers"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.4" +cipher = "=0.5.0-pre.6" [dev-dependencies] -aes = "=0.9.0-pre.0" -cipher = { version = "=0.5.0-pre.4", features = ["dev"] } +aes = "=0.9.0-pre.1" +cipher = { version = "=0.5.0-pre.6", features = ["dev"] } hex-literal = "0.4" [features]