Skip to content

Bump cipher to v0.5.1 #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
newpavlov merged 2 commits into from
Feb 25, 2026
Merged

Bump cipher to v0.5.1 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5b8ee5
Bump `cipher` to v0.5.1
newpavlov Feb 24, 2026
830f78a
Use published versions of `cipher` and `crypto-common`
newpavlov Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions cbc/src/decrypt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use cipher::{
AlgorithmName, Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt,
BlockModeDecBackend, BlockModeDecClosure, BlockModeDecrypt, BlockSizeUser, InnerIvInit, Iv,
IvState, ParBlocks, ParBlocksSizeUser,
array::Array,
common::{BlockSizes, InnerUser, IvSizeUser},
array::{Array, ArraySize},
common::{InnerUser, IvSizeUser},
inout::InOut,
};
use core::fmt;
Expand Down Expand Up @@ -35,7 +35,7 @@ where
fn decrypt_with_backend(&mut self, f: impl BlockModeDecClosure<BlockSize = Self::BlockSize>) {
struct Closure<'a, BS, BC>
where
BS: BlockSizes,
BS: ArraySize,
BC: BlockModeDecClosure<BlockSize = BS>,
{
iv: &'a mut Array<u8, BS>,
Expand All @@ -44,15 +44,15 @@ where

impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
where
BS: BlockSizes,
BS: ArraySize,
BC: BlockModeDecClosure<BlockSize = BS>,
{
type BlockSize = BS;
}

impl<BS, BC> BlockCipherDecClosure for Closure<'_, BS, BC>
where
BS: BlockSizes,
BS: ArraySize,
BC: BlockModeDecClosure<BlockSize = BS>,
{
#[inline(always)]
Expand Down Expand Up @@ -141,7 +141,7 @@ impl<C: BlockCipherDecrypt + ZeroizeOnDrop> ZeroizeOnDrop for Decryptor<C> {}

struct Backend<'a, BS, BK>
where
BS: BlockSizes,
BS: ArraySize,
BK: BlockCipherDecBackend<BlockSize = BS>,
{
iv: &'a mut Array<u8, BS>,
Expand All @@ -150,23 +150,23 @@ where

impl<BS, BK> BlockSizeUser for Backend<'_, BS, BK>
where
BS: BlockSizes,
BS: ArraySize,
BK: BlockCipherDecBackend<BlockSize = BS>,
{
type BlockSize = BS;
}

impl<BS, BK> ParBlocksSizeUser for Backend<'_, BS, BK>
where
BS: BlockSizes,
BS: ArraySize,
BK: BlockCipherDecBackend<BlockSize = BS>,
{
type ParBlocksSize = BK::ParBlocksSize;
}

impl<BS, BK> BlockModeDecBackend for Backend<'_, BS, BK>
where
BS: BlockSizes,
BS: ArraySize,
BK: BlockCipherDecBackend<BlockSize = BS>,
{
#[inline(always)]
Expand Down
18 changes: 8 additions & 10 deletions cbc/src/encrypt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ use crate::xor;
use cipher::{
AlgorithmName, Array, Block, BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt,
BlockModeEncBackend, BlockModeEncClosure, BlockModeEncrypt, BlockSizeUser, InOut, InnerIvInit,
Iv, IvSizeUser, IvState, ParBlocksSizeUser,
common::{BlockSizes, InnerUser},
consts::U1,
Iv, IvSizeUser, IvState, ParBlocksSizeUser, array::ArraySize, common::InnerUser, consts::U1,
};
use core::fmt;

Expand Down Expand Up @@ -71,7 +69,7 @@ where
fn encrypt_with_backend(&mut self, f: impl BlockModeEncClosure<BlockSize = Self::BlockSize>) {
struct Closure<'a, BS, BC>
where
BS: BlockSizes,
BS: ArraySize,
BC: BlockModeEncClosure<BlockSize = BS>,
{
iv: &'a mut Array<u8, BS>,
Expand All @@ -80,15 +78,15 @@ where

impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
where
BS: BlockSizes,
BS: ArraySize,
BC: BlockModeEncClosure<BlockSize = BS>,
{
type BlockSize = BS;
}

impl<BS, BC> BlockCipherEncClosure for Closure<'_, BS, BC>
where
BS: BlockSizes,
BS: ArraySize,
BC: BlockModeEncClosure<BlockSize = BS>,
{
#[inline(always)]
Expand Down Expand Up @@ -140,7 +138,7 @@ impl<C: BlockCipherEncrypt + ZeroizeOnDrop> ZeroizeOnDrop for Encryptor<C> {}

struct Backend<'a, BS, BK>
where
BS: BlockSizes,
BS: ArraySize,
BK: BlockCipherEncBackend<BlockSize = BS>,
{
iv: &'a mut Array<u8, BS>,
Expand All @@ -149,23 +147,23 @@ where

impl<BS, BK> BlockSizeUser for Backend<'_, BS, BK>
where
BS: BlockSizes,
BS: ArraySize,
BK: BlockCipherEncBackend<BlockSize = BS>,
{
type BlockSize = BS;
}

impl<BS, BK> ParBlocksSizeUser for Backend<'_, BS, BK>
where
BS: BlockSizes,
BS: ArraySize,
BK: BlockCipherEncBackend<BlockSize = BS>,
{
type ParBlocksSize = U1;
}

impl<BS, BK> BlockModeEncBackend for Backend<'_, BS, BK>
where
BS: BlockSizes,
BS: ArraySize,
BK: BlockCipherEncBackend<BlockSize = BS>,
{
#[inline(always)]
Expand Down
17 changes: 9 additions & 8 deletions cfb-mode/src/decrypt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ use cipher::{
AlgorithmName, Array, Block, BlockCipherDecrypt, BlockCipherEncBackend, BlockCipherEncClosure,
BlockCipherEncrypt, BlockModeDecBackend, BlockModeDecClosure, BlockModeDecrypt, BlockSizeUser,
InnerIvInit, Iv, IvSizeUser, IvState, ParBlocks, ParBlocksSizeUser,
common::{BlockSizes, InnerUser},
array::ArraySize,
common::InnerUser,
inout::{InOut, InOutBuf, NotEqualError},
typenum::Unsigned,
};
Expand Down Expand Up @@ -151,7 +152,7 @@ where
/// create respective [`CbcDecryptBackend`] based on it.
struct Closure<'a, BS, BC>
where
BS: BlockSizes,
BS: ArraySize,
BC: BlockModeDecClosure<BlockSize = BS>,
{
iv: &'a mut Array<u8, BS>,
Expand All @@ -160,15 +161,15 @@ where

impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
where
BS: BlockSizes,
BS: ArraySize,
BC: BlockModeDecClosure<BlockSize = BS>,
{
type BlockSize = BS;
}

impl<BS, BC> BlockCipherEncClosure for Closure<'_, BS, BC>
where
BS: BlockSizes,
BS: ArraySize,
BC: BlockModeDecClosure<BlockSize = BS>,
{
#[inline(always)]
Expand Down Expand Up @@ -289,7 +290,7 @@ impl<C: BlockCipherEncrypt + ZeroizeOnDrop> ZeroizeOnDrop for Decryptor<C> {}

struct CbcDecryptBackend<'a, BS, BK>
where
BS: BlockSizes,
BS: ArraySize,
BK: BlockCipherEncBackend<BlockSize = BS>,
{
iv: &'a mut Array<u8, BS>,
Expand All @@ -298,23 +299,23 @@ where

impl<BS, BK> BlockSizeUser for CbcDecryptBackend<'_, BS, BK>
where
BS: BlockSizes,
BS: ArraySize,
BK: BlockCipherEncBackend<BlockSize = BS>,
{
type BlockSize = BS;
}

impl<BS, BK> ParBlocksSizeUser for CbcDecryptBackend<'_, BS, BK>
where
BS: BlockSizes,
BS: ArraySize,
BK: BlockCipherEncBackend<BlockSize = BS>,
{
type ParBlocksSize = BK::ParBlocksSize;
}

impl<BS, BK> BlockModeDecBackend for CbcDecryptBackend<'_, BS, BK>
where
BS: BlockSizes,
BS: ArraySize,
BK: BlockCipherEncBackend<BlockSize = BS>,
{
#[inline(always)]
Expand Down
18 changes: 9 additions & 9 deletions cfb-mode/src/encrypt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use cipher::{
AlgorithmName, Block, BlockCipherDecrypt, BlockCipherEncBackend, BlockCipherEncClosure,
BlockCipherEncrypt, BlockModeEncBackend, BlockModeEncClosure, BlockModeEncrypt, BlockSizeUser,
InnerIvInit, Iv, IvSizeUser, IvState, ParBlocksSizeUser,
array::Array,
common::{BlockSizes, InnerUser},
array::{Array, ArraySize},
common::InnerUser,
consts::U1,
inout::{InOut, InOutBuf, NotEqualError},
};
Expand Down Expand Up @@ -40,7 +40,7 @@ where
/// respective `Backend` based on it.
struct Closure<'a, BS, BC>
where
BS: BlockSizes,
BS: ArraySize,
BC: BlockModeEncClosure<BlockSize = BS>,
{
iv: &'a mut Array<u8, BS>,
Expand All @@ -49,15 +49,15 @@ where

impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
where
BS: BlockSizes,
BS: ArraySize,
BC: BlockModeEncClosure<BlockSize = BS>,
{
type BlockSize = BS;
}

impl<BS, BC> BlockCipherEncClosure for Closure<'_, BS, BC>
where
BS: BlockSizes,
BS: ArraySize,
BC: BlockModeEncClosure<BlockSize = BS>,
{
#[inline(always)]
Expand Down Expand Up @@ -178,7 +178,7 @@ impl<C: BlockCipherEncrypt + ZeroizeOnDrop> ZeroizeOnDrop for Encryptor<C> {}

struct CbcEncryptBackend<'a, BS, BK>
where
BS: BlockSizes,
BS: ArraySize,
BK: BlockCipherEncBackend<BlockSize = BS>,
{
iv: &'a mut Array<u8, BS>,
Expand All @@ -187,23 +187,23 @@ where

impl<BS, BK> BlockSizeUser for CbcEncryptBackend<'_, BS, BK>
where
BS: BlockSizes,
BS: ArraySize,
BK: BlockCipherEncBackend<BlockSize = BS>,
{
type BlockSize = BS;
}

impl<BS, BK> ParBlocksSizeUser for CbcEncryptBackend<'_, BS, BK>
where
BS: BlockSizes,
BS: ArraySize,
BK: BlockCipherEncBackend<BlockSize = BS>,
{
type ParBlocksSize = U1;
}

impl<BS, BK> BlockModeEncBackend for CbcEncryptBackend<'_, BS, BK>
where
BS: BlockSizes,
BS: ArraySize,
BK: BlockCipherEncBackend<BlockSize = BS>,
{
#[inline(always)]
Expand Down
Loading
Loading