From f68c2e0a14c7d9997db0305981ce3e5998d88a36 Mon Sep 17 00:00:00 2001
From: Marc Tiehuis <marctiehuis@gmail.com>
Date: Wed, 4 Apr 2018 21:32:23 +1200
Subject: [PATCH] Fix off-by-one error in all crypto functions

---
 std/crypto/blake2.zig | 22 ++++++++++++++++++++--
 std/crypto/md5.zig    | 11 ++++++++++-
 std/crypto/sha1.zig   | 11 ++++++++++-
 std/crypto/sha2.zig   | 22 ++++++++++++++++++++--
 std/crypto/sha3.zig   | 18 ++++++++++++++++++
 5 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/std/crypto/blake2.zig b/std/crypto/blake2.zig
index ea0a68b184..99f0e629cd 100644
--- a/std/crypto/blake2.zig
+++ b/std/crypto/blake2.zig
@@ -84,7 +84,7 @@ fn Blake2s(comptime out_len: usize) type { return struct {
         }
 
         // Full middle blocks.
-        while (off + 64 < b.len) : (off += 64) {
+        while (off + 64 <= b.len) : (off += 64) {
             d.t += 64;
             d.round(b[off..off + 64], false);
         }
@@ -229,6 +229,15 @@ test "blake2s256 streaming" {
     htest.assertEqual(h2, out[0..]);
 }
 
+test "blake2s256 aligned final" {
+    var block = []u8 {0} ** Blake2s256.block_size;
+    var out: [Blake2s256.digest_size]u8 = undefined;
+
+    var h = Blake2s256.init();
+    h.update(block);
+    h.final(out[0..]);
+}
+
 
 /////////////////////
 // Blake2b
@@ -305,7 +314,7 @@ fn Blake2b(comptime out_len: usize) type { return struct {
         }
 
         // Full middle blocks.
-        while (off + 128 < b.len) : (off += 128) {
+        while (off + 128 <= b.len) : (off += 128) {
             d.t += 128;
             d.round(b[off..off + 128], false);
         }
@@ -447,3 +456,12 @@ test "blake2b512 streaming" {
     h.final(out[0..]);
     htest.assertEqual(h2, out[0..]);
 }
+
+test "blake2b512 aligned final" {
+    var block = []u8 {0} ** Blake2b512.block_size;
+    var out: [Blake2b512.digest_size]u8 = undefined;
+
+    var h = Blake2b512.init();
+    h.update(block);
+    h.final(out[0..]);
+}
diff --git a/std/crypto/md5.zig b/std/crypto/md5.zig
index 26700cd65b..705b2428a7 100644
--- a/std/crypto/md5.zig
+++ b/std/crypto/md5.zig
@@ -59,7 +59,7 @@ pub const Md5 = struct {
         }
 
         // Full middle blocks.
-        while (off + 64 < b.len) : (off += 64) {
+        while (off + 64 <= b.len) : (off += 64) {
             d.round(b[off..off + 64]);
         }
 
@@ -253,3 +253,12 @@ test "md5 streaming" {
 
     htest.assertEqual("900150983cd24fb0d6963f7d28e17f72", out[0..]);
 }
+
+test "md5 aligned final" {
+    var block = []u8 {0} ** Md5.block_size;
+    var out: [Md5.digest_size]u8 = undefined;
+
+    var h = Md5.init();
+    h.update(block);
+    h.final(out[0..]);
+}
diff --git a/std/crypto/sha1.zig b/std/crypto/sha1.zig
index f0dd3c3377..333597b12d 100644
--- a/std/crypto/sha1.zig
+++ b/std/crypto/sha1.zig
@@ -60,7 +60,7 @@ pub const Sha1 = struct {
         }
 
         // Full middle blocks.
-        while (off + 64 < b.len) : (off += 64) {
+        while (off + 64 <= b.len) : (off += 64) {
             d.round(b[off..off + 64]);
         }
 
@@ -284,3 +284,12 @@ test "sha1 streaming" {
     h.final(out[0..]);
     htest.assertEqual("a9993e364706816aba3e25717850c26c9cd0d89d", out[0..]);
 }
+
+test "sha1 aligned final" {
+    var block = []u8 {0} ** Sha1.block_size;
+    var out: [Sha1.digest_size]u8 = undefined;
+
+    var h = Sha1.init();
+    h.update(block);
+    h.final(out[0..]);
+}
diff --git a/std/crypto/sha2.zig b/std/crypto/sha2.zig
index 113bab926b..b70450c0ad 100644
--- a/std/crypto/sha2.zig
+++ b/std/crypto/sha2.zig
@@ -105,7 +105,7 @@ fn Sha2_32(comptime params: Sha2Params32) type { return struct {
         }
 
         // Full middle blocks.
-        while (off + 64 < b.len) : (off += 64) {
+        while (off + 64 <= b.len) : (off += 64) {
             d.round(b[off..off + 64]);
         }
 
@@ -319,6 +319,15 @@ test "sha256 streaming" {
     htest.assertEqual("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad", out[0..]);
 }
 
+test "sha256 aligned final" {
+    var block = []u8 {0} ** Sha256.block_size;
+    var out: [Sha256.digest_size]u8 = undefined;
+
+    var h = Sha256.init();
+    h.update(block);
+    h.final(out[0..]);
+}
+
 
 /////////////////////
 // Sha384 + Sha512
@@ -420,7 +429,7 @@ fn Sha2_64(comptime params: Sha2Params64) type { return struct {
         }
 
         // Full middle blocks.
-        while (off + 128 < b.len) : (off += 128) {
+        while (off + 128 <= b.len) : (off += 128) {
             d.round(b[off..off + 128]);
         }
 
@@ -669,3 +678,12 @@ test "sha512 streaming" {
     h.final(out[0..]);
     htest.assertEqual(h2, out[0..]);
 }
+
+test "sha512 aligned final" {
+    var block = []u8 {0} ** Sha512.block_size;
+    var out: [Sha512.digest_size]u8 = undefined;
+
+    var h = Sha512.init();
+    h.update(block);
+    h.final(out[0..]);
+}
diff --git a/std/crypto/sha3.zig b/std/crypto/sha3.zig
index 6e6a86b3d5..f92f56d68f 100644
--- a/std/crypto/sha3.zig
+++ b/std/crypto/sha3.zig
@@ -217,6 +217,15 @@ test "sha3-256 streaming" {
     htest.assertEqual("3a985da74fe225b2045c172d6bd390bd855f086e3e9d525b46bfe24511431532", out[0..]);
 }
 
+test "sha3-256 aligned final" {
+    var block = []u8 {0} ** Sha3_256.block_size;
+    var out: [Sha3_256.digest_size]u8 = undefined;
+
+    var h = Sha3_256.init();
+    h.update(block);
+    h.final(out[0..]);
+}
+
 test "sha3-384 single" {
     const h1 = "0c63a75b845e4f7d01107d852e4c2485c51a50aaaa94fc61995e71bbee983a2ac3713831264adb47fb6bd1e058d5f004";
     htest.assertEqualHash(Sha3_384, h1 , "");
@@ -278,3 +287,12 @@ test "sha3-512 streaming" {
     h.final(out[0..]);
     htest.assertEqual(h2, out[0..]);
 }
+
+test "sha3-512 aligned final" {
+    var block = []u8 {0} ** Sha3_512.block_size;
+    var out: [Sha3_512.digest_size]u8 = undefined;
+
+    var h = Sha3_512.init();
+    h.update(block);
+    h.final(out[0..]);
+}