From 4d35cd1d99bbc9fdcd282e10f0c769b883c9cb90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= <newpavlov@gmail.com>
Date: Fri, 21 Mar 2025 19:23:21 +0300
Subject: [PATCH] aead: split `new_test!` into `new_pass_test!` and
 `new_fail_test!`

---
 aead/src/dev.rs                  |  55 ++++++++++++++++++++++---------
 aead/tests/data/postfix.blb      | Bin 208 -> 0 bytes
 aead/tests/data/postfix_fail.blb | Bin 0 -> 116 bytes
 aead/tests/data/postfix_pass.blb | Bin 0 -> 119 bytes
 aead/tests/data/prefix.blb       | Bin 208 -> 0 bytes
 aead/tests/data/prefix_fail.blb  | Bin 0 -> 116 bytes
 aead/tests/data/prefix_pass.blb  | Bin 0 -> 119 bytes
 aead/tests/dummy.rs              |  11 +++++--
 8 files changed, 48 insertions(+), 18 deletions(-)
 delete mode 100644 aead/tests/data/postfix.blb
 create mode 100644 aead/tests/data/postfix_fail.blb
 create mode 100644 aead/tests/data/postfix_pass.blb
 delete mode 100644 aead/tests/data/prefix.blb
 create mode 100644 aead/tests/data/prefix_fail.blb
 create mode 100644 aead/tests/data/prefix_pass.blb

diff --git a/aead/src/dev.rs b/aead/src/dev.rs
index f216b72cc..65eecdd87 100644
--- a/aead/src/dev.rs
+++ b/aead/src/dev.rs
@@ -78,39 +78,64 @@ pub fn run_fail_test<C: AeadInOut>(
     }
 }
 
-/// Define AEAD test
+/// Define AEAD test for passing test vectors
 #[macro_export]
-macro_rules! new_test {
+macro_rules! new_pass_test {
     ($name:ident, $test_name:expr, $cipher:ty $(,)?) => {
         #[test]
         fn $name() {
             use $crate::KeyInit;
-            use $crate::dev::blobby::Blob6Iterator;
+            use $crate::dev::blobby::Blob5Iterator;
 
             let data = include_bytes!(concat!("data/", $test_name, ".blb"));
-            for (i, row) in Blob6Iterator::new(data).unwrap().enumerate() {
-                let [key, nonce, aad, pt, ct, status] = row.unwrap();
+            for (i, row) in Blob5Iterator::new(data).unwrap().enumerate() {
+                let [key, nonce, aad, pt, ct] = row.unwrap();
                 let key = key.try_into().expect("wrong key size");
                 let nonce = nonce.try_into().expect("wrong nonce size");
                 let cipher = <$cipher as KeyInit>::new(key);
-
-                let res = match status {
-                    [0] => $crate::dev::run_fail_test(&cipher, nonce, aad, ct),
-                    [1] => $crate::dev::run_pass_test(&cipher, nonce, aad, pt, ct),
-                    _ => panic!("invalid value for pass flag"),
-                };
-                let mut pass = status[0] == 1;
+                let res = $crate::dev::run_pass_test(&cipher, nonce, aad, pt, ct);
                 if let Err(reason) = res {
                     panic!(
                         "\n\
-                        Failed test #{i}\n\
+                        Failed (pass) test #{i}\n\
                         reason:\t{reason:?}\n\
                         key:\t{key:?}\n\
                         nonce:\t{nonce:?}\n\
                         aad:\t{aad:?}\n\
                         plaintext:\t{pt:?}\n\
-                        ciphertext:\t{ct:?}\n\
-                        pass:\t{pass}\n"
+                        ciphertext:\t{ct:?}\n"
+                    );
+                }
+            }
+        }
+    };
+}
+
+/// Define AEAD test for failing test vectors
+#[macro_export]
+macro_rules! new_fail_test {
+    ($name:ident, $test_name:expr, $cipher:ty $(,)?) => {
+        #[test]
+        fn $name() {
+            use $crate::KeyInit;
+            use $crate::dev::blobby::Blob4Iterator;
+
+            let data = include_bytes!(concat!("data/", $test_name, ".blb"));
+            for (i, row) in Blob4Iterator::new(data).unwrap().enumerate() {
+                let [key, nonce, aad, ct] = row.unwrap();
+                let key = key.try_into().expect("wrong key size");
+                let nonce = nonce.try_into().expect("wrong nonce size");
+                let cipher = <$cipher as KeyInit>::new(key);
+                let res = $crate::dev::run_fail_test(&cipher, nonce, aad, ct);
+                if let Err(reason) = res {
+                    panic!(
+                        "\n\
+                        Failed (fail) test #{i}\n\
+                        reason:\t{reason:?}\n\
+                        key:\t{key:?}\n\
+                        nonce:\t{nonce:?}\n\
+                        aad:\t{aad:?}\n\
+                        ciphertext:\t{ct:?}\n"
                     );
                 }
             }
diff --git a/aead/tests/data/postfix.blb b/aead/tests/data/postfix.blb
deleted file mode 100644
index 97d850e1c6241381a17571282a85b3497574640d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 208
zcmZQ&WME_z(G2@~Cc&WKghJEx8$14235I=C?c&(_TcvX@v(6QcuwJ<dtM24K=45AO
z5V+#fw7hu5w5`mX><p|H^|xQgoO&a#UB-XXLr7Wl6GM%)R8H>&?@q-ZcY!Kcv8&)U
bDoai8a@qq@0XK02BOwzn09D{OaRVa&v)@iI

diff --git a/aead/tests/data/postfix_fail.blb b/aead/tests/data/postfix_fail.blb
new file mode 100644
index 0000000000000000000000000000000000000000..a9d49c92735e1c7cac17ee4baf70cb434c7508bc
GIT binary patch
literal 116
zcmZSP*!o+gb1t*a6^^i8xe2T8<UbbC4EuT}!Jy!TLeupdJN{P*hJ94+VrFC&xZ={Z
zym-a54a|%T7WKDZ$DDd2uU*D}(nCmD^b<pkwNy^;1@BJ99~XdXvC8urm8GV4Ic)#{
De#$Un

literal 0
HcmV?d00001

diff --git a/aead/tests/data/postfix_pass.blb b/aead/tests/data/postfix_pass.blb
new file mode 100644
index 0000000000000000000000000000000000000000..ee15f16c6615d6ec618c858baaf0ef0386816b0c
GIT binary patch
literal 119
zcmZP;(G2@~Cc&WKghJEx8$14235I=C?c&(_TcvX@v(6QcuwJ<dtM24KW@Tn%5V+#f
zw7hu5w5_bn42%}_w_nGcdLyr0#(&a7NLlm~LyfgmPVWWpPQ@R0fvT}9;58~sP49Br
F0|4PEFopmC

literal 0
HcmV?d00001

diff --git a/aead/tests/data/prefix.blb b/aead/tests/data/prefix.blb
deleted file mode 100644
index 8a5929ee6272c0f0a3fb33d93a032d1e2af944d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 208
zcmZQ&WME|E*!o+gb1t*a6^^i8xe2T8<UbbC4EuT}!Jy!TLeupdJN{P*hJ94+VrS)K
z5V+#fw7hu5w5`nStPGqMIlULWI~9N2t-t*`=F}T`?K1w89zx2ZpBQSarGP3pIW2gN
k%2Lz2oc7>S!63i_HIWf$B7+4F9ut8oI2kM$@R-O50C*@(2LJ#7

diff --git a/aead/tests/data/prefix_fail.blb b/aead/tests/data/prefix_fail.blb
new file mode 100644
index 0000000000000000000000000000000000000000..33f35374106ec27098fad877a97f5be2c6724f36
GIT binary patch
literal 116
zcmZSP*!o+gb1t*a6^^i8xe2T8<UbbC4EuT}!Jy!TLeupdJN{P*hJ94+VrFC&U~y?$
zUc6%3R%S*93!dH!-kpj+?$+Oa9dqi9ymlG?Ne>}q(N7FD)>1&V77RvZsp(x#d$7p^
E07FbKLjV8(

literal 0
HcmV?d00001

diff --git a/aead/tests/data/prefix_pass.blb b/aead/tests/data/prefix_pass.blb
new file mode 100644
index 0000000000000000000000000000000000000000..bd5b2532dc70f511a0cd7b80fc3379db3b51993d
GIT binary patch
literal 119
zcmZP;(G2@~Cc&WKghJEx8$14235I=C?c&(_TcvX@v(6QcuwJ<dtM24KW@Tn%5V+#f
zw7hu5w5_bn42%{zy%)SY6@T2Vzx_Jq)Ejy2GX9euLdv3_7;3DgfT|fSc#X<Z)4QDZ
HU{e49^%*dR

literal 0
HcmV?d00001

diff --git a/aead/tests/dummy.rs b/aead/tests/dummy.rs
index 817ab945c..3e00ee39c 100644
--- a/aead/tests/dummy.rs
+++ b/aead/tests/dummy.rs
@@ -170,6 +170,11 @@ impl AeadInOut for PostfixDummyAead {
 }
 
 #[cfg(feature = "dev")]
-aead::new_test!(dummy_prefix, "prefix", PrefixDummyAead);
-#[cfg(feature = "dev")]
-aead::new_test!(dummy_postfix, "postfix", PostfixDummyAead);
+mod tests {
+    use super::{PostfixDummyAead, PrefixDummyAead};
+
+    aead::new_pass_test!(dummy_prefix_pass, "prefix_pass", PrefixDummyAead);
+    aead::new_fail_test!(dummy_prefix_fail, "prefix_fail", PrefixDummyAead);
+    aead::new_pass_test!(dummy_postfix_pass, "postfix_pass", PostfixDummyAead);
+    aead::new_fail_test!(dummy_postfix_fail, "postfix_fail", PostfixDummyAead);
+}