Add test vectors RustCrypto#1 - RustCrypto#3 from RFC 7539 section A.1

Author: sseemayer

chacha20/tests/chacha20.rs

@@ -2,7 +2,10 @@ extern crate block_cipher_trait;
 extern crate chacha20;
 extern crate stream_cipher;
 
-use block_cipher_trait::generic_array::{typenum::U8, GenericArray};
+use block_cipher_trait::generic_array::{
+    typenum::{U12, U8},
+    GenericArray,
+};
 use chacha20::ChaCha20;
 use stream_cipher::NewStreamCipher;
 use stream_cipher::StreamCipher;
@@ -14,6 +17,9 @@ const KEY_BYTES: usize = 32;
 #[cfg(test)]
 const IV_BYTES: usize = 8;
 
+#[cfg(test)]
+const LONG_IV_BYTES: usize = 12;
+
 #[cfg(test)]
 const IETF_KEY0: [u8; KEY_BYTES] = [0; KEY_BYTES];
 
@@ -35,6 +41,9 @@ const IETF_IV0: [u8; IV_BYTES] = [0; IV_BYTES];
 #[cfg(test)]
 const IETF_IV1: [u8; IV_BYTES] = [0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00];
 
+#[cfg(test)]
+const IETF_IV2: [u8; LONG_IV_BYTES] = [0; LONG_IV_BYTES];
+
 #[cfg(test)]
 const IETF_IVHI: [u8; IV_BYTES] = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01];
 
@@ -73,6 +82,30 @@ const EXPECTED_IETF_KEY0_IVHI: [u8; 60] = [
     0x52, 0x77, 0x06, 0x2e, 0xb7, 0xa0, 0x43, 0x3e, 0x44, 0x5f, 0x41, 0xe3,
 ];
 
+#[cfg(test)]
+const EXPECTED_IETF_KEY0_IV2: [u8; 64] = [
+    0x76, 0xb8, 0xe0, 0xad, 0xa0, 0xf1, 0x3d, 0x90, 0x40, 0x5d, 0x6a, 0xe5, 0x53, 0x86, 0xbd, 0x28,
+    0xbd, 0xd2, 0x19, 0xb8, 0xa0, 0x8d, 0xed, 0x1a, 0xa8, 0x36, 0xef, 0xcc, 0x8b, 0x77, 0x0d, 0xc7,
+    0xda, 0x41, 0x59, 0x7c, 0x51, 0x57, 0x48, 0x8d, 0x77, 0x24, 0xe0, 0x3f, 0xb8, 0xd8, 0x4a, 0x37,
+    0x6a, 0x43, 0xb8, 0xf4, 0x15, 0x18, 0xa1, 0x1c, 0xc3, 0x87, 0xb6, 0x69, 0xb2, 0xee, 0x65, 0x86,
+];
+
+#[cfg(test)]
+const EXPECTED_IETF_KEY0_IV2_COUNTER1: [u8; 64] = [
+    0x9f, 0x07, 0xe7, 0xbe, 0x55, 0x51, 0x38, 0x7a, 0x98, 0xba, 0x97, 0x7c, 0x73, 0x2d, 0x08, 0x0d,
+    0xcb, 0x0f, 0x29, 0xa0, 0x48, 0xe3, 0x65, 0x69, 0x12, 0xc6, 0x53, 0x3e, 0x32, 0xee, 0x7a, 0xed,
+    0x29, 0xb7, 0x21, 0x76, 0x9c, 0xe6, 0x4e, 0x43, 0xd5, 0x71, 0x33, 0xb0, 0x74, 0xd8, 0x39, 0xd5,
+    0x31, 0xed, 0x1f, 0x28, 0x51, 0x0a, 0xfb, 0x45, 0xac, 0xe1, 0x0a, 0x1f, 0x4b, 0x79, 0x4d, 0x6f,
+];
+
+#[cfg(test)]
+const EXPECTED_IETF_KEY1_IV2_COUNTER1: [u8; 64] = [
+    0x3a, 0xeb, 0x52, 0x24, 0xec, 0xf8, 0x49, 0x92, 0x9b, 0x9d, 0x82, 0x8d, 0xb1, 0xce, 0xd4, 0xdd,
+    0x83, 0x20, 0x25, 0xe8, 0x01, 0x8b, 0x81, 0x60, 0xb8, 0x22, 0x84, 0xf3, 0xc9, 0x49, 0xaa, 0x5a,
+    0x8e, 0xca, 0x00, 0xbb, 0xb4, 0xa7, 0x3b, 0xda, 0xd1, 0x92, 0xb5, 0xc4, 0x2f, 0x73, 0xf2, 0xfd,
+    0x4e, 0x27, 0x36, 0x44, 0xc8, 0xb3, 0x61, 0x25, 0xa6, 0x4a, 0xdd, 0xeb, 0x00, 0x6c, 0x13, 0xa0,
+];
+
 #[cfg(test)]
 const EXPECTED_LONG: [u8; 256] = [
     0xde, 0xeb, 0x6b, 0x9d, 0x06, 0xdf, 0xf3, 0xe0, 0x91, 0xbf, 0x3a, 0xd4, 0xf4, 0xd4, 0x92, 0xb6,
@@ -153,6 +186,56 @@ fn chacha20_ietf_key0_ivhi() {
     }
 }
 
+#[test]
+fn chacha20_ietf_key0_iv2() {
+    let mut cipher: ChaCha20<U12> = ChaCha20::new(
+        &GenericArray::from(IETF_KEY0),
+        &GenericArray::from(IETF_IV2),
+    );
+
+    let mut buf = [0; 64];
+
+    cipher.encrypt(&mut buf);
+
+    for i in 0..64 {
+        assert_eq!(buf[i], EXPECTED_IETF_KEY0_IV2[i])
+    }
+}
+
+#[test]
+fn chacha20_ietf_key0_iv2_counter1() {
+    let mut cipher: ChaCha20<U12> = ChaCha20::new(
+        &GenericArray::from(IETF_KEY0),
+        &GenericArray::from(IETF_IV2),
+    );
+    cipher.seek(1 << 6);
+
+    let mut buf = [0; 64];
+
+    cipher.encrypt(&mut buf);
+
+    for i in 0..64 {
+        assert_eq!(buf[i], EXPECTED_IETF_KEY0_IV2_COUNTER1[i])
+    }
+}
+
+#[test]
+fn chacha20_ietf_key1_iv2_counter1() {
+    let mut cipher: ChaCha20<U12> = ChaCha20::new(
+        &GenericArray::from(IETF_KEY1),
+        &GenericArray::from(IETF_IV2),
+    );
+    cipher.seek(1 << 6);
+
+    let mut buf = [0; 64];
+
+    cipher.encrypt(&mut buf);
+
+    for i in 0..64 {
+        assert_eq!(buf[i], EXPECTED_IETF_KEY1_IV2_COUNTER1[i])
+    }
+}
+
 #[test]
 fn chacha20_long() {
     let mut cipher: ChaCha20<U8> =