Bump cipher to v0.5.1 (#536)

Author: newpavlov

Cargo.lock

@@ -23,7 +23,6 @@ use cipher::{
     BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, KeyInit,
     KeySizeUser, ParBlocksSizeUser,
     array::ArraySize,
-    common::BlockSizes,
     consts::{U1, U2, U256},
     inout::InOut,
     typenum::{Diff, IsLess, Le, NonZero, Sum, Unsigned},
@@ -51,7 +50,7 @@ where
     W: Word,
     // Block size
     W::Bytes: Mul<U2>,
-    BlockSize<W>: BlockSizes,
+    BlockSize<W>: ArraySize,
     // Rounds range
     R: Unsigned,
     R: IsLess<U256>,
@@ -70,7 +69,7 @@ where
     W: Word,
     // Block size
     W::Bytes: Mul<U2>,
-    BlockSize<W>: BlockSizes,
+    BlockSize<W>: ArraySize,
     // Rounds range
     R: Unsigned,
     R: IsLess<U256>,
@@ -156,7 +155,7 @@ where
     W: Word,
     // Block size
     W::Bytes: Mul<U2>,
-    BlockSize<W>: BlockSizes,
+    BlockSize<W>: ArraySize,
     // Rounds range
     R: Unsigned,
     R: IsLess<U256>,
@@ -187,7 +186,7 @@ where
     W: Word,
     // Block size
     W::Bytes: Mul<U2>,
-    BlockSize<W>: BlockSizes,
+    BlockSize<W>: ArraySize,
     // Rounds range
     R: Unsigned,
     R: IsLess<U256>,
@@ -219,7 +218,7 @@ where
     W: Word,
     // Block size
     W::Bytes: Mul<U2>,
-    BlockSize<W>: BlockSizes,
+    BlockSize<W>: ArraySize,
     // Rounds range
     R: Unsigned,
     R: IsLess<U256>,
@@ -238,7 +237,7 @@ where
     W: Word,
     // Block size
     W::Bytes: Mul<U2>,
-    BlockSize<W>: BlockSizes,
+    BlockSize<W>: ArraySize,
     // Rounds range
     R: Unsigned,
     R: IsLess<U256>,
@@ -256,7 +255,7 @@ where
     W: Word,
     // Block size
     W::Bytes: Mul<U2>,
-    BlockSize<W>: BlockSizes,
+    BlockSize<W>: ArraySize,
     // Rounds range
     R: Unsigned,
     R: IsLess<U256>,
@@ -274,7 +273,7 @@ where
     W: Word,
     // Block size
     W::Bytes: Mul<U2>,
-    BlockSize<W>: BlockSizes,
+    BlockSize<W>: ArraySize,
     // Rounds range
     R: Unsigned,
     R: IsLess<U256>,
@@ -303,7 +302,7 @@ where
     W: Word,
     // Block size
     W::Bytes: Mul<U2>,
-    BlockSize<W>: BlockSizes,
+    BlockSize<W>: ArraySize,
     // Rounds range
     R: Unsigned,
     R: IsLess<U256>,
@@ -344,7 +343,7 @@ where
     W: Word,
     // Block size
     W::Bytes: Mul<U2>,
-    BlockSize<W>: BlockSizes,
+    BlockSize<W>: ArraySize,
     // Rounds range
     R: Unsigned,
     R: IsLess<U256>,
@@ -373,7 +372,7 @@ where
     W: Word,
     // Block size
     W::Bytes: Mul<U2>,
-    BlockSize<W>: BlockSizes,
+    BlockSize<W>: ArraySize,
     // Rounds range
     R: Unsigned,
     R: IsLess<U256>,
@@ -414,7 +413,7 @@ where
     W: Word,
     // Block size
     W::Bytes: Mul<U2>,
-    BlockSize<W>: BlockSizes,
+    BlockSize<W>: ArraySize,
     // Rounds range
     R: Unsigned,
     R: IsLess<U256>,
@@ -440,7 +439,7 @@ where
     W: Word,
     // Block size
     W::Bytes: Mul<U2>,
-    BlockSize<W>: BlockSizes,
+    BlockSize<W>: ArraySize,
     // Rounds range
     R: Unsigned,
     R: IsLess<U256>,
@@ -467,7 +466,7 @@ where
     W: Word,
     // Block size
     W::Bytes: Mul<U2>,
-    BlockSize<W>: BlockSizes,
+    BlockSize<W>: ArraySize,
     // Rounds range
     R: Unsigned,
     R: IsLess<U256>,
@@ -484,7 +483,7 @@ where
     W: Word,
     // Block size
     W::Bytes: Mul<U2>,
-    BlockSize<W>: BlockSizes,
+    BlockSize<W>: ArraySize,
     // Rounds range
     R: Unsigned,
     R: IsLess<U256>,

rc5/src/lib.rs

@@ -2,7 +2,6 @@ use core::ops::{Add, BitXor, Mul};
 
 use cipher::{
     array::{Array, ArraySize},
-    common::BlockSizes,
     typenum::{Diff, Prod, Quot, Sum, U1, U2, U4, U8, U16},
 };
 
@@ -20,7 +19,7 @@ pub type KeyAsWordsSize<W, B> = Quot<Diff<Sum<B, <W as Word>::Bytes>, U1>, <W as
 pub trait Word
 where
     Self: Default + Copy + From<u8> + Add<Output = Self> + Default + private::Sealed,
-    BlockSize<Self>: BlockSizes,
+    BlockSize<Self>: ArraySize,
 {
     type Bytes: ArraySize + Mul<U2>;