feat(crypto::block): Move encryption traits

src/crypto/block/blowfish.rs

@@ -6,7 +6,7 @@ use byteorder::{
     BigEndian
 };
 
-use crypto::traits::*;
+use super::{BlockEncrypt, BlockDecrypt};
 
 fn next_u32<'a, T: Iterator<Item=&'a u8>>(iter: &mut T) -> u32 {
     (0..4).fold(0, |v, _| { (v << 8) | *iter.next().unwrap() as u32 })
@@ -369,7 +369,7 @@ pub fn bcrypt<I: AsRef<[u8]>, O: AsMut<[u8]>>(cost: usize, salt: I, input: I, mu
 #[cfg(test)]
 mod test {
     use super::*;
-    use crypto::traits::*;
+    use crypto::block::{BlockEncrypt, BlockDecrypt};
 
     struct Test {
         key: [u8; 8],

src/crypto/block/mod.rs

@@ -1 +1,17 @@
 #[cfg(feature = "blowfish")] pub mod blowfish;
+
+pub trait BlockEncrypt<T> {
+    fn block_size() -> usize;
+
+    fn encrypt_block<I, O>(&self, input: I, output: O)
+        where I: AsRef<[T]>,
+              O: AsMut<[T]>;
+}
+
+pub trait BlockDecrypt<T> {
+    fn block_size() -> usize;
+
+    fn decrypt_block<I, O>(&self, input: I, output: O)
+        where I: AsRef<[T]>,
+              O: AsMut<[T]>;
+}

src/crypto/mod.rs

@@ -1,4 +1,3 @@
 pub mod block;
 pub mod stream;
 pub mod public_key;
-pub mod traits;