turned add64! into add_counter! that accepts a bool; now it passes tests

RustCrypto · Jun 8, 2024 · 66ae108 · 66ae108
1 parent 61acc54
commit 66ae108
Showing 1 changed file with 27 additions and 17 deletions.
diff --git a/chacha20/src/backends/neon.rs b/chacha20/src/backends/neon.rs
@@ -99,12 +99,17 @@ impl<R: Rounds, V: Variant> ParBlocksSizeUser for Backend<R, V> {
     type ParBlocksSize = U4;
 }
 
-macro_rules! add64 {
-    ($a:expr, $b:expr) => {
-        vreinterpretq_u32_u64(vaddq_u64(
-            vreinterpretq_u64_u32($a),
-            vreinterpretq_u64_u32($b),
-        ))
+/// Adds a counter row with either 32-bit or 64-bit addition
+macro_rules! add_counter {
+    ($a:expr, $b:expr, $is_32_bit:expr) => {
+        if $is_32_bit {
+            vaddq_u32($a, $b)
+        } else {
+            vreinterpretq_u32_u64(vaddq_u64(
+                vreinterpretq_u64_u32($a),
+                vreinterpretq_u64_u32($b),
+            ))
+        }
     };
 }
 
@@ -124,7 +129,11 @@ impl<R: Rounds, V: Variant> StreamBackend for Backend<R, V> {
         self.gen_par_ks_blocks(&mut par);
         *block = par[0];
         unsafe {
-            self.state[3] = add64!(state3, vld1q_u32([1, 0, 0, 0].as_ptr()));
+            self.state[3] = add_counter!(
+                state3,
+                vld1q_u32([1, 0, 0, 0].as_ptr()),
+                V::USES_U32_COUNTER
+            );
         }
     }
 
@@ -137,19 +146,19 @@ impl<R: Rounds, V: Variant> StreamBackend for Backend<R, V> {
                     self.state[0],
                     self.state[1],
                     self.state[2],
-                    add64!(self.state[3], self.ctrs[0]),
+                    add_counter!(self.state[3], self.ctrs[0], V::USES_U32_COUNTER),
                 ],
                 [
                     self.state[0],
                     self.state[1],
                     self.state[2],
-                    add64!(self.state[3], self.ctrs[1]),
+                    add_counter!(self.state[3], self.ctrs[1], V::USES_U32_COUNTER),
                 ],
                 [
                     self.state[0],
                     self.state[1],
                     self.state[2],
-                    add64!(self.state[3], self.ctrs[2]),
+                    add_counter!(self.state[3], self.ctrs[2], V::USES_U32_COUNTER),
                 ],
             ];
 
@@ -178,7 +187,7 @@ impl<R: Rounds, V: Variant> StreamBackend for Backend<R, V> {
                 }
                 add_assign_vec!(
                     blocks[block][3],
-                    add64!(self.state[3], self.ctrs[block - 1])
+                    add_counter!(self.state[3], self.ctrs[block - 1], V::USES_U32_COUNTER)
                 );
 
                 // write
@@ -190,7 +199,7 @@ impl<R: Rounds, V: Variant> StreamBackend for Backend<R, V> {
                 }
             }
             //self.state[3] = vaddq_u32(self.state[3], self.ctrs[3]);
-            self.state[3] = add64!(self.state[3], self.ctrs[3]);
+            self.state[3] = add_counter!(self.state[3], self.ctrs[3], V::USES_U32_COUNTER);
         }
     }
 }
@@ -233,19 +242,19 @@ impl<R: Rounds, V: Variant> Backend<R, V> {
                 self.state[0],
                 self.state[1],
                 self.state[2],
-                add64!(self.state[3], self.ctrs[0]),
+                add_counter!(self.state[3], self.ctrs[0], V::USES_U32_COUNTER),
             ],
             [
                 self.state[0],
                 self.state[1],
                 self.state[2],
-                add64!(self.state[3], self.ctrs[1]),
+                add_counter!(self.state[3], self.ctrs[1], V::USES_U32_COUNTER),
             ],
             [
                 self.state[0],
                 self.state[1],
                 self.state[2],
-                add64!(self.state[3], self.ctrs[2]),
+                add_counter!(self.state[3], self.ctrs[2], V::USES_U32_COUNTER),
             ],
         ];
 
@@ -260,7 +269,8 @@ impl<R: Rounds, V: Variant> Backend<R, V> {
                 add_assign_vec!(blocks[block][state_row], self.state[state_row]);
             }
             if block > 0 {
-                blocks[block][3] = add64!(blocks[block][3], self.ctrs[block - 1]);
+                blocks[block][3] =
+                    add_counter!(blocks[block][3], self.ctrs[block - 1], V::USES_U32_COUNTER);
             }
             // write blocks to buffer
             for state_row in 0..4 {
@@ -271,7 +281,7 @@ impl<R: Rounds, V: Variant> Backend<R, V> {
             }
             dest_ptr = dest_ptr.add(64);
         }
-        self.state[3] = add64!(self.state[3], self.ctrs[3]);
+        self.state[3] = add_counter!(self.state[3], self.ctrs[3], V::USES_U32_COUNTER);
     }
 }