From e6f45ec7804e8765d318ee246cc39db1a553d787 Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Mon, 2 Feb 2026 10:22:35 -0700 Subject: [PATCH] Bump `cipher` to v0.5.0-rc.8 This notably renames the `cipher::crypto_common` re-export to just `cipher::common`, which necessitates a new release of all of the crates in this repo: - `belt-ctr` v0.2.0-rc.3 - `cbc` v0.2.0-rc.3 - `cfb-mode` v0.9.0-rc.3 - `cfb8` v0.9.0-rc.3 - `ctr` v0.10.0-rc.3 - `cts` v0.7.0-rc.3 - `ige` v0.2.0-rc.3 - `ofb` v0.7.0-rc.3 - `pcbc` v0.2.0-rc.3 --- Cargo.lock | 50 ++++++++++++++++++++--------------- belt-ctr/Cargo.toml | 10 +++---- belt-ctr/src/lib.rs | 3 +-- cbc/Cargo.toml | 8 +++--- cbc/src/decrypt.rs | 2 +- cbc/src/encrypt.rs | 2 +- cfb-mode/Cargo.toml | 10 +++---- cfb-mode/src/decrypt.rs | 2 +- cfb-mode/src/encrypt.rs | 2 +- cfb-mode/src/encrypt/buf.rs | 4 +-- cfb8/Cargo.toml | 8 +++--- cfb8/src/decrypt.rs | 2 +- cfb8/src/encrypt.rs | 2 +- ctr/Cargo.toml | 12 ++++----- ctr/src/ctr_core.rs | 2 +- cts/Cargo.toml | 10 +++---- cts/src/cbc_cs1.rs | 2 +- cts/src/cbc_cs2.rs | 2 +- cts/src/cbc_cs3.rs | 2 +- cts/src/ecb_cs1.rs | 2 +- cts/src/ecb_cs2.rs | 2 +- cts/src/ecb_cs3.rs | 2 +- cts/tests/aes128_roundtrip.rs | 2 +- ige/Cargo.toml | 8 +++--- ige/src/decrypt.rs | 2 +- ige/src/encrypt.rs | 2 +- ofb/Cargo.toml | 8 +++--- ofb/src/lib.rs | 2 +- pcbc/Cargo.toml | 8 +++--- pcbc/src/decrypt.rs | 2 +- pcbc/src/encrypt.rs | 2 +- 31 files changed, 91 insertions(+), 86 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8da11cd..e07aa4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,27 +4,27 @@ version = 4 [[package]] name = "aes" -version = "0.9.0-rc.2" +version = "0.9.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9e1c818b25efb32214df89b0ec22f01aa397aaeb718d1022bf0635a3bfd1a8" +checksum = "04097e08a47d9ad181c2e1f4a5fabc9ae06ce8839a333ba9a949bcb0d31fd2a3" dependencies = [ - "cfg-if", "cipher", + "cpubits", "cpufeatures", ] [[package]] name = "belt-block" -version = "0.2.0-rc.2" +version = "0.2.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34d9cc93a6506887eed92e4e9459c13469eee4ef2b2af305a182ebf53e4d6a3" +checksum = "0e3b1e9d1ad19c345095575076767febd525013fc5782276a21069901815ea45" dependencies = [ "cipher", ] [[package]] name = "belt-ctr" -version = "0.2.0-rc.2" +version = "0.2.0-rc.3" dependencies = [ "belt-block", "cipher", @@ -58,7 +58,7 @@ dependencies = [ [[package]] name = "cbc" -version = "0.2.0-rc.2" +version = "0.2.0-rc.3" dependencies = [ "aes", "cipher", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "cfb-mode" -version = "0.9.0-rc.2" +version = "0.9.0-rc.3" dependencies = [ "aes", "belt-block", @@ -77,7 +77,7 @@ dependencies = [ [[package]] name = "cfb8" -version = "0.9.0-rc.2" +version = "0.9.0-rc.3" dependencies = [ "aes", "cipher", @@ -92,9 +92,9 @@ checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" [[package]] name = "cipher" -version = "0.5.0-rc.6" +version = "0.5.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba4d87abf4032a6d927f84b71af5086128a3349b929b4501c51a0fe0981a937" +checksum = "9002c8edb9b1e21938663da3489c9c4403bba2393997fb2ecbd401386c0e71dc" dependencies = [ "blobby", "block-buffer", @@ -103,6 +103,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "cpubits" +version = "0.1.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11a8c0210fa48ba3ea04ac1e9c6e72ae66009db3b1f1745635d4ff2e58eaadd0" + [[package]] name = "cpufeatures" version = "0.2.17" @@ -114,16 +120,16 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.2.0-rc.13" +version = "0.2.0-rc.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7722afd27468475c9b6063dc03a57ef2ca833816981619f8ebe64d38d207eef" +checksum = "6f8441110cea75afde0b89a8d796e2bc67b23432f5a9566cb15d9d365d91a2b0" dependencies = [ "hybrid-array", ] [[package]] name = "ctr" -version = "0.10.0-rc.2" +version = "0.10.0-rc.3" dependencies = [ "aes", "cipher", @@ -134,7 +140,7 @@ dependencies = [ [[package]] name = "cts" -version = "0.7.0-rc.2" +version = "0.7.0-rc.3" dependencies = [ "aes", "belt-block", @@ -160,7 +166,7 @@ dependencies = [ [[package]] name = "ige" -version = "0.2.0-rc.2" +version = "0.2.0-rc.3" dependencies = [ "aes", "cipher", @@ -179,9 +185,9 @@ dependencies = [ [[package]] name = "kuznyechik" -version = "0.9.0-rc.2" +version = "0.9.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f692f9023c6a17c2646c2751b169c9136d517718505531f2af18bd2b69780f13" +checksum = "1845d0271ee188d9eddbb2b027738da1e492fe5622d6f5353aea2e1bd40a62ff" dependencies = [ "cfg-if", "cipher", @@ -195,16 +201,16 @@ checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" [[package]] name = "magma" -version = "0.10.0-rc.2" +version = "0.10.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a050323412d2adf0ad86903bc188640b1abba7da0ab6450e035437fce7596d7" +checksum = "287314ef5d338202e7be522fbbae35cad5d1dff1b8cb079a395eec3a9e31104a" dependencies = [ "cipher", ] [[package]] name = "ofb" -version = "0.7.0-rc.2" +version = "0.7.0-rc.3" dependencies = [ "aes", "cipher", @@ -213,7 +219,7 @@ dependencies = [ [[package]] name = "pcbc" -version = "0.2.0-rc.2" +version = "0.2.0-rc.3" dependencies = [ "aes", "cipher", diff --git a/belt-ctr/Cargo.toml b/belt-ctr/Cargo.toml index f89413d..8308cdd 100644 --- a/belt-ctr/Cargo.toml +++ b/belt-ctr/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "belt-ctr" -version = "0.2.0-rc.2" +version = "0.2.0-rc.3" description = "CTR block mode of operation specified by the BelT standard" authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" @@ -13,13 +13,13 @@ keywords = ["crypto", "block-mode", "stream-cipher", "ciphers", "belt"] categories = ["cryptography", "no-std"] [dependencies] -cipher = { version = "0.5.0-rc.6", features = ["stream-wrapper"] } -belt-block = "0.2.0-rc.2" +cipher = { version = "0.5.0-rc.8", features = ["stream-wrapper"] } +belt-block = "0.2.0-rc.3" [dev-dependencies] hex-literal = "1" -belt-block = "0.2.0-rc.2" -cipher = { version = "0.5.0-rc.6", features = ["dev"] } +belt-block = "0.2.0-rc.3" +cipher = { version = "0.5.0-rc.8", features = ["dev"] } [features] alloc = ["cipher/alloc"] diff --git a/belt-ctr/src/lib.rs b/belt-ctr/src/lib.rs index f042abe..40a635b 100644 --- a/belt-ctr/src/lib.rs +++ b/belt-ctr/src/lib.rs @@ -15,8 +15,7 @@ use cipher::{ AlgorithmName, Block, BlockCipherDecrypt, BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, InOut, InnerIvInit, Iv, IvSizeUser, IvState, ParBlocks, ParBlocksSizeUser, StreamCipherBackend, StreamCipherClosure, StreamCipherCore, - StreamCipherCoreWrapper, StreamCipherSeekCore, array::Array, consts::U16, - crypto_common::InnerUser, + StreamCipherCoreWrapper, StreamCipherSeekCore, array::Array, common::InnerUser, consts::U16, }; use core::fmt; diff --git a/cbc/Cargo.toml b/cbc/Cargo.toml index d0d5027..7ff943e 100644 --- a/cbc/Cargo.toml +++ b/cbc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cbc" -version = "0.2.0-rc.2" +version = "0.2.0-rc.3" description = "Cipher Block Chaining (CBC) block cipher mode of operation" authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" @@ -13,11 +13,11 @@ keywords = ["crypto", "block-mode", "ciphers"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "0.5.0-rc.6" +cipher = "0.5.0-rc.8" [dev-dependencies] -aes = "0.9.0-rc.2" -cipher = { version = "0.5.0-rc.6", features = ["dev"] } +aes = "0.9.0-rc.4" +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/cbc/src/decrypt.rs b/cbc/src/decrypt.rs index 24e0bd8..664dbca 100644 --- a/cbc/src/decrypt.rs +++ b/cbc/src/decrypt.rs @@ -4,7 +4,7 @@ use cipher::{ BlockModeDecBackend, BlockModeDecClosure, BlockModeDecrypt, BlockSizeUser, InnerIvInit, Iv, IvState, ParBlocks, ParBlocksSizeUser, array::Array, - crypto_common::{BlockSizes, InnerUser, IvSizeUser}, + common::{BlockSizes, InnerUser, IvSizeUser}, inout::InOut, }; use core::fmt; diff --git a/cbc/src/encrypt.rs b/cbc/src/encrypt.rs index 183688c..01dc6ee 100644 --- a/cbc/src/encrypt.rs +++ b/cbc/src/encrypt.rs @@ -3,8 +3,8 @@ use cipher::{ AlgorithmName, Array, Block, BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt, BlockModeEncBackend, BlockModeEncClosure, BlockModeEncrypt, BlockSizeUser, InOut, InnerIvInit, Iv, IvSizeUser, IvState, ParBlocksSizeUser, + common::{BlockSizes, InnerUser}, consts::U1, - crypto_common::{BlockSizes, InnerUser}, }; use core::fmt; diff --git a/cfb-mode/Cargo.toml b/cfb-mode/Cargo.toml index 78b4d08..b256b8c 100644 --- a/cfb-mode/Cargo.toml +++ b/cfb-mode/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cfb-mode" -version = "0.9.0-rc.2" +version = "0.9.0-rc.3" description = "Cipher Feedback (CFB) block cipher mode of operation" authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" @@ -13,12 +13,12 @@ keywords = ["crypto", "block-mode", "stream-cipher", "ciphers"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "0.5.0-rc.6" +cipher = "0.5.0-rc.8" [dev-dependencies] -aes = "0.9.0-rc.2" -belt-block = "0.2.0-rc.2" -cipher = { version = "0.5.0-rc.6", features = ["dev"] } +aes = "0.9.0-rc.4" +belt-block = "0.2.0-rc.3" +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/cfb-mode/src/decrypt.rs b/cfb-mode/src/decrypt.rs index ada1a91..2775d32 100644 --- a/cfb-mode/src/decrypt.rs +++ b/cfb-mode/src/decrypt.rs @@ -3,7 +3,7 @@ use cipher::{ BlockCipherEncClosure, BlockCipherEncrypt, BlockModeDecBackend, BlockModeDecClosure, BlockModeDecrypt, BlockSizeUser, InOut, InnerIvInit, Iv, IvSizeUser, IvState, ParBlocks, ParBlocksSizeUser, - crypto_common::{BlockSizes, InnerUser}, + common::{BlockSizes, InnerUser}, typenum::Unsigned, }; use core::fmt; diff --git a/cfb-mode/src/encrypt.rs b/cfb-mode/src/encrypt.rs index e148617..5933a27 100644 --- a/cfb-mode/src/encrypt.rs +++ b/cfb-mode/src/encrypt.rs @@ -4,8 +4,8 @@ use cipher::{ BlockModeEncrypt, BlockSizeUser, InOut, InnerIvInit, Iv, IvSizeUser, IvState, ParBlocksSizeUser, array::Array, + common::{BlockSizes, InnerUser}, consts::U1, - crypto_common::{BlockSizes, InnerUser}, }; use core::fmt; diff --git a/cfb-mode/src/encrypt/buf.rs b/cfb-mode/src/encrypt/buf.rs index 18f688a..6e9397f 100644 --- a/cfb-mode/src/encrypt/buf.rs +++ b/cfb-mode/src/encrypt/buf.rs @@ -1,7 +1,7 @@ use super::xor_set1; use cipher::{ - AlgorithmName, Block, BlockCipherEncrypt, InnerIvInit, Iv, IvSizeUser, - crypto_common::InnerUser, typenum::Unsigned, + AlgorithmName, Block, BlockCipherEncrypt, InnerIvInit, Iv, IvSizeUser, common::InnerUser, + typenum::Unsigned, }; use core::fmt; diff --git a/cfb8/Cargo.toml b/cfb8/Cargo.toml index aefe2c4..9de13c8 100644 --- a/cfb8/Cargo.toml +++ b/cfb8/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cfb8" -version = "0.9.0-rc.2" +version = "0.9.0-rc.3" description = "Cipher Feedback with eight bit feedback (CFB-8) block cipher mode of operation" authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" @@ -13,11 +13,11 @@ keywords = ["crypto", "block-mode", "stream-cipher", "ciphers"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "0.5.0-rc.6" +cipher = "0.5.0-rc.8" [dev-dependencies] -aes = "0.9.0-rc.2" -cipher = { version = "0.5.0-rc.6", features = ["dev"] } +aes = "0.9.0-rc.4" +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/cfb8/src/decrypt.rs b/cfb8/src/decrypt.rs index 595076f..1fc89cf 100644 --- a/cfb8/src/decrypt.rs +++ b/cfb8/src/decrypt.rs @@ -3,8 +3,8 @@ use cipher::{ BlockCipherEncrypt, BlockModeDecBackend, BlockModeDecClosure, BlockModeDecrypt, BlockSizeUser, InnerIvInit, Iv, IvState, ParBlocksSizeUser, array::Array, + common::{BlockSizes, InnerUser, IvSizeUser}, consts::U1, - crypto_common::{BlockSizes, InnerUser, IvSizeUser}, inout::InOut, }; use core::fmt; diff --git a/cfb8/src/encrypt.rs b/cfb8/src/encrypt.rs index 360fc64..3d2c556 100644 --- a/cfb8/src/encrypt.rs +++ b/cfb8/src/encrypt.rs @@ -3,8 +3,8 @@ use cipher::{ BlockCipherEncrypt, BlockModeEncBackend, BlockModeEncClosure, BlockModeEncrypt, BlockSizeUser, InnerIvInit, Iv, IvState, ParBlocksSizeUser, array::Array, + common::{BlockSizes, InnerUser, IvSizeUser}, consts::U1, - crypto_common::{BlockSizes, InnerUser, IvSizeUser}, inout::InOut, }; use core::fmt; diff --git a/ctr/Cargo.toml b/ctr/Cargo.toml index 422fee3..db55dd3 100644 --- a/ctr/Cargo.toml +++ b/ctr/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ctr" -version = "0.10.0-rc.2" +version = "0.10.0-rc.3" description = "CTR block modes of operation" authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" @@ -13,13 +13,13 @@ keywords = ["crypto", "block-mode", "stream-cipher", "ciphers"] categories = ["cryptography", "no-std"] [dependencies] -cipher = { version = "0.5.0-rc.6", features = ["stream-wrapper"] } +cipher = { version = "0.5.0-rc.8", features = ["stream-wrapper"] } [dev-dependencies] -aes = "0.9.0-rc.2" -magma = "0.10.0-rc.2" -kuznyechik = "0.9.0-rc.2" -cipher = { version = "0.5.0-rc.6", features = ["dev"] } +aes = "0.9.0-rc.4" +magma = "0.10.0-rc.3" +kuznyechik = "0.9.0-rc.3" +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/ctr/src/ctr_core.rs b/ctr/src/ctr_core.rs index 629191a..cf191e2 100644 --- a/ctr/src/ctr_core.rs +++ b/ctr/src/ctr_core.rs @@ -4,7 +4,7 @@ use cipher::{ BlockSizeUser, InnerIvInit, Iv, IvState, ParBlocks, ParBlocksSizeUser, StreamCipherBackend, StreamCipherClosure, StreamCipherCore, StreamCipherSeekCore, array::ArraySize, - crypto_common::{BlockSizes, InnerUser, IvSizeUser}, + common::{BlockSizes, InnerUser, IvSizeUser}, }; use core::fmt; diff --git a/cts/Cargo.toml b/cts/Cargo.toml index 3498d15..d553121 100644 --- a/cts/Cargo.toml +++ b/cts/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cts" -version = "0.7.0-rc.2" +version = "0.7.0-rc.3" description = "Generic implementation of the ciphertext stealing block modes of operation" authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" @@ -13,13 +13,13 @@ keywords = ["crypto", "block-mode", "ciphers"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "0.5.0-rc.6" +cipher = "0.5.0-rc.8" [dev-dependencies] -cipher = { version = "0.5.0-rc.6", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" -aes = "0.9.0-rc.2" -belt-block = "0.2.0-rc.2" +aes = "0.9.0-rc.4" +belt-block = "0.2.0-rc.3" [package.metadata.docs.rs] all-features = true diff --git a/cts/src/cbc_cs1.rs b/cts/src/cbc_cs1.rs index 2790a4c..12cd81c 100644 --- a/cts/src/cbc_cs1.rs +++ b/cts/src/cbc_cs1.rs @@ -3,7 +3,7 @@ use cipher::{ Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt, BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, InnerIvInit, IvSizeUser, array::Array, - crypto_common::{BlockSizes, InnerUser}, + common::{BlockSizes, InnerUser}, inout::InOutBuf, typenum::Unsigned, }; diff --git a/cts/src/cbc_cs2.rs b/cts/src/cbc_cs2.rs index 1f64d58..458136e 100644 --- a/cts/src/cbc_cs2.rs +++ b/cts/src/cbc_cs2.rs @@ -3,7 +3,7 @@ use cipher::{ Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt, BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, InnerIvInit, IvSizeUser, array::Array, - crypto_common::{BlockSizes, InnerUser}, + common::{BlockSizes, InnerUser}, inout::InOutBuf, typenum::Unsigned, }; diff --git a/cts/src/cbc_cs3.rs b/cts/src/cbc_cs3.rs index ed16227..07fe70d 100644 --- a/cts/src/cbc_cs3.rs +++ b/cts/src/cbc_cs3.rs @@ -3,7 +3,7 @@ use cipher::{ Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt, BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, InnerIvInit, IvSizeUser, array::Array, - crypto_common::{BlockSizes, InnerUser}, + common::{BlockSizes, InnerUser}, inout::InOutBuf, typenum::Unsigned, }; diff --git a/cts/src/ecb_cs1.rs b/cts/src/ecb_cs1.rs index b7b12be..7e5e8e6 100644 --- a/cts/src/ecb_cs1.rs +++ b/cts/src/ecb_cs1.rs @@ -4,7 +4,7 @@ use crate::{Decrypt, Encrypt, Error, ecb_dec, ecb_enc}; use cipher::{ Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt, BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, IvSizeUser, - crypto_common::{BlockSizes, InnerInit, InnerUser}, + common::{BlockSizes, InnerInit, InnerUser}, inout::InOutBuf, typenum::Unsigned, }; diff --git a/cts/src/ecb_cs2.rs b/cts/src/ecb_cs2.rs index 06db147..66ba586 100644 --- a/cts/src/ecb_cs2.rs +++ b/cts/src/ecb_cs2.rs @@ -4,7 +4,7 @@ use crate::{Decrypt, Encrypt, Error, ecb_dec, ecb_enc}; use cipher::{ Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt, BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, IvSizeUser, - crypto_common::{BlockSizes, InnerInit, InnerUser}, + common::{BlockSizes, InnerInit, InnerUser}, inout::InOutBuf, typenum::Unsigned, }; diff --git a/cts/src/ecb_cs3.rs b/cts/src/ecb_cs3.rs index 91a96e4..061f56a 100644 --- a/cts/src/ecb_cs3.rs +++ b/cts/src/ecb_cs3.rs @@ -4,7 +4,7 @@ use crate::{Decrypt, Encrypt, Error, ecb_dec, ecb_enc}; use cipher::{ Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt, BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, IvSizeUser, - crypto_common::{BlockSizes, InnerInit, InnerUser}, + common::{BlockSizes, InnerInit, InnerUser}, inout::InOutBuf, typenum::Unsigned, }; diff --git a/cts/tests/aes128_roundtrip.rs b/cts/tests/aes128_roundtrip.rs index 4c27899..10d9747 100644 --- a/cts/tests/aes128_roundtrip.rs +++ b/cts/tests/aes128_roundtrip.rs @@ -1,7 +1,7 @@ use aes::Aes128; use cts::{ Decrypt, Encrypt, - cipher::{InnerIvInit, KeyInit, crypto_common::InnerInit}, + cipher::{InnerIvInit, KeyInit, common::InnerInit}, }; const KEY: [u8; 16] = [0x42; 16]; diff --git a/ige/Cargo.toml b/ige/Cargo.toml index 22d732e..a3dacd2 100644 --- a/ige/Cargo.toml +++ b/ige/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ige" -version = "0.2.0-rc.2" +version = "0.2.0-rc.3" description = "Infinite Garble Extension (IGE) block cipher mode of operation" authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" @@ -13,11 +13,11 @@ keywords = ["crypto", "block-mode", "ciphers"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "0.5.0-rc.6" +cipher = "0.5.0-rc.8" [dev-dependencies] -aes = "0.9.0-rc.2" -cipher = { version = "0.5.0-rc.6", features = ["dev"] } +aes = "0.9.0-rc.4" +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/ige/src/decrypt.rs b/ige/src/decrypt.rs index c823d65..4be4229 100644 --- a/ige/src/decrypt.rs +++ b/ige/src/decrypt.rs @@ -4,7 +4,7 @@ use cipher::{ BlockModeDecBackend, BlockModeDecClosure, BlockModeDecrypt, BlockSizeUser, InnerIvInit, Iv, IvState, ParBlocksSizeUser, array::{Array, ArraySize}, - crypto_common::{BlockSizes, InnerUser, IvSizeUser}, + common::{BlockSizes, InnerUser, IvSizeUser}, inout::InOut, typenum::{U1, Unsigned}, }; diff --git a/ige/src/encrypt.rs b/ige/src/encrypt.rs index 1a09880..7cd1bf1 100644 --- a/ige/src/encrypt.rs +++ b/ige/src/encrypt.rs @@ -4,7 +4,7 @@ use cipher::{ BlockModeEncBackend, BlockModeEncClosure, BlockModeEncrypt, BlockSizeUser, InnerIvInit, Iv, IvState, ParBlocksSizeUser, array::{Array, ArraySize}, - crypto_common::{BlockSizes, InnerUser, IvSizeUser}, + common::{BlockSizes, InnerUser, IvSizeUser}, inout::InOut, typenum::{U1, Unsigned}, }; diff --git a/ofb/Cargo.toml b/ofb/Cargo.toml index 91c4dc4..ea3788d 100644 --- a/ofb/Cargo.toml +++ b/ofb/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ofb" -version = "0.7.0-rc.2" +version = "0.7.0-rc.3" description = "Output Feedback (OFB) block cipher mode of operation" authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" @@ -13,11 +13,11 @@ keywords = ["crypto", "block-mode", "stream-cipher", "ciphers"] categories = ["cryptography", "no-std"] [dependencies] -cipher = { version = "0.5.0-rc.6", features = ["stream-wrapper"] } +cipher = { version = "0.5.0-rc.8", features = ["stream-wrapper"] } [dev-dependencies] -aes = "0.9.0-rc.2" -cipher = { version = "0.5.0-rc.6", features = ["dev"] } +aes = "0.9.0-rc.4" +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/ofb/src/lib.rs b/ofb/src/lib.rs index bce6f81..ee18993 100644 --- a/ofb/src/lib.rs +++ b/ofb/src/lib.rs @@ -69,8 +69,8 @@ use cipher::{ BlockModeEncClosure, BlockModeEncrypt, BlockSizeUser, InOut, InnerIvInit, Iv, IvState, ParBlocksSizeUser, StreamCipherBackend, StreamCipherClosure, StreamCipherCore, StreamCipherCoreWrapper, + common::{BlockSizes, InnerUser, IvSizeUser}, consts::U1, - crypto_common::{BlockSizes, InnerUser, IvSizeUser}, }; use core::fmt; diff --git a/pcbc/Cargo.toml b/pcbc/Cargo.toml index 5e9bc72..1f340c6 100644 --- a/pcbc/Cargo.toml +++ b/pcbc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pcbc" -version = "0.2.0-rc.2" +version = "0.2.0-rc.3" description = "Propagating Cipher Block Chaining (PCBC) block cipher mode of operation" authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" @@ -13,11 +13,11 @@ keywords = ["crypto", "block-mode", "ciphers"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "0.5.0-rc.6" +cipher = "0.5.0-rc.8" [dev-dependencies] -aes = "0.9.0-rc.2" -cipher = { version = "0.5.0-rc.6", features = ["dev"] } +aes = "0.9.0-rc.4" +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/pcbc/src/decrypt.rs b/pcbc/src/decrypt.rs index 4813661..02c445d 100644 --- a/pcbc/src/decrypt.rs +++ b/pcbc/src/decrypt.rs @@ -4,8 +4,8 @@ use cipher::{ BlockModeDecBackend, BlockModeDecClosure, BlockModeDecrypt, BlockSizeUser, InnerIvInit, Iv, IvState, ParBlocksSizeUser, array::Array, + common::{BlockSizes, InnerUser, IvSizeUser}, consts::U1, - crypto_common::{BlockSizes, InnerUser, IvSizeUser}, inout::InOut, }; use core::fmt; diff --git a/pcbc/src/encrypt.rs b/pcbc/src/encrypt.rs index a42160f..5897b9e 100644 --- a/pcbc/src/encrypt.rs +++ b/pcbc/src/encrypt.rs @@ -4,8 +4,8 @@ use cipher::{ BlockModeEncBackend, BlockModeEncClosure, BlockModeEncrypt, BlockSizeUser, InnerIvInit, Iv, IvState, ParBlocksSizeUser, array::Array, + common::{BlockSizes, InnerUser, IvSizeUser}, consts::U1, - crypto_common::{BlockSizes, InnerUser, IvSizeUser}, inout::InOut, }; use core::fmt;