Make the X implementations closer to the spec

cfrg · Oct 19, 2023 · 318aaf1 · 318aaf1
1 parent 9e6bdf2
commit 318aaf1
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 43 deletions.
diff --git a/reference-implementations/aegis128x.zig b/reference-implementations/aegis128x.zig
@@ -64,31 +64,31 @@ fn Aegis128X_(comptime degree: u7, comptime tag_bits: u9) type {
         }
 
         fn init(key: [key_length]u8, nonce: [nonce_length]u8) Self {
-            const c0 = AesBlockX.fromBytes(&[16]u8{ 0x00, 0x01, 0x01, 0x02, 0x03, 0x05, 0x08, 0x0d, 0x15, 0x22, 0x37, 0x59, 0x90, 0xe9, 0x79, 0x62 } ** degree);
-            const c1 = AesBlockX.fromBytes(&[16]u8{ 0xdb, 0x3d, 0x18, 0x55, 0x6d, 0xc2, 0x2f, 0xf1, 0x20, 0x11, 0x31, 0x42, 0x73, 0xb5, 0x28, 0xdd } ** degree);
-            const key_block = AesBlockX.fromBytes(&(key ** degree));
-            const nonce_block = AesBlockX.fromBytes(&(nonce ** degree));
-            const contexts = ctx: {
+            const c0_v = AesBlockX.fromBytes(&[16]u8{ 0x00, 0x01, 0x01, 0x02, 0x03, 0x05, 0x08, 0x0d, 0x15, 0x22, 0x37, 0x59, 0x90, 0xe9, 0x79, 0x62 } ** degree);
+            const c1_v = AesBlockX.fromBytes(&[16]u8{ 0xdb, 0x3d, 0x18, 0x55, 0x6d, 0xc2, 0x2f, 0xf1, 0x20, 0x11, 0x31, 0x42, 0x73, 0xb5, 0x28, 0xdd } ** degree);
+            const key_v = AesBlockX.fromBytes(&(key ** degree));
+            const nonce_v = AesBlockX.fromBytes(&(nonce ** degree));
+            const ctx_v = ctx_v: {
                 var contexts_bytes = [_]u8{0} ** blockx_length;
                 for (1..degree) |i| {
                     contexts_bytes[i * 16] = @intCast(i);
                 }
-                break :ctx AesBlockX.fromBytes(&contexts_bytes);
+                break :ctx_v AesBlockX.fromBytes(&contexts_bytes);
             };
             var self = Self{ .s = State{
-                key_block.xorBlocks(nonce_block),
-                c1,
-                c0,
-                c1,
-                key_block.xorBlocks(nonce_block),
-                key_block.xorBlocks(c0),
-                key_block.xorBlocks(c1),
-                key_block.xorBlocks(c0),
+                key_v.xorBlocks(nonce_v),
+                c1_v,
+                c0_v,
+                c1_v,
+                key_v.xorBlocks(nonce_v),
+                key_v.xorBlocks(c0_v),
+                key_v.xorBlocks(c1_v),
+                key_v.xorBlocks(c0_v),
             } };
             for (0..10) |_| {
-                self.s[3] = self.s[3].xorBlocks(contexts);
-                self.s[7] = self.s[7].xorBlocks(contexts);
-                self.update(nonce_block, key_block);
+                self.s[3] = self.s[3].xorBlocks(ctx_v);
+                self.s[7] = self.s[7].xorBlocks(ctx_v);
+                self.update(nonce_v, key_v);
             }
             return self;
         }

diff --git a/reference-implementations/aegis256x.zig b/reference-implementations/aegis256x.zig
@@ -62,40 +62,40 @@ fn Aegis256_(comptime degree: u7, comptime tag_bits: u9) type {
         }
 
         fn init(key: [key_length]u8, nonce: [nonce_length]u8) Self {
-            const c0 = AesBlockX.fromBytes(&[16]u8{ 0x00, 0x01, 0x01, 0x02, 0x03, 0x05, 0x08, 0x0d, 0x15, 0x22, 0x37, 0x59, 0x90, 0xe9, 0x79, 0x62 } ** degree);
-            const c1 = AesBlockX.fromBytes(&[16]u8{ 0xdb, 0x3d, 0x18, 0x55, 0x6d, 0xc2, 0x2f, 0xf1, 0x20, 0x11, 0x31, 0x42, 0x73, 0xb5, 0x28, 0xdd } ** degree);
-            const k0 = AesBlockX.fromBytes(key[0..16] ** degree);
-            const k1 = AesBlockX.fromBytes(key[16..32] ** degree);
-            const n0 = AesBlockX.fromBytes(nonce[0..16] ** degree);
-            const n1 = AesBlockX.fromBytes(nonce[16..32] ** degree);
-            const contexts = ctx: {
+            const c0_v = AesBlockX.fromBytes(&[16]u8{ 0x00, 0x01, 0x01, 0x02, 0x03, 0x05, 0x08, 0x0d, 0x15, 0x22, 0x37, 0x59, 0x90, 0xe9, 0x79, 0x62 } ** degree);
+            const c1_v = AesBlockX.fromBytes(&[16]u8{ 0xdb, 0x3d, 0x18, 0x55, 0x6d, 0xc2, 0x2f, 0xf1, 0x20, 0x11, 0x31, 0x42, 0x73, 0xb5, 0x28, 0xdd } ** degree);
+            const k0_v = AesBlockX.fromBytes(key[0..16] ** degree);
+            const k1_v = AesBlockX.fromBytes(key[16..32] ** degree);
+            const k0n0_v = k0_v.xorBlocks(AesBlockX.fromBytes(nonce[0..16] ** degree));
+            const k1n1_v = k1_v.xorBlocks(AesBlockX.fromBytes(nonce[16..32] ** degree));
+            const ctx_v = ctx_v: {
                 var contexts_bytes = [_]u8{0} ** (blockx_length);
                 for (1..degree) |i| {
                     contexts_bytes[i * 16] = @intCast(i);
                 }
-                break :ctx AesBlockX.fromBytes(&contexts_bytes);
+                break :ctx_v AesBlockX.fromBytes(&contexts_bytes);
             };
             var self = Self{ .s = State{
-                k0.xorBlocks(n0),
-                k1.xorBlocks(n1),
-                c1,
-                c0,
-                k0.xorBlocks(c0),
-                k1.xorBlocks(c1),
+                k0n0_v,
+                k1n1_v,
+                c1_v,
+                c0_v,
+                k0_v.xorBlocks(c0_v),
+                k1_v.xorBlocks(c1_v),
             } };
             for (0..4) |_| {
-                self.s[3] = self.s[3].xorBlocks(contexts);
-                self.s[5] = self.s[5].xorBlocks(contexts);
-                self.update(k0);
-                self.s[3] = self.s[3].xorBlocks(contexts);
-                self.s[5] = self.s[5].xorBlocks(contexts);
-                self.update(k1);
-                self.s[3] = self.s[3].xorBlocks(contexts);
-                self.s[5] = self.s[5].xorBlocks(contexts);
-                self.update(k0.xorBlocks(n0));
-                self.s[3] = self.s[3].xorBlocks(contexts);
-                self.s[5] = self.s[5].xorBlocks(contexts);
-                self.update(k1.xorBlocks(n1));
+                self.s[3] = self.s[3].xorBlocks(ctx_v);
+                self.s[5] = self.s[5].xorBlocks(ctx_v);
+                self.update(k0_v);
+                self.s[3] = self.s[3].xorBlocks(ctx_v);
+                self.s[5] = self.s[5].xorBlocks(ctx_v);
+                self.update(k1_v);
+                self.s[3] = self.s[3].xorBlocks(ctx_v);
+                self.s[5] = self.s[5].xorBlocks(ctx_v);
+                self.update(k0n0_v);
+                self.s[3] = self.s[3].xorBlocks(ctx_v);
+                self.s[5] = self.s[5].xorBlocks(ctx_v);
+                self.update(k1n1_v);
             }
             return self;
         }