Merge branch 'master' into zen_stdlib

1 files changed, 448 insertions, 413 deletions

diff --git a/std/crypto/sha2.zig b/std/crypto/sha2.zig
index b70450c0ad..d1b915835c 100644
--- a/std/crypto/sha2.zig
+++ b/std/crypto/sha2.zig
@@ -9,12 +9,31 @@ const htest = @import("test.zig");
 // Sha224 + Sha256
 
 const RoundParam256 = struct {
-    a: usize, b: usize, c: usize, d: usize, e: usize, f: usize, g: usize, h: usize,
-    i: usize, k: u32,
+    a: usize,
+    b: usize,
+    c: usize,
+    d: usize,
+    e: usize,
+    f: usize,
+    g: usize,
+    h: usize,
+    i: usize,
+    k: u32,
 };
 
 fn Rp256(a: usize, b: usize, c: usize, d: usize, e: usize, f: usize, g: usize, h: usize, i: usize, k: u32) RoundParam256 {
-    return RoundParam256 { .a = a, .b = b, .c = c, .d = d, .e = e, .f = f, .g = g, .h = h, .i = i, .k = k };
+    return RoundParam256{
+        .a = a,
+        .b = b,
+        .c = c,
+        .d = d,
+        .e = e,
+        .f = f,
+        .g = g,
+        .h = h,
+        .i = i,
+        .k = k,
+    };
 }
 
 const Sha2Params32 = struct {
@@ -29,7 +48,7 @@ const Sha2Params32 = struct {
     out_len: usize,
 };
 
-const Sha224Params = Sha2Params32 {
+const Sha224Params = Sha2Params32{
     .iv0 = 0xC1059ED8,
     .iv1 = 0x367CD507,
     .iv2 = 0x3070DD17,
@@ -41,7 +60,7 @@ const Sha224Params = Sha2Params32 {
     .out_len = 224,
 };
 
-const Sha256Params = Sha2Params32 {
+const Sha256Params = Sha2Params32{
     .iv0 = 0x6A09E667,
     .iv1 = 0xBB67AE85,
     .iv2 = 0x3C6EF372,
@@ -56,216 +75,215 @@ const Sha256Params = Sha2Params32 {
 pub const Sha224 = Sha2_32(Sha224Params);
 pub const Sha256 = Sha2_32(Sha256Params);
 
-fn Sha2_32(comptime params: Sha2Params32) type { return struct {
-    const Self = this;
-    const block_size = 64;
-    const digest_size = params.out_len / 8;
-
-    s: [8]u32,
-    // Streaming Cache
-    buf: [64]u8,
-    buf_len: u8,
-    total_len: u64,
-
-    pub fn init() Self {
-        var d: Self = undefined;
-        d.reset();
-        return d;
-    }
-
-    pub fn reset(d: &Self) void {
-        d.s[0] = params.iv0;
-        d.s[1] = params.iv1;
-        d.s[2] = params.iv2;
-        d.s[3] = params.iv3;
-        d.s[4] = params.iv4;
-        d.s[5] = params.iv5;
-        d.s[6] = params.iv6;
-        d.s[7] = params.iv7;
-        d.buf_len = 0;
-        d.total_len = 0;
-    }
-
-    pub fn hash(b: []const u8, out: []u8) void {
-        var d = Self.init();
-        d.update(b);
-        d.final(out);
-    }
-
-    pub fn update(d: &Self, b: []const u8) void {
-        var off: usize = 0;
-
-        // Partial buffer exists from previous update. Copy into buffer then hash.
-        if (d.buf_len != 0 and d.buf_len + b.len > 64) {
-            off += 64 - d.buf_len;
-            mem.copy(u8, d.buf[d.buf_len..], b[0..off]);
+fn Sha2_32(comptime params: Sha2Params32) type {
+    return struct {
+        const Self = this;
+        const block_size = 64;
+        const digest_size = params.out_len / 8;
+
+        s: [8]u32,
+        // Streaming Cache
+        buf: [64]u8,
+        buf_len: u8,
+        total_len: u64,
+
+        pub fn init() Self {
+            var d: Self = undefined;
+            d.reset();
+            return d;
+        }
 
-            d.round(d.buf[0..]);
+        pub fn reset(d: *Self) void {
+            d.s[0] = params.iv0;
+            d.s[1] = params.iv1;
+            d.s[2] = params.iv2;
+            d.s[3] = params.iv3;
+            d.s[4] = params.iv4;
+            d.s[5] = params.iv5;
+            d.s[6] = params.iv6;
+            d.s[7] = params.iv7;
             d.buf_len = 0;
+            d.total_len = 0;
         }
 
-        // Full middle blocks.
-        while (off + 64 <= b.len) : (off += 64) {
-            d.round(b[off..off + 64]);
+        pub fn hash(b: []const u8, out: []u8) void {
+            var d = Self.init();
+            d.update(b);
+            d.final(out);
         }
 
-        // Copy any remainder for next pass.
-        mem.copy(u8, d.buf[d.buf_len..], b[off..]);
-        d.buf_len += u8(b[off..].len);
+        pub fn update(d: *Self, b: []const u8) void {
+            var off: usize = 0;
 
-        d.total_len += b.len;
-    }
+            // Partial buffer exists from previous update. Copy into buffer then hash.
+            if (d.buf_len != 0 and d.buf_len + b.len > 64) {
+                off += 64 - d.buf_len;
+                mem.copy(u8, d.buf[d.buf_len..], b[0..off]);
 
-    pub fn final(d: &Self, out: []u8) void {
-        debug.assert(out.len >= params.out_len / 8);
+                d.round(d.buf[0..]);
+                d.buf_len = 0;
+            }
 
-        // The buffer here will never be completely full.
-        mem.set(u8, d.buf[d.buf_len..], 0);
+            // Full middle blocks.
+            while (off + 64 <= b.len) : (off += 64) {
+                d.round(b[off .. off + 64]);
+            }
 
-        // Append padding bits.
-        d.buf[d.buf_len] = 0x80;
-        d.buf_len += 1;
+            // Copy any remainder for next pass.
+            mem.copy(u8, d.buf[d.buf_len..], b[off..]);
+            d.buf_len += @intCast(u8, b[off..].len);
 
-        // > 448 mod 512 so need to add an extra round to wrap around.
-        if (64 - d.buf_len < 8) {
-            d.round(d.buf[0..]);
-            mem.set(u8, d.buf[0..], 0);
+            d.total_len += b.len;
         }
 
-        // Append message length.
-        var i: usize = 1;
-        var len = d.total_len >> 5;
-        d.buf[63] = u8(d.total_len & 0x1f) << 3;
-        while (i < 8) : (i += 1) {
-            d.buf[63 - i] = u8(len & 0xff);
-            len >>= 8;
-        }
+        pub fn final(d: *Self, out: []u8) void {
+            debug.assert(out.len >= params.out_len / 8);
 
-        d.round(d.buf[0..]);
+            // The buffer here will never be completely full.
+            mem.set(u8, d.buf[d.buf_len..], 0);
 
-        // May truncate for possible 224 output
-        const rr = d.s[0 .. params.out_len / 32];
+            // Append padding bits.
+            d.buf[d.buf_len] = 0x80;
+            d.buf_len += 1;
 
-        for (rr) |s, j| {
-            mem.writeInt(out[4*j .. 4*j + 4], s, builtin.Endian.Big);
-        }
-    }
+            // > 448 mod 512 so need to add an extra round to wrap around.
+            if (64 - d.buf_len < 8) {
+                d.round(d.buf[0..]);
+                mem.set(u8, d.buf[0..], 0);
+            }
+
+            // Append message length.
+            var i: usize = 1;
+            var len = d.total_len >> 5;
+            d.buf[63] = @intCast(u8, d.total_len & 0x1f) << 3;
+            while (i < 8) : (i += 1) {
+                d.buf[63 - i] = @intCast(u8, len & 0xff);
+                len >>= 8;
+            }
 
-    fn round(d: &Self, b: []const u8) void {
-        debug.assert(b.len == 64);
+            d.round(d.buf[0..]);
 
-        var s: [64]u32 = undefined;
+            // May truncate for possible 224 output
+            const rr = d.s[0 .. params.out_len / 32];
 
-        var i: usize = 0;
-        while (i < 16) : (i += 1) {
-            s[i] = 0;
-            s[i] |= u32(b[i*4+0]) << 24;
-            s[i] |= u32(b[i*4+1]) << 16;
-            s[i] |= u32(b[i*4+2]) <<  8;
-            s[i] |= u32(b[i*4+3]) <<  0;
-        }
-        while (i < 64) : (i += 1) {
-            s[i] =
-                s[i-16] +% s[i-7] +%
-                (math.rotr(u32, s[i-15], u32(7)) ^ math.rotr(u32, s[i-15], u32(18)) ^ (s[i-15] >> 3)) +%
-                (math.rotr(u32, s[i-2], u32(17)) ^ math.rotr(u32, s[i-2], u32(19)) ^ (s[i-2] >> 10));
+            for (rr) |s, j| {
+                mem.writeInt(out[4 * j .. 4 * j + 4], s, builtin.Endian.Big);
+            }
         }
 
-        var v: [8]u32 = []u32 {
-            d.s[0], d.s[1], d.s[2], d.s[3], d.s[4], d.s[5], d.s[6], d.s[7],
-        };
-
-        const round0 = comptime []RoundParam256 {
-            Rp256(0, 1, 2, 3, 4, 5, 6, 7,  0, 0x428A2F98),
-            Rp256(7, 0, 1, 2, 3, 4, 5, 6,  1, 0x71374491),
-            Rp256(6, 7, 0, 1, 2, 3, 4, 5,  2, 0xB5C0FBCF),
-            Rp256(5, 6, 7, 0, 1, 2, 3, 4,  3, 0xE9B5DBA5),
-            Rp256(4, 5, 6, 7, 0, 1, 2, 3,  4, 0x3956C25B),
-            Rp256(3, 4, 5, 6, 7, 0, 1, 2,  5, 0x59F111F1),
-            Rp256(2, 3, 4, 5, 6, 7, 0, 1,  6, 0x923F82A4),
-            Rp256(1, 2, 3, 4, 5, 6, 7, 0,  7, 0xAB1C5ED5),
-            Rp256(0, 1, 2, 3, 4, 5, 6, 7,  8, 0xD807AA98),
-            Rp256(7, 0, 1, 2, 3, 4, 5, 6,  9, 0x12835B01),
-            Rp256(6, 7, 0, 1, 2, 3, 4, 5, 10, 0x243185BE),
-            Rp256(5, 6, 7, 0, 1, 2, 3, 4, 11, 0x550C7DC3),
-            Rp256(4, 5, 6, 7, 0, 1, 2, 3, 12, 0x72BE5D74),
-            Rp256(3, 4, 5, 6, 7, 0, 1, 2, 13, 0x80DEB1FE),
-            Rp256(2, 3, 4, 5, 6, 7, 0, 1, 14, 0x9BDC06A7),
-            Rp256(1, 2, 3, 4, 5, 6, 7, 0, 15, 0xC19BF174),
-            Rp256(0, 1, 2, 3, 4, 5, 6, 7, 16, 0xE49B69C1),
-            Rp256(7, 0, 1, 2, 3, 4, 5, 6, 17, 0xEFBE4786),
-            Rp256(6, 7, 0, 1, 2, 3, 4, 5, 18, 0x0FC19DC6),
-            Rp256(5, 6, 7, 0, 1, 2, 3, 4, 19, 0x240CA1CC),
-            Rp256(4, 5, 6, 7, 0, 1, 2, 3, 20, 0x2DE92C6F),
-            Rp256(3, 4, 5, 6, 7, 0, 1, 2, 21, 0x4A7484AA),
-            Rp256(2, 3, 4, 5, 6, 7, 0, 1, 22, 0x5CB0A9DC),
-            Rp256(1, 2, 3, 4, 5, 6, 7, 0, 23, 0x76F988DA),
-            Rp256(0, 1, 2, 3, 4, 5, 6, 7, 24, 0x983E5152),
-            Rp256(7, 0, 1, 2, 3, 4, 5, 6, 25, 0xA831C66D),
-            Rp256(6, 7, 0, 1, 2, 3, 4, 5, 26, 0xB00327C8),
-            Rp256(5, 6, 7, 0, 1, 2, 3, 4, 27, 0xBF597FC7),
-            Rp256(4, 5, 6, 7, 0, 1, 2, 3, 28, 0xC6E00BF3),
-            Rp256(3, 4, 5, 6, 7, 0, 1, 2, 29, 0xD5A79147),
-            Rp256(2, 3, 4, 5, 6, 7, 0, 1, 30, 0x06CA6351),
-            Rp256(1, 2, 3, 4, 5, 6, 7, 0, 31, 0x14292967),
-            Rp256(0, 1, 2, 3, 4, 5, 6, 7, 32, 0x27B70A85),
-            Rp256(7, 0, 1, 2, 3, 4, 5, 6, 33, 0x2E1B2138),
-            Rp256(6, 7, 0, 1, 2, 3, 4, 5, 34, 0x4D2C6DFC),
-            Rp256(5, 6, 7, 0, 1, 2, 3, 4, 35, 0x53380D13),
-            Rp256(4, 5, 6, 7, 0, 1, 2, 3, 36, 0x650A7354),
-            Rp256(3, 4, 5, 6, 7, 0, 1, 2, 37, 0x766A0ABB),
-            Rp256(2, 3, 4, 5, 6, 7, 0, 1, 38, 0x81C2C92E),
-            Rp256(1, 2, 3, 4, 5, 6, 7, 0, 39, 0x92722C85),
-            Rp256(0, 1, 2, 3, 4, 5, 6, 7, 40, 0xA2BFE8A1),
-            Rp256(7, 0, 1, 2, 3, 4, 5, 6, 41, 0xA81A664B),
-            Rp256(6, 7, 0, 1, 2, 3, 4, 5, 42, 0xC24B8B70),
-            Rp256(5, 6, 7, 0, 1, 2, 3, 4, 43, 0xC76C51A3),
-            Rp256(4, 5, 6, 7, 0, 1, 2, 3, 44, 0xD192E819),
-            Rp256(3, 4, 5, 6, 7, 0, 1, 2, 45, 0xD6990624),
-            Rp256(2, 3, 4, 5, 6, 7, 0, 1, 46, 0xF40E3585),
-            Rp256(1, 2, 3, 4, 5, 6, 7, 0, 47, 0x106AA070),
-            Rp256(0, 1, 2, 3, 4, 5, 6, 7, 48, 0x19A4C116),
-            Rp256(7, 0, 1, 2, 3, 4, 5, 6, 49, 0x1E376C08),
-            Rp256(6, 7, 0, 1, 2, 3, 4, 5, 50, 0x2748774C),
-            Rp256(5, 6, 7, 0, 1, 2, 3, 4, 51, 0x34B0BCB5),
-            Rp256(4, 5, 6, 7, 0, 1, 2, 3, 52, 0x391C0CB3),
-            Rp256(3, 4, 5, 6, 7, 0, 1, 2, 53, 0x4ED8AA4A),
-            Rp256(2, 3, 4, 5, 6, 7, 0, 1, 54, 0x5B9CCA4F),
-            Rp256(1, 2, 3, 4, 5, 6, 7, 0, 55, 0x682E6FF3),
-            Rp256(0, 1, 2, 3, 4, 5, 6, 7, 56, 0x748F82EE),
-            Rp256(7, 0, 1, 2, 3, 4, 5, 6, 57, 0x78A5636F),
-            Rp256(6, 7, 0, 1, 2, 3, 4, 5, 58, 0x84C87814),
-            Rp256(5, 6, 7, 0, 1, 2, 3, 4, 59, 0x8CC70208),
-            Rp256(4, 5, 6, 7, 0, 1, 2, 3, 60, 0x90BEFFFA),
-            Rp256(3, 4, 5, 6, 7, 0, 1, 2, 61, 0xA4506CEB),
-            Rp256(2, 3, 4, 5, 6, 7, 0, 1, 62, 0xBEF9A3F7),
-            Rp256(1, 2, 3, 4, 5, 6, 7, 0, 63, 0xC67178F2),
-        };
-        inline for (round0) |r| {
-            v[r.h] =
-                v[r.h] +%
-                (math.rotr(u32, v[r.e], u32(6)) ^ math.rotr(u32, v[r.e], u32(11)) ^ math.rotr(u32, v[r.e], u32(25))) +%
-                (v[r.g] ^ (v[r.e] & (v[r.f] ^ v[r.g]))) +%
-                r.k +% s[r.i];
-
-            v[r.d] = v[r.d] +% v[r.h];
-
-            v[r.h] =
-                v[r.h] +%
-                (math.rotr(u32, v[r.a], u32(2)) ^ math.rotr(u32, v[r.a], u32(13)) ^ math.rotr(u32, v[r.a], u32(22))) +%
-                ((v[r.a] & (v[r.b] | v[r.c])) | (v[r.b] & v[r.c]));
+        fn round(d: *Self, b: []const u8) void {
+            debug.assert(b.len == 64);
+
+            var s: [64]u32 = undefined;
+
+            var i: usize = 0;
+            while (i < 16) : (i += 1) {
+                s[i] = 0;
+                s[i] |= u32(b[i * 4 + 0]) << 24;
+                s[i] |= u32(b[i * 4 + 1]) << 16;
+                s[i] |= u32(b[i * 4 + 2]) << 8;
+                s[i] |= u32(b[i * 4 + 3]) << 0;
+            }
+            while (i < 64) : (i += 1) {
+                s[i] = s[i - 16] +% s[i - 7] +% (math.rotr(u32, s[i - 15], u32(7)) ^ math.rotr(u32, s[i - 15], u32(18)) ^ (s[i - 15] >> 3)) +% (math.rotr(u32, s[i - 2], u32(17)) ^ math.rotr(u32, s[i - 2], u32(19)) ^ (s[i - 2] >> 10));
+            }
+
+            var v: [8]u32 = []u32{
+                d.s[0],
+                d.s[1],
+                d.s[2],
+                d.s[3],
+                d.s[4],
+                d.s[5],
+                d.s[6],
+                d.s[7],
+            };
+
+            const round0 = comptime []RoundParam256{
+                Rp256(0, 1, 2, 3, 4, 5, 6, 7, 0, 0x428A2F98),
+                Rp256(7, 0, 1, 2, 3, 4, 5, 6, 1, 0x71374491),
+                Rp256(6, 7, 0, 1, 2, 3, 4, 5, 2, 0xB5C0FBCF),
+                Rp256(5, 6, 7, 0, 1, 2, 3, 4, 3, 0xE9B5DBA5),
+                Rp256(4, 5, 6, 7, 0, 1, 2, 3, 4, 0x3956C25B),
+                Rp256(3, 4, 5, 6, 7, 0, 1, 2, 5, 0x59F111F1),
+                Rp256(2, 3, 4, 5, 6, 7, 0, 1, 6, 0x923F82A4),
+                Rp256(1, 2, 3, 4, 5, 6, 7, 0, 7, 0xAB1C5ED5),
+                Rp256(0, 1, 2, 3, 4, 5, 6, 7, 8, 0xD807AA98),
+                Rp256(7, 0, 1, 2, 3, 4, 5, 6, 9, 0x12835B01),
+                Rp256(6, 7, 0, 1, 2, 3, 4, 5, 10, 0x243185BE),
+                Rp256(5, 6, 7, 0, 1, 2, 3, 4, 11, 0x550C7DC3),
+                Rp256(4, 5, 6, 7, 0, 1, 2, 3, 12, 0x72BE5D74),
+                Rp256(3, 4, 5, 6, 7, 0, 1, 2, 13, 0x80DEB1FE),
+                Rp256(2, 3, 4, 5, 6, 7, 0, 1, 14, 0x9BDC06A7),
+                Rp256(1, 2, 3, 4, 5, 6, 7, 0, 15, 0xC19BF174),
+                Rp256(0, 1, 2, 3, 4, 5, 6, 7, 16, 0xE49B69C1),
+                Rp256(7, 0, 1, 2, 3, 4, 5, 6, 17, 0xEFBE4786),
+                Rp256(6, 7, 0, 1, 2, 3, 4, 5, 18, 0x0FC19DC6),
+                Rp256(5, 6, 7, 0, 1, 2, 3, 4, 19, 0x240CA1CC),
+                Rp256(4, 5, 6, 7, 0, 1, 2, 3, 20, 0x2DE92C6F),
+                Rp256(3, 4, 5, 6, 7, 0, 1, 2, 21, 0x4A7484AA),
+                Rp256(2, 3, 4, 5, 6, 7, 0, 1, 22, 0x5CB0A9DC),
+                Rp256(1, 2, 3, 4, 5, 6, 7, 0, 23, 0x76F988DA),
+                Rp256(0, 1, 2, 3, 4, 5, 6, 7, 24, 0x983E5152),
+                Rp256(7, 0, 1, 2, 3, 4, 5, 6, 25, 0xA831C66D),
+                Rp256(6, 7, 0, 1, 2, 3, 4, 5, 26, 0xB00327C8),
+                Rp256(5, 6, 7, 0, 1, 2, 3, 4, 27, 0xBF597FC7),
+                Rp256(4, 5, 6, 7, 0, 1, 2, 3, 28, 0xC6E00BF3),
+                Rp256(3, 4, 5, 6, 7, 0, 1, 2, 29, 0xD5A79147),
+                Rp256(2, 3, 4, 5, 6, 7, 0, 1, 30, 0x06CA6351),
+                Rp256(1, 2, 3, 4, 5, 6, 7, 0, 31, 0x14292967),
+                Rp256(0, 1, 2, 3, 4, 5, 6, 7, 32, 0x27B70A85),
+                Rp256(7, 0, 1, 2, 3, 4, 5, 6, 33, 0x2E1B2138),
+                Rp256(6, 7, 0, 1, 2, 3, 4, 5, 34, 0x4D2C6DFC),
+                Rp256(5, 6, 7, 0, 1, 2, 3, 4, 35, 0x53380D13),
+                Rp256(4, 5, 6, 7, 0, 1, 2, 3, 36, 0x650A7354),
+                Rp256(3, 4, 5, 6, 7, 0, 1, 2, 37, 0x766A0ABB),
+                Rp256(2, 3, 4, 5, 6, 7, 0, 1, 38, 0x81C2C92E),
+                Rp256(1, 2, 3, 4, 5, 6, 7, 0, 39, 0x92722C85),
+                Rp256(0, 1, 2, 3, 4, 5, 6, 7, 40, 0xA2BFE8A1),
+                Rp256(7, 0, 1, 2, 3, 4, 5, 6, 41, 0xA81A664B),
+                Rp256(6, 7, 0, 1, 2, 3, 4, 5, 42, 0xC24B8B70),
+                Rp256(5, 6, 7, 0, 1, 2, 3, 4, 43, 0xC76C51A3),
+                Rp256(4, 5, 6, 7, 0, 1, 2, 3, 44, 0xD192E819),
+                Rp256(3, 4, 5, 6, 7, 0, 1, 2, 45, 0xD6990624),
+                Rp256(2, 3, 4, 5, 6, 7, 0, 1, 46, 0xF40E3585),
+                Rp256(1, 2, 3, 4, 5, 6, 7, 0, 47, 0x106AA070),
+                Rp256(0, 1, 2, 3, 4, 5, 6, 7, 48, 0x19A4C116),
+                Rp256(7, 0, 1, 2, 3, 4, 5, 6, 49, 0x1E376C08),
+                Rp256(6, 7, 0, 1, 2, 3, 4, 5, 50, 0x2748774C),
+                Rp256(5, 6, 7, 0, 1, 2, 3, 4, 51, 0x34B0BCB5),
+                Rp256(4, 5, 6, 7, 0, 1, 2, 3, 52, 0x391C0CB3),
+                Rp256(3, 4, 5, 6, 7, 0, 1, 2, 53, 0x4ED8AA4A),
+                Rp256(2, 3, 4, 5, 6, 7, 0, 1, 54, 0x5B9CCA4F),
+                Rp256(1, 2, 3, 4, 5, 6, 7, 0, 55, 0x682E6FF3),
+                Rp256(0, 1, 2, 3, 4, 5, 6, 7, 56, 0x748F82EE),
+                Rp256(7, 0, 1, 2, 3, 4, 5, 6, 57, 0x78A5636F),
+                Rp256(6, 7, 0, 1, 2, 3, 4, 5, 58, 0x84C87814),
+                Rp256(5, 6, 7, 0, 1, 2, 3, 4, 59, 0x8CC70208),
+                Rp256(4, 5, 6, 7, 0, 1, 2, 3, 60, 0x90BEFFFA),
+                Rp256(3, 4, 5, 6, 7, 0, 1, 2, 61, 0xA4506CEB),
+                Rp256(2, 3, 4, 5, 6, 7, 0, 1, 62, 0xBEF9A3F7),
+                Rp256(1, 2, 3, 4, 5, 6, 7, 0, 63, 0xC67178F2),
+            };
+            inline for (round0) |r| {
+                v[r.h] = v[r.h] +% (math.rotr(u32, v[r.e], u32(6)) ^ math.rotr(u32, v[r.e], u32(11)) ^ math.rotr(u32, v[r.e], u32(25))) +% (v[r.g] ^ (v[r.e] & (v[r.f] ^ v[r.g]))) +% r.k +% s[r.i];
+
+                v[r.d] = v[r.d] +% v[r.h];
+
+                v[r.h] = v[r.h] +% (math.rotr(u32, v[r.a], u32(2)) ^ math.rotr(u32, v[r.a], u32(13)) ^ math.rotr(u32, v[r.a], u32(22))) +% ((v[r.a] & (v[r.b] | v[r.c])) | (v[r.b] & v[r.c]));
+            }
+
+            d.s[0] +%= v[0];
+            d.s[1] +%= v[1];
+            d.s[2] +%= v[2];
+            d.s[3] +%= v[3];
+            d.s[4] +%= v[4];
+            d.s[5] +%= v[5];
+            d.s[6] +%= v[6];
+            d.s[7] +%= v[7];
         }
-
-        d.s[0] +%= v[0];
-        d.s[1] +%= v[1];
-        d.s[2] +%= v[2];
-        d.s[3] +%= v[3];
-        d.s[4] +%= v[4];
-        d.s[5] +%= v[5];
-        d.s[6] +%= v[6];
-        d.s[7] +%= v[7];
-    }
-};}
+    };
+}
 
 test "sha224 single" {
     htest.assertEqualHash(Sha224, "d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f", "");
@@ -320,7 +338,7 @@ test "sha256 streaming" {
 }
 
 test "sha256 aligned final" {
-    var block = []u8 {0} ** Sha256.block_size;
+    var block = []u8{0} ** Sha256.block_size;
     var out: [Sha256.digest_size]u8 = undefined;
 
     var h = Sha256.init();
@@ -328,17 +346,35 @@ test "sha256 aligned final" {
     h.final(out[0..]);
 }
 
-
 /////////////////////
 // Sha384 + Sha512
 
 const RoundParam512 = struct {
-    a: usize, b: usize, c: usize, d: usize, e: usize, f: usize, g: usize, h: usize,
-    i: usize, k: u64,
+    a: usize,
+    b: usize,
+    c: usize,
+    d: usize,
+    e: usize,
+    f: usize,
+    g: usize,
+    h: usize,
+    i: usize,
+    k: u64,
 };
 
 fn Rp512(a: usize, b: usize, c: usize, d: usize, e: usize, f: usize, g: usize, h: usize, i: usize, k: u64) RoundParam512 {
-    return RoundParam512 { .a = a, .b = b, .c = c, .d = d, .e = e, .f = f, .g = g, .h = h, .i = i, .k = k };
+    return RoundParam512{
+        .a = a,
+        .b = b,
+        .c = c,
+        .d = d,
+        .e = e,
+        .f = f,
+        .g = g,
+        .h = h,
+        .i = i,
+        .k = k,
+    };
 }
 
 const Sha2Params64 = struct {
@@ -353,7 +389,7 @@ const Sha2Params64 = struct {
     out_len: usize,
 };
 
-const Sha384Params = Sha2Params64 {
+const Sha384Params = Sha2Params64{
     .iv0 = 0xCBBB9D5DC1059ED8,
     .iv1 = 0x629A292A367CD507,
     .iv2 = 0x9159015A3070DD17,
@@ -365,7 +401,7 @@ const Sha384Params = Sha2Params64 {
     .out_len = 384,
 };
 
-const Sha512Params = Sha2Params64 {
+const Sha512Params = Sha2Params64{
     .iv0 = 0x6A09E667F3BCC908,
     .iv1 = 0xBB67AE8584CAA73B,
     .iv2 = 0x3C6EF372FE94F82B,
@@ -374,242 +410,241 @@ const Sha512Params = Sha2Params64 {
     .iv5 = 0x9B05688C2B3E6C1F,
     .iv6 = 0x1F83D9ABFB41BD6B,
     .iv7 = 0x5BE0CD19137E2179,
-    .out_len = 512
+    .out_len = 512,
 };
 
 pub const Sha384 = Sha2_64(Sha384Params);
 pub const Sha512 = Sha2_64(Sha512Params);
 
-fn Sha2_64(comptime params: Sha2Params64) type { return struct {
-    const Self = this;
-    const block_size = 128;
-    const digest_size = params.out_len / 8;
-
-    s: [8]u64,
-    // Streaming Cache
-    buf: [128]u8,
-    buf_len: u8,
-    total_len: u128,
-
-    pub fn init() Self {
-        var d: Self = undefined;
-        d.reset();
-        return d;
-    }
-
-    pub fn reset(d: &Self) void {
-        d.s[0] = params.iv0;
-        d.s[1] = params.iv1;
-        d.s[2] = params.iv2;
-        d.s[3] = params.iv3;
-        d.s[4] = params.iv4;
-        d.s[5] = params.iv5;
-        d.s[6] = params.iv6;
-        d.s[7] = params.iv7;
-        d.buf_len = 0;
-        d.total_len = 0;
-    }
-
-    pub fn hash(b: []const u8, out: []u8) void {
-        var d = Self.init();
-        d.update(b);
-        d.final(out);
-    }
-
-    pub fn update(d: &Self, b: []const u8) void {
-        var off: usize = 0;
-
-        // Partial buffer exists from previous update. Copy into buffer then hash.
-        if (d.buf_len != 0 and d.buf_len + b.len > 128) {
-            off += 128 - d.buf_len;
-            mem.copy(u8, d.buf[d.buf_len..], b[0..off]);
+fn Sha2_64(comptime params: Sha2Params64) type {
+    return struct {
+        const Self = this;
+        const block_size = 128;
+        const digest_size = params.out_len / 8;
+
+        s: [8]u64,
+        // Streaming Cache
+        buf: [128]u8,
+        buf_len: u8,
+        total_len: u128,
+
+        pub fn init() Self {
+            var d: Self = undefined;
+            d.reset();
+            return d;
+        }
 
-            d.round(d.buf[0..]);
+        pub fn reset(d: *Self) void {
+            d.s[0] = params.iv0;
+            d.s[1] = params.iv1;
+            d.s[2] = params.iv2;
+            d.s[3] = params.iv3;
+            d.s[4] = params.iv4;
+            d.s[5] = params.iv5;
+            d.s[6] = params.iv6;
+            d.s[7] = params.iv7;
             d.buf_len = 0;
+            d.total_len = 0;
         }
 
-        // Full middle blocks.
-        while (off + 128 <= b.len) : (off += 128) {
-            d.round(b[off..off + 128]);
+        pub fn hash(b: []const u8, out: []u8) void {
+            var d = Self.init();
+            d.update(b);
+            d.final(out);
         }
 
-        // Copy any remainder for next pass.
-        mem.copy(u8, d.buf[d.buf_len..], b[off..]);
-        d.buf_len += u8(b[off..].len);
+        pub fn update(d: *Self, b: []const u8) void {
+            var off: usize = 0;
 
-        d.total_len += b.len;
-    }
+            // Partial buffer exists from previous update. Copy into buffer then hash.
+            if (d.buf_len != 0 and d.buf_len + b.len > 128) {
+                off += 128 - d.buf_len;
+                mem.copy(u8, d.buf[d.buf_len..], b[0..off]);
 
-    pub fn final(d: &Self, out: []u8) void {
-        debug.assert(out.len >= params.out_len / 8);
+                d.round(d.buf[0..]);
+                d.buf_len = 0;
+            }
 
-        // The buffer here will never be completely full.
-        mem.set(u8, d.buf[d.buf_len..], 0);
+            // Full middle blocks.
+            while (off + 128 <= b.len) : (off += 128) {
+                d.round(b[off .. off + 128]);
+            }
 
-        // Append padding bits.
-        d.buf[d.buf_len] = 0x80;
-        d.buf_len += 1;
+            // Copy any remainder for next pass.
+            mem.copy(u8, d.buf[d.buf_len..], b[off..]);
+            d.buf_len += @intCast(u8, b[off..].len);
 
-        // > 896 mod 1024 so need to add an extra round to wrap around.
-        if (128 - d.buf_len < 16) {
-            d.round(d.buf[0..]);
-            mem.set(u8, d.buf[0..], 0);
+            d.total_len += b.len;
         }
 
-        // Append message length.
-        var i: usize = 1;
-        var len = d.total_len >> 5;
-        d.buf[127] = u8(d.total_len & 0x1f) << 3;
-        while (i < 16) : (i += 1) {
-            d.buf[127 - i] = u8(len & 0xff);
-            len >>= 8;
-        }
+        pub fn final(d: *Self, out: []u8) void {
+            debug.assert(out.len >= params.out_len / 8);
 
-        d.round(d.buf[0..]);
+            // The buffer here will never be completely full.
+            mem.set(u8, d.buf[d.buf_len..], 0);
 
-        // May truncate for possible 384 output
-        const rr = d.s[0 .. params.out_len / 64];
+            // Append padding bits.
+            d.buf[d.buf_len] = 0x80;
+            d.buf_len += 1;
 
-        for (rr) |s, j| {
-            mem.writeInt(out[8*j .. 8*j + 8], s, builtin.Endian.Big);
-        }
-    }
-
-    fn round(d: &Self, b: []const u8) void {
-        debug.assert(b.len == 128);
-
-        var s: [80]u64 = undefined;
-
-        var i: usize = 0;
-        while (i < 16) : (i += 1) {
-            s[i] = 0;
-            s[i] |= u64(b[i*8+0]) << 56;
-            s[i] |= u64(b[i*8+1]) << 48;
-            s[i] |= u64(b[i*8+2]) << 40;
-            s[i] |= u64(b[i*8+3]) << 32;
-            s[i] |= u64(b[i*8+4]) << 24;
-            s[i] |= u64(b[i*8+5]) << 16;
-            s[i] |= u64(b[i*8+6]) <<  8;
-            s[i] |= u64(b[i*8+7]) <<  0;
-        }
-        while (i < 80) : (i += 1) {
-            s[i] =
-                s[i-16] +% s[i-7] +%
-                (math.rotr(u64, s[i-15], u64(1)) ^ math.rotr(u64, s[i-15], u64(8)) ^ (s[i-15] >> 7)) +%
-                (math.rotr(u64, s[i-2], u64(19)) ^ math.rotr(u64, s[i-2], u64(61)) ^ (s[i-2] >> 6));
-        }
+            // > 896 mod 1024 so need to add an extra round to wrap around.
+            if (128 - d.buf_len < 16) {
+                d.round(d.buf[0..]);
+                mem.set(u8, d.buf[0..], 0);
+            }
 
-        var v: [8]u64 = []u64 {
-            d.s[0], d.s[1], d.s[2], d.s[3], d.s[4], d.s[5], d.s[6], d.s[7],
-        };
-
-        const round0 = comptime []RoundParam512 {
-            Rp512(0, 1, 2, 3, 4, 5, 6, 7,  0, 0x428A2F98D728AE22),
-            Rp512(7, 0, 1, 2, 3, 4, 5, 6,  1, 0x7137449123EF65CD),
-            Rp512(6, 7, 0, 1, 2, 3, 4, 5,  2, 0xB5C0FBCFEC4D3B2F),
-            Rp512(5, 6, 7, 0, 1, 2, 3, 4,  3, 0xE9B5DBA58189DBBC),
-            Rp512(4, 5, 6, 7, 0, 1, 2, 3,  4, 0x3956C25BF348B538),
-            Rp512(3, 4, 5, 6, 7, 0, 1, 2,  5, 0x59F111F1B605D019),
-            Rp512(2, 3, 4, 5, 6, 7, 0, 1,  6, 0x923F82A4AF194F9B),
-            Rp512(1, 2, 3, 4, 5, 6, 7, 0,  7, 0xAB1C5ED5DA6D8118),
-            Rp512(0, 1, 2, 3, 4, 5, 6, 7,  8, 0xD807AA98A3030242),
-            Rp512(7, 0, 1, 2, 3, 4, 5, 6,  9, 0x12835B0145706FBE),
-            Rp512(6, 7, 0, 1, 2, 3, 4, 5, 10, 0x243185BE4EE4B28C),
-            Rp512(5, 6, 7, 0, 1, 2, 3, 4, 11, 0x550C7DC3D5FFB4E2),
-            Rp512(4, 5, 6, 7, 0, 1, 2, 3, 12, 0x72BE5D74F27B896F),
-            Rp512(3, 4, 5, 6, 7, 0, 1, 2, 13, 0x80DEB1FE3B1696B1),
-            Rp512(2, 3, 4, 5, 6, 7, 0, 1, 14, 0x9BDC06A725C71235),
-            Rp512(1, 2, 3, 4, 5, 6, 7, 0, 15, 0xC19BF174CF692694),
-            Rp512(0, 1, 2, 3, 4, 5, 6, 7, 16, 0xE49B69C19EF14AD2),
-            Rp512(7, 0, 1, 2, 3, 4, 5, 6, 17, 0xEFBE4786384F25E3),
-            Rp512(6, 7, 0, 1, 2, 3, 4, 5, 18, 0x0FC19DC68B8CD5B5),
-            Rp512(5, 6, 7, 0, 1, 2, 3, 4, 19, 0x240CA1CC77AC9C65),
-            Rp512(4, 5, 6, 7, 0, 1, 2, 3, 20, 0x2DE92C6F592B0275),
-            Rp512(3, 4, 5, 6, 7, 0, 1, 2, 21, 0x4A7484AA6EA6E483),
-            Rp512(2, 3, 4, 5, 6, 7, 0, 1, 22, 0x5CB0A9DCBD41FBD4),
-            Rp512(1, 2, 3, 4, 5, 6, 7, 0, 23, 0x76F988DA831153B5),
-            Rp512(0, 1, 2, 3, 4, 5, 6, 7, 24, 0x983E5152EE66DFAB),
-            Rp512(7, 0, 1, 2, 3, 4, 5, 6, 25, 0xA831C66D2DB43210),
-            Rp512(6, 7, 0, 1, 2, 3, 4, 5, 26, 0xB00327C898FB213F),
-            Rp512(5, 6, 7, 0, 1, 2, 3, 4, 27, 0xBF597FC7BEEF0EE4),
-            Rp512(4, 5, 6, 7, 0, 1, 2, 3, 28, 0xC6E00BF33DA88FC2),
-            Rp512(3, 4, 5, 6, 7, 0, 1, 2, 29, 0xD5A79147930AA725),
-            Rp512(2, 3, 4, 5, 6, 7, 0, 1, 30, 0x06CA6351E003826F),
-            Rp512(1, 2, 3, 4, 5, 6, 7, 0, 31, 0x142929670A0E6E70),
-            Rp512(0, 1, 2, 3, 4, 5, 6, 7, 32, 0x27B70A8546D22FFC),
-            Rp512(7, 0, 1, 2, 3, 4, 5, 6, 33, 0x2E1B21385C26C926),
-            Rp512(6, 7, 0, 1, 2, 3, 4, 5, 34, 0x4D2C6DFC5AC42AED),
-            Rp512(5, 6, 7, 0, 1, 2, 3, 4, 35, 0x53380D139D95B3DF),
-            Rp512(4, 5, 6, 7, 0, 1, 2, 3, 36, 0x650A73548BAF63DE),
-            Rp512(3, 4, 5, 6, 7, 0, 1, 2, 37, 0x766A0ABB3C77B2A8),
-            Rp512(2, 3, 4, 5, 6, 7, 0, 1, 38, 0x81C2C92E47EDAEE6),
-            Rp512(1, 2, 3, 4, 5, 6, 7, 0, 39, 0x92722C851482353B),
-            Rp512(0, 1, 2, 3, 4, 5, 6, 7, 40, 0xA2BFE8A14CF10364),
-            Rp512(7, 0, 1, 2, 3, 4, 5, 6, 41, 0xA81A664BBC423001),
-            Rp512(6, 7, 0, 1, 2, 3, 4, 5, 42, 0xC24B8B70D0F89791),
-            Rp512(5, 6, 7, 0, 1, 2, 3, 4, 43, 0xC76C51A30654BE30),
-            Rp512(4, 5, 6, 7, 0, 1, 2, 3, 44, 0xD192E819D6EF5218),
-            Rp512(3, 4, 5, 6, 7, 0, 1, 2, 45, 0xD69906245565A910),
-            Rp512(2, 3, 4, 5, 6, 7, 0, 1, 46, 0xF40E35855771202A),
-            Rp512(1, 2, 3, 4, 5, 6, 7, 0, 47, 0x106AA07032BBD1B8),
-            Rp512(0, 1, 2, 3, 4, 5, 6, 7, 48, 0x19A4C116B8D2D0C8),
-            Rp512(7, 0, 1, 2, 3, 4, 5, 6, 49, 0x1E376C085141AB53),
-            Rp512(6, 7, 0, 1, 2, 3, 4, 5, 50, 0x2748774CDF8EEB99),
-            Rp512(5, 6, 7, 0, 1, 2, 3, 4, 51, 0x34B0BCB5E19B48A8),
-            Rp512(4, 5, 6, 7, 0, 1, 2, 3, 52, 0x391C0CB3C5C95A63),
-            Rp512(3, 4, 5, 6, 7, 0, 1, 2, 53, 0x4ED8AA4AE3418ACB),
-            Rp512(2, 3, 4, 5, 6, 7, 0, 1, 54, 0x5B9CCA4F7763E373),
-            Rp512(1, 2, 3, 4, 5, 6, 7, 0, 55, 0x682E6FF3D6B2B8A3),
-            Rp512(0, 1, 2, 3, 4, 5, 6, 7, 56, 0x748F82EE5DEFB2FC),
-            Rp512(7, 0, 1, 2, 3, 4, 5, 6, 57, 0x78A5636F43172F60),
-            Rp512(6, 7, 0, 1, 2, 3, 4, 5, 58, 0x84C87814A1F0AB72),
-            Rp512(5, 6, 7, 0, 1, 2, 3, 4, 59, 0x8CC702081A6439EC),
-            Rp512(4, 5, 6, 7, 0, 1, 2, 3, 60, 0x90BEFFFA23631E28),
-            Rp512(3, 4, 5, 6, 7, 0, 1, 2, 61, 0xA4506CEBDE82BDE9),
-            Rp512(2, 3, 4, 5, 6, 7, 0, 1, 62, 0xBEF9A3F7B2C67915),
-            Rp512(1, 2, 3, 4, 5, 6, 7, 0, 63, 0xC67178F2E372532B),
-            Rp512(0, 1, 2, 3, 4, 5, 6, 7, 64, 0xCA273ECEEA26619C),
-            Rp512(7, 0, 1, 2, 3, 4, 5, 6, 65, 0xD186B8C721C0C207),
-            Rp512(6, 7, 0, 1, 2, 3, 4, 5, 66, 0xEADA7DD6CDE0EB1E),
-            Rp512(5, 6, 7, 0, 1, 2, 3, 4, 67, 0xF57D4F7FEE6ED178),
-            Rp512(4, 5, 6, 7, 0, 1, 2, 3, 68, 0x06F067AA72176FBA),
-            Rp512(3, 4, 5, 6, 7, 0, 1, 2, 69, 0x0A637DC5A2C898A6),
-            Rp512(2, 3, 4, 5, 6, 7, 0, 1, 70, 0x113F9804BEF90DAE),
-            Rp512(1, 2, 3, 4, 5, 6, 7, 0, 71, 0x1B710B35131C471B),
-            Rp512(0, 1, 2, 3, 4, 5, 6, 7, 72, 0x28DB77F523047D84),
-            Rp512(7, 0, 1, 2, 3, 4, 5, 6, 73, 0x32CAAB7B40C72493),
-            Rp512(6, 7, 0, 1, 2, 3, 4, 5, 74, 0x3C9EBE0A15C9BEBC),
-            Rp512(5, 6, 7, 0, 1, 2, 3, 4, 75, 0x431D67C49C100D4C),
-            Rp512(4, 5, 6, 7, 0, 1, 2, 3, 76, 0x4CC5D4BECB3E42B6),
-            Rp512(3, 4, 5, 6, 7, 0, 1, 2, 77, 0x597F299CFC657E2A),
-            Rp512(2, 3, 4, 5, 6, 7, 0, 1, 78, 0x5FCB6FAB3AD6FAEC),
-            Rp512(1, 2, 3, 4, 5, 6, 7, 0, 79, 0x6C44198C4A475817),
-        };
-        inline for (round0) |r| {
-            v[r.h] =
-                v[r.h] +%
-                (math.rotr(u64, v[r.e], u64(14)) ^ math.rotr(u64, v[r.e], u64(18)) ^ math.rotr(u64, v[r.e], u64(41))) +%
-                (v[r.g] ^ (v[r.e] & (v[r.f] ^ v[r.g]))) +%
-                r.k +% s[r.i];
-
-            v[r.d] = v[r.d] +% v[r.h];
-
-            v[r.h] =
-                v[r.h] +%
-                (math.rotr(u64, v[r.a], u64(28)) ^ math.rotr(u64, v[r.a], u64(34)) ^ math.rotr(u64, v[r.a], u64(39))) +%
-                ((v[r.a] & (v[r.b] | v[r.c])) | (v[r.b] & v[r.c]));
+            // Append message length.
+            var i: usize = 1;
+            var len = d.total_len >> 5;
+            d.buf[127] = @intCast(u8, d.total_len & 0x1f) << 3;
+            while (i < 16) : (i += 1) {
+                d.buf[127 - i] = @intCast(u8, len & 0xff);
+                len >>= 8;
+            }
+
+            d.round(d.buf[0..]);
+
+            // May truncate for possible 384 output
+            const rr = d.s[0 .. params.out_len / 64];
+
+            for (rr) |s, j| {
+                mem.writeInt(out[8 * j .. 8 * j + 8], s, builtin.Endian.Big);
+            }
         }
 
-        d.s[0] +%= v[0];
-        d.s[1] +%= v[1];
-        d.s[2] +%= v[2];
-        d.s[3] +%= v[3];
-        d.s[4] +%= v[4];
-        d.s[5] +%= v[5];
-        d.s[6] +%= v[6];
-        d.s[7] +%= v[7];
-    }
-};}
+        fn round(d: *Self, b: []const u8) void {
+            debug.assert(b.len == 128);
+
+            var s: [80]u64 = undefined;
+
+            var i: usize = 0;
+            while (i < 16) : (i += 1) {
+                s[i] = 0;
+                s[i] |= u64(b[i * 8 + 0]) << 56;
+                s[i] |= u64(b[i * 8 + 1]) << 48;
+                s[i] |= u64(b[i * 8 + 2]) << 40;
+                s[i] |= u64(b[i * 8 + 3]) << 32;
+                s[i] |= u64(b[i * 8 + 4]) << 24;
+                s[i] |= u64(b[i * 8 + 5]) << 16;
+                s[i] |= u64(b[i * 8 + 6]) << 8;
+                s[i] |= u64(b[i * 8 + 7]) << 0;
+            }
+            while (i < 80) : (i += 1) {
+                s[i] = s[i - 16] +% s[i - 7] +% (math.rotr(u64, s[i - 15], u64(1)) ^ math.rotr(u64, s[i - 15], u64(8)) ^ (s[i - 15] >> 7)) +% (math.rotr(u64, s[i - 2], u64(19)) ^ math.rotr(u64, s[i - 2], u64(61)) ^ (s[i - 2] >> 6));
+            }
+
+            var v: [8]u64 = []u64{
+                d.s[0],
+                d.s[1],
+                d.s[2],
+                d.s[3],
+                d.s[4],
+                d.s[5],
+                d.s[6],
+                d.s[7],
+            };
+
+            const round0 = comptime []RoundParam512{
+                Rp512(0, 1, 2, 3, 4, 5, 6, 7, 0, 0x428A2F98D728AE22),
+                Rp512(7, 0, 1, 2, 3, 4, 5, 6, 1, 0x7137449123EF65CD),
+                Rp512(6, 7, 0, 1, 2, 3, 4, 5, 2, 0xB5C0FBCFEC4D3B2F),
+                Rp512(5, 6, 7, 0, 1, 2, 3, 4, 3, 0xE9B5DBA58189DBBC),
+                Rp512(4, 5, 6, 7, 0, 1, 2, 3, 4, 0x3956C25BF348B538),
+                Rp512(3, 4, 5, 6, 7, 0, 1, 2, 5, 0x59F111F1B605D019),
+                Rp512(2, 3, 4, 5, 6, 7, 0, 1, 6, 0x923F82A4AF194F9B),
+                Rp512(1, 2, 3, 4, 5, 6, 7, 0, 7, 0xAB1C5ED5DA6D8118),
+                Rp512(0, 1, 2, 3, 4, 5, 6, 7, 8, 0xD807AA98A3030242),
+                Rp512(7, 0, 1, 2, 3, 4, 5, 6, 9, 0x12835B0145706FBE),
+                Rp512(6, 7, 0, 1, 2, 3, 4, 5, 10, 0x243185BE4EE4B28C),
+                Rp512(5, 6, 7, 0, 1, 2, 3, 4, 11, 0x550C7DC3D5FFB4E2),
+                Rp512(4, 5, 6, 7, 0, 1, 2, 3, 12, 0x72BE5D74F27B896F),
+                Rp512(3, 4, 5, 6, 7, 0, 1, 2, 13, 0x80DEB1FE3B1696B1),
+                Rp512(2, 3, 4, 5, 6, 7, 0, 1, 14, 0x9BDC06A725C71235),
+                Rp512(1, 2, 3, 4, 5, 6, 7, 0, 15, 0xC19BF174CF692694),
+                Rp512(0, 1, 2, 3, 4, 5, 6, 7, 16, 0xE49B69C19EF14AD2),
+                Rp512(7, 0, 1, 2, 3, 4, 5, 6, 17, 0xEFBE4786384F25E3),
+                Rp512(6, 7, 0, 1, 2, 3, 4, 5, 18, 0x0FC19DC68B8CD5B5),
+                Rp512(5, 6, 7, 0, 1, 2, 3, 4, 19, 0x240CA1CC77AC9C65),
+                Rp512(4, 5, 6, 7, 0, 1, 2, 3, 20, 0x2DE92C6F592B0275),
+                Rp512(3, 4, 5, 6, 7, 0, 1, 2, 21, 0x4A7484AA6EA6E483),
+                Rp512(2, 3, 4, 5, 6, 7, 0, 1, 22, 0x5CB0A9DCBD41FBD4),
+                Rp512(1, 2, 3, 4, 5, 6, 7, 0, 23, 0x76F988DA831153B5),
+                Rp512(0, 1, 2, 3, 4, 5, 6, 7, 24, 0x983E5152EE66DFAB),
+                Rp512(7, 0, 1, 2, 3, 4, 5, 6, 25, 0xA831C66D2DB43210),
+                Rp512(6, 7, 0, 1, 2, 3, 4, 5, 26, 0xB00327C898FB213F),
+                Rp512(5, 6, 7, 0, 1, 2, 3, 4, 27, 0xBF597FC7BEEF0EE4),
+                Rp512(4, 5, 6, 7, 0, 1, 2, 3, 28, 0xC6E00BF33DA88FC2),
+                Rp512(3, 4, 5, 6, 7, 0, 1, 2, 29, 0xD5A79147930AA725),
+                Rp512(2, 3, 4, 5, 6, 7, 0, 1, 30, 0x06CA6351E003826F),
+                Rp512(1, 2, 3, 4, 5, 6, 7, 0, 31, 0x142929670A0E6E70),
+                Rp512(0, 1, 2, 3, 4, 5, 6, 7, 32, 0x27B70A8546D22FFC),
+                Rp512(7, 0, 1, 2, 3, 4, 5, 6, 33, 0x2E1B21385C26C926),
+                Rp512(6, 7, 0, 1, 2, 3, 4, 5, 34, 0x4D2C6DFC5AC42AED),
+                Rp512(5, 6, 7, 0, 1, 2, 3, 4, 35, 0x53380D139D95B3DF),
+                Rp512(4, 5, 6, 7, 0, 1, 2, 3, 36, 0x650A73548BAF63DE),
+                Rp512(3, 4, 5, 6, 7, 0, 1, 2, 37, 0x766A0ABB3C77B2A8),
+                Rp512(2, 3, 4, 5, 6, 7, 0, 1, 38, 0x81C2C92E47EDAEE6),
+                Rp512(1, 2, 3, 4, 5, 6, 7, 0, 39, 0x92722C851482353B),
+                Rp512(0, 1, 2, 3, 4, 5, 6, 7, 40, 0xA2BFE8A14CF10364),
+                Rp512(7, 0, 1, 2, 3, 4, 5, 6, 41, 0xA81A664BBC423001),
+                Rp512(6, 7, 0, 1, 2, 3, 4, 5, 42, 0xC24B8B70D0F89791),
+                Rp512(5, 6, 7, 0, 1, 2, 3, 4, 43, 0xC76C51A30654BE30),
+                Rp512(4, 5, 6, 7, 0, 1, 2, 3, 44, 0xD192E819D6EF5218),
+                Rp512(3, 4, 5, 6, 7, 0, 1, 2, 45, 0xD69906245565A910),
+                Rp512(2, 3, 4, 5, 6, 7, 0, 1, 46, 0xF40E35855771202A),
+                Rp512(1, 2, 3, 4, 5, 6, 7, 0, 47, 0x106AA07032BBD1B8),
+                Rp512(0, 1, 2, 3, 4, 5, 6, 7, 48, 0x19A4C116B8D2D0C8),
+                Rp512(7, 0, 1, 2, 3, 4, 5, 6, 49, 0x1E376C085141AB53),
+                Rp512(6, 7, 0, 1, 2, 3, 4, 5, 50, 0x2748774CDF8EEB99),
+                Rp512(5, 6, 7, 0, 1, 2, 3, 4, 51, 0x34B0BCB5E19B48A8),
+                Rp512(4, 5, 6, 7, 0, 1, 2, 3, 52, 0x391C0CB3C5C95A63),
+                Rp512(3, 4, 5, 6, 7, 0, 1, 2, 53, 0x4ED8AA4AE3418ACB),
+                Rp512(2, 3, 4, 5, 6, 7, 0, 1, 54, 0x5B9CCA4F7763E373),
+                Rp512(1, 2, 3, 4, 5, 6, 7, 0, 55, 0x682E6FF3D6B2B8A3),
+                Rp512(0, 1, 2, 3, 4, 5, 6, 7, 56, 0x748F82EE5DEFB2FC),
+                Rp512(7, 0, 1, 2, 3, 4, 5, 6, 57, 0x78A5636F43172F60),
+                Rp512(6, 7, 0, 1, 2, 3, 4, 5, 58, 0x84C87814A1F0AB72),
+                Rp512(5, 6, 7, 0, 1, 2, 3, 4, 59, 0x8CC702081A6439EC),
+                Rp512(4, 5, 6, 7, 0, 1, 2, 3, 60, 0x90BEFFFA23631E28),
+                Rp512(3, 4, 5, 6, 7, 0, 1, 2, 61, 0xA4506CEBDE82BDE9),
+                Rp512(2, 3, 4, 5, 6, 7, 0, 1, 62, 0xBEF9A3F7B2C67915),
+                Rp512(1, 2, 3, 4, 5, 6, 7, 0, 63, 0xC67178F2E372532B),
+                Rp512(0, 1, 2, 3, 4, 5, 6, 7, 64, 0xCA273ECEEA26619C),
+                Rp512(7, 0, 1, 2, 3, 4, 5, 6, 65, 0xD186B8C721C0C207),
+                Rp512(6, 7, 0, 1, 2, 3, 4, 5, 66, 0xEADA7DD6CDE0EB1E),
+                Rp512(5, 6, 7, 0, 1, 2, 3, 4, 67, 0xF57D4F7FEE6ED178),
+                Rp512(4, 5, 6, 7, 0, 1, 2, 3, 68, 0x06F067AA72176FBA),
+                Rp512(3, 4, 5, 6, 7, 0, 1, 2, 69, 0x0A637DC5A2C898A6),
+                Rp512(2, 3, 4, 5, 6, 7, 0, 1, 70, 0x113F9804BEF90DAE),
+                Rp512(1, 2, 3, 4, 5, 6, 7, 0, 71, 0x1B710B35131C471B),
+                Rp512(0, 1, 2, 3, 4, 5, 6, 7, 72, 0x28DB77F523047D84),
+                Rp512(7, 0, 1, 2, 3, 4, 5, 6, 73, 0x32CAAB7B40C72493),
+                Rp512(6, 7, 0, 1, 2, 3, 4, 5, 74, 0x3C9EBE0A15C9BEBC),
+                Rp512(5, 6, 7, 0, 1, 2, 3, 4, 75, 0x431D67C49C100D4C),
+                Rp512(4, 5, 6, 7, 0, 1, 2, 3, 76, 0x4CC5D4BECB3E42B6),
+                Rp512(3, 4, 5, 6, 7, 0, 1, 2, 77, 0x597F299CFC657E2A),
+                Rp512(2, 3, 4, 5, 6, 7, 0, 1, 78, 0x5FCB6FAB3AD6FAEC),
+                Rp512(1, 2, 3, 4, 5, 6, 7, 0, 79, 0x6C44198C4A475817),
+            };
+            inline for (round0) |r| {
+                v[r.h] = v[r.h] +% (math.rotr(u64, v[r.e], u64(14)) ^ math.rotr(u64, v[r.e], u64(18)) ^ math.rotr(u64, v[r.e], u64(41))) +% (v[r.g] ^ (v[r.e] & (v[r.f] ^ v[r.g]))) +% r.k +% s[r.i];
+
+                v[r.d] = v[r.d] +% v[r.h];
+
+                v[r.h] = v[r.h] +% (math.rotr(u64, v[r.a], u64(28)) ^ math.rotr(u64, v[r.a], u64(34)) ^ math.rotr(u64, v[r.a], u64(39))) +% ((v[r.a] & (v[r.b] | v[r.c])) | (v[r.b] & v[r.c]));
+            }
+
+            d.s[0] +%= v[0];
+            d.s[1] +%= v[1];
+            d.s[2] +%= v[2];
+            d.s[3] +%= v[3];
+            d.s[4] +%= v[4];
+            d.s[5] +%= v[5];
+            d.s[6] +%= v[6];
+            d.s[7] +%= v[7];
+        }
+    };
+}
 
 test "sha384 single" {
     const h1 = "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b";
@@ -680,7 +715,7 @@ test "sha512 streaming" {
 }
 
 test "sha512 aligned final" {
-    var block = []u8 {0} ** Sha512.block_size;
+    var block = []u8{0} ** Sha512.block_size;
     var out: [Sha512.digest_size]u8 = undefined;
 
     var h = Sha512.init();