Skip to content

Commit 3dbbcf1

Browse files
newpavlovnewpavlov
authored
Bump cipher to v0.5.1 (#106)
1 parent 9745ef6 commit 3dbbcf1

19 files changed

Lines changed: 161 additions & 158 deletions

File tree

‎Cargo.lock‎

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cbc/src/decrypt.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use cipher::{
33
AlgorithmName, Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt,
44
BlockModeDecBackend, BlockModeDecClosure, BlockModeDecrypt, BlockSizeUser, InnerIvInit, Iv,
55
IvState, ParBlocks, ParBlocksSizeUser,
6-
array::Array,
7-
common::{BlockSizes, InnerUser, IvSizeUser},
6+
array::{Array, ArraySize},
7+
common::{InnerUser, IvSizeUser},
88
inout::InOut,
99
};
1010
use core::fmt;
@@ -35,7 +35,7 @@ where
3535
fn decrypt_with_backend(&mut self, f: impl BlockModeDecClosure<BlockSize = Self::BlockSize>) {
3636
struct Closure<'a, BS, BC>
3737
where
38-
BS: BlockSizes,
38+
BS: ArraySize,
3939
BC: BlockModeDecClosure<BlockSize = BS>,
4040
{
4141
iv: &'a mut Array<u8, BS>,
@@ -44,15 +44,15 @@ where
4444

4545
impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
4646
where
47-
BS: BlockSizes,
47+
BS: ArraySize,
4848
BC: BlockModeDecClosure<BlockSize = BS>,
4949
{
5050
type BlockSize = BS;
5151
}
5252

5353
impl<BS, BC> BlockCipherDecClosure for Closure<'_, BS, BC>
5454
where
55-
BS: BlockSizes,
55+
BS: ArraySize,
5656
BC: BlockModeDecClosure<BlockSize = BS>,
5757
{
5858
#[inline(always)]
@@ -141,7 +141,7 @@ impl<C: BlockCipherDecrypt + ZeroizeOnDrop> ZeroizeOnDrop for Decryptor<C> {}
141141

142142
struct Backend<'a, BS, BK>
143143
where
144-
BS: BlockSizes,
144+
BS: ArraySize,
145145
BK: BlockCipherDecBackend<BlockSize = BS>,
146146
{
147147
iv: &'a mut Array<u8, BS>,
@@ -150,23 +150,23 @@ where
150150

151151
impl<BS, BK> BlockSizeUser for Backend<'_, BS, BK>
152152
where
153-
BS: BlockSizes,
153+
BS: ArraySize,
154154
BK: BlockCipherDecBackend<BlockSize = BS>,
155155
{
156156
type BlockSize = BS;
157157
}
158158

159159
impl<BS, BK> ParBlocksSizeUser for Backend<'_, BS, BK>
160160
where
161-
BS: BlockSizes,
161+
BS: ArraySize,
162162
BK: BlockCipherDecBackend<BlockSize = BS>,
163163
{
164164
type ParBlocksSize = BK::ParBlocksSize;
165165
}
166166

167167
impl<BS, BK> BlockModeDecBackend for Backend<'_, BS, BK>
168168
where
169-
BS: BlockSizes,
169+
BS: ArraySize,
170170
BK: BlockCipherDecBackend<BlockSize = BS>,
171171
{
172172
#[inline(always)]

‎cbc/src/encrypt.rs‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ use crate::xor;
22
use cipher::{
33
AlgorithmName, Array, Block, BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt,
44
BlockModeEncBackend, BlockModeEncClosure, BlockModeEncrypt, BlockSizeUser, InOut, InnerIvInit,
5-
Iv, IvSizeUser, IvState, ParBlocksSizeUser,
6-
common::{BlockSizes, InnerUser},
7-
consts::U1,
5+
Iv, IvSizeUser, IvState, ParBlocksSizeUser, array::ArraySize, common::InnerUser, consts::U1,
86
};
97
use core::fmt;
108

@@ -71,7 +69,7 @@ where
7169
fn encrypt_with_backend(&mut self, f: impl BlockModeEncClosure<BlockSize = Self::BlockSize>) {
7270
struct Closure<'a, BS, BC>
7371
where
74-
BS: BlockSizes,
72+
BS: ArraySize,
7573
BC: BlockModeEncClosure<BlockSize = BS>,
7674
{
7775
iv: &'a mut Array<u8, BS>,
@@ -80,15 +78,15 @@ where
8078

8179
impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
8280
where
83-
BS: BlockSizes,
81+
BS: ArraySize,
8482
BC: BlockModeEncClosure<BlockSize = BS>,
8583
{
8684
type BlockSize = BS;
8785
}
8886

8987
impl<BS, BC> BlockCipherEncClosure for Closure<'_, BS, BC>
9088
where
91-
BS: BlockSizes,
89+
BS: ArraySize,
9290
BC: BlockModeEncClosure<BlockSize = BS>,
9391
{
9492
#[inline(always)]
@@ -140,7 +138,7 @@ impl<C: BlockCipherEncrypt + ZeroizeOnDrop> ZeroizeOnDrop for Encryptor<C> {}
140138

141139
struct Backend<'a, BS, BK>
142140
where
143-
BS: BlockSizes,
141+
BS: ArraySize,
144142
BK: BlockCipherEncBackend<BlockSize = BS>,
145143
{
146144
iv: &'a mut Array<u8, BS>,
@@ -149,23 +147,23 @@ where
149147

150148
impl<BS, BK> BlockSizeUser for Backend<'_, BS, BK>
151149
where
152-
BS: BlockSizes,
150+
BS: ArraySize,
153151
BK: BlockCipherEncBackend<BlockSize = BS>,
154152
{
155153
type BlockSize = BS;
156154
}
157155

158156
impl<BS, BK> ParBlocksSizeUser for Backend<'_, BS, BK>
159157
where
160-
BS: BlockSizes,
158+
BS: ArraySize,
161159
BK: BlockCipherEncBackend<BlockSize = BS>,
162160
{
163161
type ParBlocksSize = U1;
164162
}
165163

166164
impl<BS, BK> BlockModeEncBackend for Backend<'_, BS, BK>
167165
where
168-
BS: BlockSizes,
166+
BS: ArraySize,
169167
BK: BlockCipherEncBackend<BlockSize = BS>,
170168
{
171169
#[inline(always)]

‎cfb-mode/src/decrypt.rs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ use cipher::{
22
AlgorithmName, Array, Block, BlockCipherDecrypt, BlockCipherEncBackend, BlockCipherEncClosure,
33
BlockCipherEncrypt, BlockModeDecBackend, BlockModeDecClosure, BlockModeDecrypt, BlockSizeUser,
44
InnerIvInit, Iv, IvSizeUser, IvState, ParBlocks, ParBlocksSizeUser,
5-
common::{BlockSizes, InnerUser},
5+
array::ArraySize,
6+
common::InnerUser,
67
inout::{InOut, InOutBuf, NotEqualError},
78
typenum::Unsigned,
89
};
@@ -151,7 +152,7 @@ where
151152
/// create respective [`CbcDecryptBackend`] based on it.
152153
struct Closure<'a, BS, BC>
153154
where
154-
BS: BlockSizes,
155+
BS: ArraySize,
155156
BC: BlockModeDecClosure<BlockSize = BS>,
156157
{
157158
iv: &'a mut Array<u8, BS>,
@@ -160,15 +161,15 @@ where
160161

161162
impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
162163
where
163-
BS: BlockSizes,
164+
BS: ArraySize,
164165
BC: BlockModeDecClosure<BlockSize = BS>,
165166
{
166167
type BlockSize = BS;
167168
}
168169

169170
impl<BS, BC> BlockCipherEncClosure for Closure<'_, BS, BC>
170171
where
171-
BS: BlockSizes,
172+
BS: ArraySize,
172173
BC: BlockModeDecClosure<BlockSize = BS>,
173174
{
174175
#[inline(always)]
@@ -289,7 +290,7 @@ impl<C: BlockCipherEncrypt + ZeroizeOnDrop> ZeroizeOnDrop for Decryptor<C> {}
289290

290291
struct CbcDecryptBackend<'a, BS, BK>
291292
where
292-
BS: BlockSizes,
293+
BS: ArraySize,
293294
BK: BlockCipherEncBackend<BlockSize = BS>,
294295
{
295296
iv: &'a mut Array<u8, BS>,
@@ -298,23 +299,23 @@ where
298299

299300
impl<BS, BK> BlockSizeUser for CbcDecryptBackend<'_, BS, BK>
300301
where
301-
BS: BlockSizes,
302+
BS: ArraySize,
302303
BK: BlockCipherEncBackend<BlockSize = BS>,
303304
{
304305
type BlockSize = BS;
305306
}
306307

307308
impl<BS, BK> ParBlocksSizeUser for CbcDecryptBackend<'_, BS, BK>
308309
where
309-
BS: BlockSizes,
310+
BS: ArraySize,
310311
BK: BlockCipherEncBackend<BlockSize = BS>,
311312
{
312313
type ParBlocksSize = BK::ParBlocksSize;
313314
}
314315

315316
impl<BS, BK> BlockModeDecBackend for CbcDecryptBackend<'_, BS, BK>
316317
where
317-
BS: BlockSizes,
318+
BS: ArraySize,
318319
BK: BlockCipherEncBackend<BlockSize = BS>,
319320
{
320321
#[inline(always)]

‎cfb-mode/src/encrypt.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use cipher::{
22
AlgorithmName, Block, BlockCipherDecrypt, BlockCipherEncBackend, BlockCipherEncClosure,
33
BlockCipherEncrypt, BlockModeEncBackend, BlockModeEncClosure, BlockModeEncrypt, BlockSizeUser,
44
InnerIvInit, Iv, IvSizeUser, IvState, ParBlocksSizeUser,
5-
array::Array,
6-
common::{BlockSizes, InnerUser},
5+
array::{Array, ArraySize},
6+
common::InnerUser,
77
consts::U1,
88
inout::{InOut, InOutBuf, NotEqualError},
99
};
@@ -40,7 +40,7 @@ where
4040
/// respective `Backend` based on it.
4141
struct Closure<'a, BS, BC>
4242
where
43-
BS: BlockSizes,
43+
BS: ArraySize,
4444
BC: BlockModeEncClosure<BlockSize = BS>,
4545
{
4646
iv: &'a mut Array<u8, BS>,
@@ -49,15 +49,15 @@ where
4949

5050
impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
5151
where
52-
BS: BlockSizes,
52+
BS: ArraySize,
5353
BC: BlockModeEncClosure<BlockSize = BS>,
5454
{
5555
type BlockSize = BS;
5656
}
5757

5858
impl<BS, BC> BlockCipherEncClosure for Closure<'_, BS, BC>
5959
where
60-
BS: BlockSizes,
60+
BS: ArraySize,
6161
BC: BlockModeEncClosure<BlockSize = BS>,
6262
{
6363
#[inline(always)]
@@ -178,7 +178,7 @@ impl<C: BlockCipherEncrypt + ZeroizeOnDrop> ZeroizeOnDrop for Encryptor<C> {}
178178

179179
struct CbcEncryptBackend<'a, BS, BK>
180180
where
181-
BS: BlockSizes,
181+
BS: ArraySize,
182182
BK: BlockCipherEncBackend<BlockSize = BS>,
183183
{
184184
iv: &'a mut Array<u8, BS>,
@@ -187,23 +187,23 @@ where
187187

188188
impl<BS, BK> BlockSizeUser for CbcEncryptBackend<'_, BS, BK>
189189
where
190-
BS: BlockSizes,
190+
BS: ArraySize,
191191
BK: BlockCipherEncBackend<BlockSize = BS>,
192192
{
193193
type BlockSize = BS;
194194
}
195195

196196
impl<BS, BK> ParBlocksSizeUser for CbcEncryptBackend<'_, BS, BK>
197197
where
198-
BS: BlockSizes,
198+
BS: ArraySize,
199199
BK: BlockCipherEncBackend<BlockSize = BS>,
200200
{
201201
type ParBlocksSize = U1;
202202
}
203203

204204
impl<BS, BK> BlockModeEncBackend for CbcEncryptBackend<'_, BS, BK>
205205
where
206-
BS: BlockSizes,
206+
BS: ArraySize,
207207
BK: BlockCipherEncBackend<BlockSize = BS>,
208208
{
209209
#[inline(always)]

0 commit comments

Comments
 (0)