diff --git a/Cargo.lock b/Cargo.lock index 0368ee65..3d895f0e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -755,9 +755,9 @@ dependencies = [ [[package]] name = "hybrid-array" -version = "0.2.0-rc.3" +version = "0.2.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8856b3db5eb76328f03589feb25c7a3166bfa0ae3b38b1408d546b097fa7947" +checksum = "18e63b66aee2df5599ba69b17a48113dfc68d2e143ea387ef836509e433bbd7e" dependencies = [ "typenum", "zeroize", diff --git a/cipher/src/stream_core.rs b/cipher/src/stream_core.rs index 84d21350..c121ca46 100644 --- a/cipher/src/stream_core.rs +++ b/cipher/src/stream_core.rs @@ -1,9 +1,5 @@ use crate::{ParBlocks, ParBlocksSizeUser, StreamCipherError}; -use crypto_common::{ - array::{slice_as_chunks_mut, Array}, - typenum::Unsigned, - Block, BlockSizeUser, BlockSizes, -}; +use crypto_common::{array::Array, typenum::Unsigned, Block, BlockSizeUser, BlockSizes}; use inout::{InOut, InOutBuf}; /// Trait implemented by stream cipher backends. @@ -213,7 +209,7 @@ impl<'a, BS: BlockSizes> StreamClosure for WriteBlocksCtx<'a, BS> { #[inline(always)] fn call>(self, backend: &mut B) { if B::ParBlocksSize::USIZE > 1 { - let (chunks, tail) = slice_as_chunks_mut(self.blocks); + let (chunks, tail) = Array::slice_as_chunks_mut(self.blocks); for chunk in chunks { backend.gen_par_ks_blocks(chunk); } diff --git a/crypto-common/Cargo.toml b/crypto-common/Cargo.toml index 86bd2f04..36de6fc9 100644 --- a/crypto-common/Cargo.toml +++ b/crypto-common/Cargo.toml @@ -13,7 +13,7 @@ keywords = ["crypto", "traits"] categories = ["cryptography", "no-std"] [dependencies] -hybrid-array = "0.2.0-rc.0" +hybrid-array = "0.2.0-rc.4" # optional dependencies rand_core = { version = "0.6.4", optional = true } diff --git a/universal-hash/src/lib.rs b/universal-hash/src/lib.rs index 0cfa03a5..44b59686 100644 --- a/universal-hash/src/lib.rs +++ b/universal-hash/src/lib.rs @@ -73,7 +73,7 @@ pub trait UniversalHash: BlockSizeUser + Sized { fn call>(self, backend: &mut B) { let pb = B::ParBlocksSize::USIZE; if pb > 1 { - let (par_blocks, tail) = array::slice_as_chunks(self.blocks); + let (par_blocks, tail) = Array::slice_as_chunks(self.blocks); for par_block in par_blocks { backend.proc_par_blocks(par_block); } @@ -99,7 +99,7 @@ pub trait UniversalHash: BlockSizeUser + Sized { /// Message Authentication Codes (MACs) based on universal hashing. #[inline] fn update_padded(&mut self, data: &[u8]) { - let (blocks, tail) = array::slice_as_chunks(data); + let (blocks, tail) = Array::slice_as_chunks(data); self.update(blocks);