zig

commit b29057b6ab78eda87e4f3c9007dc110c101e8e35 (tree)
parent 0b0292c4565ebe6267f53d8edcd5fd41270348bb
Author: Naoki MATSUMOTO <33079554+naoki9911@users.noreply.github.com>
Date:   Tue, 15 Nov 2022 00:35:08 +0900

std.crypto.ghash: fix uninitialized polynomial use (#13527)

In the process of 'remaining blocks',
the length of processed message can be from 1 to 79.
The value of 'n-1' is ranged from 0 to 3.
So, st.hx[i] must be initialized at least from st.hx[0] to st.hx[3]
Diffstat:
M
lib/std/crypto/ghash.zig
 | 
13
+++++--------

1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/lib/std/crypto/ghash.zig b/lib/std/crypto/ghash.zig
@@ -18,7 +18,7 @@ pub const Ghash = struct {
     pub const mac_length = 16;
     pub const key_length = 16;
 
-    const pc_count = if (builtin.mode != .ReleaseSmall) 16 else 2;
+    const pc_count = if (builtin.mode != .ReleaseSmall) 16 else 4;
     const agg_2_treshold = 5;
     const agg_4_treshold = 22;
     const agg_8_treshold = 84;
@@ -42,14 +42,11 @@ pub const Ghash = struct {
 
         var hx: [pc_count]Precomp = undefined;
         hx[0] = h;
-        if (block_count >= agg_2_treshold) {
-            hx[1] = gcmReduce(clsq128(hx[0])); // h^2
-        }
+        hx[1] = gcmReduce(clsq128(hx[0])); // h^2
+        hx[2] = gcmReduce(clmul128(hx[1], h)); // h^3
+        hx[3] = gcmReduce(clsq128(hx[1])); // h^4 = h^2^2
+
         if (builtin.mode != .ReleaseSmall) {
-            if (block_count >= agg_4_treshold) {
-                hx[2] = gcmReduce(clmul128(hx[1], h)); // h^3
-                hx[3] = gcmReduce(clsq128(hx[1])); // h^4 = h^2^2
-            }
             if (block_count >= agg_8_treshold) {
                 hx[4] = gcmReduce(clmul128(hx[3], h)); // h^5
                 hx[5] = gcmReduce(clsq128(hx[2])); // h^6 = h^3^2