test different aes modes and data sizes

src/aes_ctr.rs

@@ -24,6 +24,16 @@ pub trait AesKind {
     type Cipher;
 }
 
+impl AesKind for Aes128 {
+    type Key = [u8; 16];
+    type Cipher = aes::Aes128;
+}
+
+impl AesKind for Aes192 {
+    type Key = [u8; 24];
+    type Cipher = aes::Aes192;
+}
+
 impl AesKind for Aes256 {
     type Key = [u8; 32];
     type Cipher = aes::Aes256;
@@ -72,7 +82,7 @@ where
     pub fn new(key: &C::Key) -> AesCtrZipKeyStream<C> {
         AesCtrZipKeyStream {
             counter: 1,
-            cipher: C::Cipher::new_varkey(key.as_ref()).expect("key should have correct size"),
+            cipher: C::Cipher::new(GenericArray::from_slice(key.as_ref())),
             buffer: [0u8; AES_BLOCK_SIZE],
             pos: AES_BLOCK_SIZE,
         }
@@ -124,27 +134,177 @@ pub fn xor(dest: &mut [u8], src: &[u8]) {
 
 #[cfg(test)]
 mod tests {
-    use super::{Aes256, AesCtrZipKeyStream};
+    use super::{Aes128, Aes192, Aes256, AesCtrZipKeyStream};
 
+    // The data used in these tests was generated with p7zip without any compression.
+    // It's not possible to recreate the exact same data, since a random salt is used for encryption.
+    // `7z a -phelloworld -mem=AES256 -mx=0 aes256_40byte.zip 40byte_data.txt`
     #[test]
-    fn crypt_simple_example() {
+    fn crypt_aes_256_0_byte() {
-        let ciphertext: [u8; 5] = [0xdc, 0x99, 0x93, 0x5e, 0xbf];
+        let ciphertext = [];
-        let expected_plaintext = &[b'a', b's', b'd', b'f', b'\n'];
+        let expected_plaintext = &[];
         let key = [
-            0xd1, 0x51, 0xa6, 0xab, 0x53, 0x68, 0xd7, 0xb7, 0xbf, 0x49, 0xf7, 0xf5, 0x8a, 0x4e,
+            0x0b, 0xec, 0x2e, 0xf2, 0x46, 0xf0, 0x7e, 0x35, 0x16, 0x54, 0xe0, 0x98, 0x10, 0xb3,
-            0x10, 0x36, 0x25, 0x1c, 0x13, 0xba, 0x12, 0x45, 0x37, 0x65, 0xa9, 0xe4, 0xed, 0x9f,
+            0x18, 0x55, 0x24, 0xa3, 0x9e, 0x0e, 0x40, 0xe7, 0x92, 0xad, 0xb2, 0x8a, 0x48, 0xf4,
-            0x4a, 0xa8, 0xda, 0x3b,
+            0x5c, 0xd0, 0xc0, 0x54,
         ];
+        eprintln!("{}", key.len());
 
         let mut key_stream = AesCtrZipKeyStream::<Aes256>::new(&key);
 
         let mut plaintext = ciphertext;
         key_stream.crypt(&mut plaintext);
-        assert_eq!(&plaintext, expected_plaintext);
+        assert_eq!(plaintext.to_vec(), expected_plaintext.to_vec());
 
         // Round-tripping should yield the ciphertext again.
         let mut key_stream = AesCtrZipKeyStream::<Aes256>::new(&key);
         key_stream.crypt(&mut plaintext);
-        assert_eq!(plaintext, ciphertext);
+        assert_eq!(plaintext.to_vec(), ciphertext.to_vec());
+    }
+
+    #[test]
+    fn crypt_aes_128_5_byte() {
+        let ciphertext = [0x98, 0xa9, 0x8c, 0x26, 0x0e];
+        let expected_plaintext = &b"asdf\n";
+        let key = [
+            0xe0, 0x25, 0x7b, 0x57, 0x97, 0x6a, 0xa4, 0x23, 0xab, 0x94, 0xaa, 0x44, 0xfd, 0x47,
+            0x4f, 0xa5,
+        ];
+        eprintln!("{}", key.len());
+
+        let mut key_stream = AesCtrZipKeyStream::<Aes128>::new(&key);
+
+        let mut plaintext = ciphertext;
+        key_stream.crypt(&mut plaintext);
+        assert_eq!(plaintext.to_vec(), expected_plaintext.to_vec());
+
+        // Round-tripping should yield the ciphertext again.
+        let mut key_stream = AesCtrZipKeyStream::<Aes128>::new(&key);
+        key_stream.crypt(&mut plaintext);
+        assert_eq!(plaintext.to_vec(), ciphertext.to_vec());
+    }
+
+    #[test]
+    fn crypt_aes_192_5_byte() {
+        let ciphertext = [0x36, 0x55, 0x5c, 0x61, 0x3c];
+        let expected_plaintext = &b"asdf\n";
+        let key = [
+            0xe4, 0x4a, 0x88, 0x52, 0x8f, 0xf7, 0x0b, 0x81, 0x7b, 0x75, 0xf1, 0x74, 0x21, 0x37,
+            0x8c, 0x90, 0xad, 0xbe, 0x4a, 0x65, 0xa8, 0x96, 0x0e, 0xcc,
+        ];
+        eprintln!("{}", key.len());
+
+        let mut key_stream = AesCtrZipKeyStream::<Aes192>::new(&key);
+
+        let mut plaintext = ciphertext;
+        key_stream.crypt(&mut plaintext);
+        assert_eq!(plaintext.to_vec(), expected_plaintext.to_vec());
+
+        // Round-tripping should yield the ciphertext again.
+        let mut key_stream = AesCtrZipKeyStream::<Aes192>::new(&key);
+        key_stream.crypt(&mut plaintext);
+        assert_eq!(plaintext.to_vec(), ciphertext.to_vec());
+    }
+
+    #[test]
+    fn crypt_aes_256_5_byte() {
+        let ciphertext = [0xc2, 0x47, 0xc0, 0xdc, 0x56];
+        let expected_plaintext = &b"asdf\n";
+        let key = [
+            0x79, 0x5e, 0x17, 0xf2, 0xc6, 0x3d, 0x28, 0x9b, 0x4b, 0x4b, 0xbb, 0xa9, 0xba, 0xc9,
+            0xa5, 0xee, 0x3a, 0x4f, 0x0f, 0x4b, 0x29, 0xbd, 0xe9, 0xb8, 0x41, 0x9c, 0x41, 0xa5,
+            0x15, 0xb2, 0x86, 0xab,
+        ];
+        eprintln!("{}", key.len());
+
+        let mut key_stream = AesCtrZipKeyStream::<Aes256>::new(&key);
+
+        let mut plaintext = ciphertext;
+        key_stream.crypt(&mut plaintext);
+        assert_eq!(plaintext.to_vec(), expected_plaintext.to_vec());
+
+        // Round-tripping should yield the ciphertext again.
+        let mut key_stream = AesCtrZipKeyStream::<Aes256>::new(&key);
+        key_stream.crypt(&mut plaintext);
+        assert_eq!(plaintext.to_vec(), ciphertext.to_vec());
+    }
+
+    #[test]
+    fn crypt_aes_128_40_byte() {
+        let ciphertext = [
+            0xcf, 0x72, 0x6b, 0xa1, 0xb2, 0x0f, 0xdf, 0xaa, 0x10, 0xad, 0x9c, 0x7f, 0x6d, 0x1c,
+            0x8d, 0xb5, 0x16, 0x7e, 0xbb, 0x11, 0x69, 0x52, 0x8c, 0x89, 0x80, 0x32, 0xaa, 0x76,
+            0xa6, 0x18, 0x31, 0x98, 0xee, 0xdd, 0x22, 0x68, 0xb7, 0xe6, 0x77, 0xd2,
+        ];
+        let expected_plaintext = b"Lorem ipsum dolor sit amet, consectetur\n";
+        let key = [
+            0x43, 0x2b, 0x6d, 0xbe, 0x05, 0x76, 0x6c, 0x9e, 0xde, 0xca, 0x3b, 0xf8, 0xaf, 0x5d,
+            0x81, 0xb6,
+        ];
+        eprintln!("{}", key.len());
+
+        let mut key_stream = AesCtrZipKeyStream::<Aes128>::new(&key);
+
+        let mut plaintext = ciphertext;
+        key_stream.crypt(&mut plaintext);
+        assert_eq!(plaintext.to_vec(), expected_plaintext.to_vec());
+
+        // Round-tripping should yield the ciphertext again.
+        let mut key_stream = AesCtrZipKeyStream::<Aes128>::new(&key);
+        key_stream.crypt(&mut plaintext);
+        assert_eq!(plaintext.to_vec(), ciphertext.to_vec());
+    }
+
+    #[test]
+    fn crypt_aes_192_40_byte() {
+        let ciphertext = [
+            0xa6, 0xfc, 0x52, 0x79, 0x2c, 0x6c, 0xfe, 0x68, 0xb1, 0xa8, 0xb3, 0x07, 0x52, 0x8b,
+            0x82, 0xa6, 0x87, 0x9c, 0x72, 0x42, 0x3a, 0xf8, 0xc6, 0xa9, 0xc9, 0xfb, 0x61, 0x19,
+            0x37, 0xb9, 0x56, 0x62, 0xf4, 0xfc, 0x5e, 0x7a, 0xdd, 0x55, 0x0a, 0x48,
+        ];
+        let expected_plaintext = b"Lorem ipsum dolor sit amet, consectetur\n";
+        let key = [
+            0xac, 0x92, 0x41, 0xba, 0xde, 0xd9, 0x02, 0xfe, 0x40, 0x92, 0x20, 0xf6, 0x56, 0x03,
+            0xfe, 0xae, 0x1b, 0xba, 0x01, 0x97, 0x97, 0x79, 0xbb, 0xa6,
+        ];
+        eprintln!("{}", key.len());
+
+        let mut key_stream = AesCtrZipKeyStream::<Aes192>::new(&key);
+
+        let mut plaintext = ciphertext;
+        key_stream.crypt(&mut plaintext);
+        assert_eq!(plaintext.to_vec(), expected_plaintext.to_vec());
+
+        // Round-tripping should yield the ciphertext again.
+        let mut key_stream = AesCtrZipKeyStream::<Aes192>::new(&key);
+        key_stream.crypt(&mut plaintext);
+        assert_eq!(plaintext.to_vec(), ciphertext.to_vec());
+    }
+
+    #[test]
+    fn crypt_aes_256_40_byte() {
+        let ciphertext = [
+            0xa9, 0x99, 0xbd, 0xea, 0x82, 0x9b, 0x8f, 0x2f, 0xb7, 0x52, 0x2f, 0x6b, 0xd8, 0xf6,
+            0xab, 0x0e, 0x24, 0x51, 0x9e, 0x18, 0x0f, 0xc0, 0x8f, 0x54, 0x15, 0x80, 0xae, 0xbc,
+            0xa0, 0x5c, 0x8a, 0x11, 0x8d, 0x14, 0x7e, 0xc5, 0xb4, 0xae, 0xd3, 0x37,
+        ];
+        let expected_plaintext = b"Lorem ipsum dolor sit amet, consectetur\n";
+        let key = [
+            0x64, 0x7c, 0x7a, 0xde, 0xf0, 0xf2, 0x61, 0x49, 0x1c, 0xf1, 0xf1, 0xe3, 0x37, 0xfc,
+            0xe1, 0x4d, 0x4a, 0x77, 0xd4, 0xeb, 0x9e, 0x3d, 0x75, 0xce, 0x9a, 0x3e, 0x10, 0x50,
+            0xc2, 0x07, 0x36, 0xb6,
+        ];
+        eprintln!("{}", key.len());
+
+        let mut key_stream = AesCtrZipKeyStream::<Aes256>::new(&key);
+
+        let mut plaintext = ciphertext;
+        key_stream.crypt(&mut plaintext);
+        assert_eq!(plaintext.to_vec(), expected_plaintext.to_vec());
+
+        // Round-tripping should yield the ciphertext again.
+        let mut key_stream = AesCtrZipKeyStream::<Aes256>::new(&key);
+        key_stream.crypt(&mut plaintext);
+        assert_eq!(plaintext.to_vec(), ciphertext.to_vec());
     }
 }