Use BlockCipherEncrypt/BlockCipherDecrypt trait names (RustCrypto…

…#400) Updates the previous `BlockEncrypt`/`BlockEncrypt` trait names to use the new ones introduced in RustCrypto/traits#1482
makavity · Jan 22, 2024 · 801e36b · 801e36b
1 parent 6556a18
commit 801e36b
Show file tree

Hide file tree

Showing 27 changed files with 59 additions and 56 deletions.
diff --git a/.github/workflows/speck.yml b/.github/workflows/speck.yml
@@ -36,6 +36,7 @@ jobs:
       - run: cargo build --no-default-features --release --target ${{ matrix.target }}
 
   minimal-versions:
+    if: false # TODO: temp disabled due to unpublished prerelease dependencies
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,3 +23,6 @@ members = [
 
 [profile.dev]
 opt-level = 2
+
+[patch.crates-io.cipher]
+git = "https://github.com/RustCrypto/traits.git"
diff --git a/aes/src/armv8.rs b/aes/src/armv8.rs
@@ -25,7 +25,7 @@ use crate::{Block, Block8};
 use cipher::{
     consts::{U16, U24, U32, U8},
     inout::InOut,
-    AlgorithmName, BlockBackend, BlockCipher, BlockClosure, BlockDecrypt, BlockEncrypt,
+    AlgorithmName, BlockBackend, BlockCipher, BlockCipherDecrypt, BlockCipherEncrypt, BlockClosure,
     BlockSizeUser, Key, KeyInit, KeySizeUser, ParBlocksSizeUser,
 };
 use core::arch::aarch64::*;
@@ -98,13 +98,13 @@ macro_rules! define_aes_impl {
             type BlockSize = U16;
         }
 
-        impl BlockEncrypt for $name {
+        impl BlockCipherEncrypt for $name {
             fn encrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
                 self.encrypt.encrypt_with_backend(f)
             }
         }
 
-        impl BlockDecrypt for $name {
+        impl BlockCipherDecrypt for $name {
             fn decrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
                 self.decrypt.decrypt_with_backend(f)
             }
@@ -158,7 +158,7 @@ macro_rules! define_aes_impl {
             type BlockSize = U16;
         }
 
-        impl BlockEncrypt for $name_enc {
+        impl BlockCipherEncrypt for $name_enc {
             fn encrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
                 f.call(&mut self.get_enc_backend())
             }
@@ -233,7 +233,7 @@ macro_rules! define_aes_impl {
             type BlockSize = U16;
         }
 
-        impl BlockDecrypt for $name_dec {
+        impl BlockCipherDecrypt for $name_dec {
             fn decrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
                 f.call(&mut self.get_dec_backend());
             }

diff --git a/aes/src/autodetect.rs b/aes/src/autodetect.rs
@@ -4,8 +4,8 @@
 use crate::soft;
 use cipher::{
     consts::{U16, U24, U32},
-    AlgorithmName, BlockCipher, BlockClosure, BlockDecrypt, BlockEncrypt, BlockSizeUser, Key,
-    KeyInit, KeySizeUser,
+    AlgorithmName, BlockCipher, BlockCipherDecrypt, BlockCipherEncrypt, BlockClosure,
+    BlockSizeUser, Key, KeyInit, KeySizeUser,
 };
 use core::fmt;
 use core::mem::ManuallyDrop;
@@ -130,7 +130,7 @@ macro_rules! define_aes_impl {
 
         impl BlockCipher for $name {}
 
-        impl BlockEncrypt for $name {
+        impl BlockCipherEncrypt for $name {
             fn encrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
                 unsafe {
                     if self.token.get() {
@@ -149,7 +149,7 @@ macro_rules! define_aes_impl {
             }
         }
 
-        impl BlockDecrypt for $name {
+        impl BlockCipherDecrypt for $name {
             fn decrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
                 unsafe {
                     if self.token.get() {
@@ -249,7 +249,7 @@ macro_rules! define_aes_impl {
 
         impl BlockCipher for $name_enc {}
 
-        impl BlockEncrypt for $name_enc {
+        impl BlockCipherEncrypt for $name_enc {
             fn encrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
                 unsafe {
                     if self.token.get() {
@@ -378,7 +378,7 @@ macro_rules! define_aes_impl {
 
         impl BlockCipher for $name_dec {}
 
-        impl BlockDecrypt for $name_dec {
+        impl BlockCipherDecrypt for $name_dec {
             fn decrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
                 unsafe {
                     if self.token.get() {

diff --git a/aes/src/lib.rs b/aes/src/lib.rs
@@ -52,7 +52,7 @@
 //! ```
 //! use aes::Aes128;
 //! use aes::cipher::{
-//!     BlockCipher, BlockEncrypt, BlockDecrypt, KeyInit,
+//!     BlockCipher, BlockCipherEncrypt, BlockCipherDecrypt, KeyInit,
 //!     array::Array,
 //! };
 //!

diff --git a/aes/src/ni.rs b/aes/src/ni.rs
@@ -37,7 +37,7 @@ use crate::{Block, Block8};
 use cipher::{
     consts::{U16, U24, U32, U8},
     inout::InOut,
-    AlgorithmName, BlockBackend, BlockCipher, BlockClosure, BlockDecrypt, BlockEncrypt,
+    AlgorithmName, BlockBackend, BlockCipher, BlockCipherDecrypt, BlockCipherEncrypt, BlockClosure,
     BlockSizeUser, Key, KeyInit, KeySizeUser, ParBlocksSizeUser,
 };
 use core::fmt;
@@ -109,13 +109,13 @@ macro_rules! define_aes_impl {
             type BlockSize = U16;
         }
 
-        impl BlockEncrypt for $name {
+        impl BlockCipherEncrypt for $name {
             fn encrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
                 self.encrypt.encrypt_with_backend(f)
             }
         }
 
-        impl BlockDecrypt for $name {
+        impl BlockCipherDecrypt for $name {
             fn decrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
                 self.decrypt.decrypt_with_backend(f)
             }
@@ -171,7 +171,7 @@ macro_rules! define_aes_impl {
             type BlockSize = U16;
         }
 
-        impl BlockEncrypt for $name_enc {
+        impl BlockCipherEncrypt for $name_enc {
             fn encrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
                 f.call(&mut self.get_enc_backend())
             }
@@ -246,7 +246,7 @@ macro_rules! define_aes_impl {
             type BlockSize = U16;
         }
 
-        impl BlockDecrypt for $name_dec {
+        impl BlockCipherDecrypt for $name_dec {
             fn decrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
                 f.call(&mut self.get_dec_backend());
             }

diff --git a/aes/src/soft.rs b/aes/src/soft.rs
@@ -16,7 +16,7 @@ use crate::Block;
 use cipher::{
     consts::{U16, U24, U32},
     inout::InOut,
-    AlgorithmName, BlockBackend, BlockCipher, BlockClosure, BlockDecrypt, BlockEncrypt,
+    AlgorithmName, BlockBackend, BlockCipher, BlockCipherDecrypt, BlockCipherEncrypt, BlockClosure,
     BlockSizeUser, Key, KeyInit, KeySizeUser, ParBlocksSizeUser,
 };
 use core::fmt;
@@ -74,13 +74,13 @@ macro_rules! define_aes_impl {
 
         impl BlockCipher for $name {}
 
-        impl BlockEncrypt for $name {
+        impl BlockCipherEncrypt for $name {
             fn encrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
                 f.call(&mut self.get_enc_backend())
             }
         }
 
-        impl BlockDecrypt for $name {
+        impl BlockCipherDecrypt for $name {
             fn decrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
                 f.call(&mut self.get_dec_backend())
             }
@@ -155,7 +155,7 @@ macro_rules! define_aes_impl {
             type BlockSize = U16;
         }
 
-        impl BlockEncrypt for $name_enc {
+        impl BlockCipherEncrypt for $name_enc {
             fn encrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
                 f.call(&mut self.get_enc_backend())
             }
@@ -224,7 +224,7 @@ macro_rules! define_aes_impl {
             type BlockSize = U16;
         }
 
-        impl BlockDecrypt for $name_dec {
+        impl BlockCipherDecrypt for $name_dec {
             fn decrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
                 f.call(&mut self.get_dec_backend());
             }

diff --git a/aria/src/lib.rs b/aria/src/lib.rs
@@ -11,7 +11,7 @@
 //! # Examples
 //! ```
 //! use aria::cipher::array::Array;
-//! use aria::cipher::{Key, Block, BlockEncrypt, BlockDecrypt, KeyInit};
+//! use aria::cipher::{Key, Block, BlockCipherEncrypt, BlockCipherDecrypt, KeyInit};
 //! use aria::Aria128;
 //!
 //! let key = Array::from([0u8; 16]);

diff --git a/aria/tests/mod.rs b/aria/tests/mod.rs
@@ -1,5 +1,5 @@
 use aria::{Aria128, Aria192, Aria256};
-use cipher::{array::Array, BlockDecrypt, BlockEncrypt, KeyInit};
+use cipher::{array::Array, BlockCipherDecrypt, BlockCipherEncrypt, KeyInit};
 use hex_literal::hex;
 
 /// Test vector from RFC 5794, Appendix A.1

diff --git a/belt-block/tests/mod.rs b/belt-block/tests/mod.rs
@@ -3,7 +3,7 @@
 use belt_block::{belt_block_raw, belt_wblock_dec, belt_wblock_enc, to_u32};
 #[cfg(feature = "cipher")]
 use belt_block::{
-    cipher::{BlockDecrypt, BlockEncrypt, KeyInit},
+    cipher::{BlockCipherDecrypt, BlockCipherEncrypt, KeyInit},
     BeltBlock,
 };
 use hex_literal::hex;

diff --git a/camellia/src/lib.rs b/camellia/src/lib.rs
@@ -11,7 +11,7 @@
 //! # Examples
 //! ```
 //! use camellia::cipher::array::Array;
-//! use camellia::cipher::{BlockDecrypt, BlockEncrypt, KeyInit};
+//! use camellia::cipher::{BlockCipherDecrypt, BlockCipherEncrypt, KeyInit};
 //! use camellia::Camellia128;
 //!
 //! let key = Array::from([0_u8; 16]);

diff --git a/cast5/src/lib.rs b/cast5/src/lib.rs
@@ -11,7 +11,7 @@
 //! # Examples
 //! ```
 //! use cast5::cipher::array::Array;
-//! use cast5::cipher::{Key, Block, BlockEncrypt, BlockDecrypt, KeyInit};
+//! use cast5::cipher::{Key, Block, BlockCipherEncrypt, BlockCipherDecrypt, KeyInit};
 //! use cast5::Cast5;
 //!
 //! let key = Array::from([0u8; 16]);

diff --git a/cast5/tests/mod.rs b/cast5/tests/mod.rs
@@ -1,5 +1,5 @@
 use cast5::Cast5;
-use cipher::{array::Array, BlockDecrypt, BlockEncrypt, KeyInit};
+use cipher::{array::Array, BlockCipherDecrypt, BlockCipherEncrypt, KeyInit};
 use hex_literal::hex;
 
 /// Test vectors from RFC 2144 Appendix B.1

diff --git a/cast6/src/lib.rs b/cast6/src/lib.rs
@@ -11,7 +11,7 @@
 //! # Examples
 //! ```
 //! use cast6::cipher::array::Array;
-//! use cast6::cipher::{Key, Block, BlockEncrypt, BlockDecrypt, KeyInit};
+//! use cast6::cipher::{Key, Block, BlockCipherEncrypt, BlockCipherDecrypt, KeyInit};
 //! use cast6::Cast6;
 //!
 //! let key = Array::from([0u8; 32]);

diff --git a/cast6/tests/mod.rs b/cast6/tests/mod.rs
@@ -1,5 +1,5 @@
 use cast6::Cast6;
-use cipher::{Block, BlockDecrypt, BlockEncrypt, KeyInit};
+use cipher::{Block, BlockCipherDecrypt, BlockCipherEncrypt, KeyInit};
 use hex_literal::hex;
 
 /// Test vectors from RFC 2612 Appendix A

diff --git a/kuznyechik/src/soft/mod.rs b/kuznyechik/src/soft/mod.rs
@@ -1,7 +1,7 @@
 use crate::{BlockSize, Key, KeySize};
 use cipher::{
-    AlgorithmName, BlockCipher, BlockClosure, BlockDecrypt, BlockEncrypt, BlockSizeUser, KeyInit,
-    KeySizeUser,
+    AlgorithmName, BlockCipher, BlockCipherDecrypt, BlockCipherEncrypt, BlockClosure,
+    BlockSizeUser, KeyInit, KeySizeUser,
 };
 use core::fmt;
 
@@ -51,13 +51,13 @@ impl From<&KuznyechikEnc> for Kuznyechik {
     }
 }
 
-impl BlockEncrypt for Kuznyechik {
+impl BlockCipherEncrypt for Kuznyechik {
     fn encrypt_with_backend(&self, f: impl BlockClosure<BlockSize = BlockSize>) {
         f.call(&mut EncBackend(&self.keys));
     }
 }
 
-impl BlockDecrypt for Kuznyechik {
+impl BlockCipherDecrypt for Kuznyechik {
     fn decrypt_with_backend(&self, f: impl BlockClosure<BlockSize = BlockSize>) {
         f.call(&mut DecBackend(&self.keys));
     }
@@ -111,7 +111,7 @@ impl KeyInit for KuznyechikEnc {
     }
 }
 
-impl BlockEncrypt for KuznyechikEnc {
+impl BlockCipherEncrypt for KuznyechikEnc {
     fn encrypt_with_backend(&self, f: impl BlockClosure<BlockSize = BlockSize>) {
         f.call(&mut EncBackend(&self.keys));
     }
@@ -179,7 +179,7 @@ impl From<&KuznyechikEnc> for KuznyechikDec {
     }
 }
 
-impl BlockDecrypt for KuznyechikDec {
+impl BlockCipherDecrypt for KuznyechikDec {
     fn decrypt_with_backend(&self, f: impl BlockClosure<BlockSize = BlockSize>) {
         f.call(&mut DecBackend(&self.keys));
     }

diff --git a/kuznyechik/src/sse2/mod.rs b/kuznyechik/src/sse2/mod.rs
@@ -2,8 +2,8 @@
 
 use crate::{BlockSize, Key, KeySize};
 use cipher::{
-    AlgorithmName, BlockCipher, BlockClosure, BlockDecrypt, BlockEncrypt, BlockSizeUser, KeyInit,
-    KeySizeUser,
+    AlgorithmName, BlockCipher, BlockCipherDecrypt, BlockCipherEncrypt, BlockClosure,
+    BlockSizeUser, KeyInit, KeySizeUser,
 };
 use core::fmt;
 
@@ -60,13 +60,13 @@ impl From<&KuznyechikEnc> for Kuznyechik {
     }
 }
 
-impl BlockEncrypt for Kuznyechik {
+impl BlockCipherEncrypt for Kuznyechik {
     fn encrypt_with_backend(&self, f: impl BlockClosure<BlockSize = BlockSize>) {
         f.call(&mut EncBackend(&self.enc_keys));
     }
 }
 
-impl BlockDecrypt for Kuznyechik {
+impl BlockCipherDecrypt for Kuznyechik {
     fn decrypt_with_backend(&self, f: impl BlockClosure<BlockSize = BlockSize>) {
         f.call(&mut DecBackend(&self.dec_keys));
     }
@@ -121,7 +121,7 @@ impl KeyInit for KuznyechikEnc {
     }
 }
 
-impl BlockEncrypt for KuznyechikEnc {
+impl BlockCipherEncrypt for KuznyechikEnc {
     fn encrypt_with_backend(&self, f: impl BlockClosure<BlockSize = BlockSize>) {
         f.call(&mut EncBackend(&self.keys));
     }
@@ -194,7 +194,7 @@ impl From<&KuznyechikEnc> for KuznyechikDec {
     }
 }
 
-impl BlockDecrypt for KuznyechikDec {
+impl BlockCipherDecrypt for KuznyechikDec {
     fn decrypt_with_backend(&self, f: impl BlockClosure<BlockSize = BlockSize>) {
         f.call(&mut DecBackend(&self.keys));
     }

diff --git a/kuznyechik/tests/mod.rs b/kuznyechik/tests/mod.rs
@@ -1,4 +1,4 @@
-use cipher::{Block, BlockDecrypt, BlockEncrypt, KeyInit};
+use cipher::{Block, BlockCipherDecrypt, BlockCipherEncrypt, KeyInit};
 use hex_literal::hex;
 use kuznyechik::{Kuznyechik, KuznyechikDec, KuznyechikEnc};
 

diff --git a/magma/src/lib.rs b/magma/src/lib.rs
@@ -14,7 +14,7 @@
 //! use magma::Magma;
 //! use magma::cipher::{
 //!     array::Array,
-//!     BlockEncrypt, BlockDecrypt, KeyInit,
+//!     BlockCipherEncrypt, BlockCipherDecrypt, KeyInit,
 //! };
 //! use hex_literal::hex;
 //!

diff --git a/rc2/tests/mod.rs b/rc2/tests/mod.rs
@@ -1,5 +1,5 @@
 use cipher::array::Array;
-use cipher::{BlockDecrypt, BlockEncrypt, KeyInit};
+use cipher::{BlockCipherDecrypt, BlockCipherEncrypt, KeyInit};
 
 struct Test {
     key: &'static [u8],