hare

commit 797aa948a5667d6458fb6ce0c78f48e05045e43c
parent 0e9c33407693ee1b2bd56ddb81b83782f465bf8a
Author: Alexey Yerin <yyp@disroot.org>
Date:   Sun,  9 May 2021 19:46:29 +0300

hare::module: fix sha256 leak

Prior to this, functions in hare::module were not cleaning up hash::hash
via hash::close, and instead using hash::finish. The issue is that the
code in between uses error propagation which does not call hash::finish,
so the hash stream leaks out.

Diffstat:
M
hare/module/scan.ha
 | 
10
+++++-----

1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hare/module/scan.ha b/hare/module/scan.ha
@@ -20,7 +20,7 @@ use fmt;
 export fn scan(ctx: *context, path: str) (version | error) = {
 	// TODO: Incorporate defines into the hash
 	let sha = sha256::sha256();
-	//defer! hash::close(sha);
+	defer hash::close(sha);
 	let iter = match (fs::iter(ctx.fs, path)) {
 		fs::wrongtype => {
 			// Single file case
@@ -42,7 +42,7 @@ export fn scan(ctx: *context, path: str) (version | error) = {
 
 			let sumbuf: [sha256::SIZE]u8 = [0...];
 			hash::write(sha, in.hash);
-			hash::finish(sha, sumbuf);
+			hash::sum(sha, sumbuf);
 
 			return version {
 				hash = sumbuf,
@@ -61,7 +61,7 @@ export fn scan(ctx: *context, path: str) (version | error) = {
 	scan_directory(ctx, &ver, sha, path, iter)?;
 
 	let tmp: [sha256::SIZE]u8 = [0...];
-	hash::finish(sha, tmp);
+	hash::sum(sha, tmp);
 	ver.hash = alloc([], sha.sz);
 	append(ver.hash, tmp...);
 
@@ -307,7 +307,7 @@ fn scan_file(
 	let f = fs::open(ctx.fs, path)?;
 	defer io::close(f);
 	let sha = sha256::sha256();
-	//defer! hash::close(sha);
+	defer hash::close(sha);
 
 	hash::write(sha, strings::toutf8(path));
 
@@ -330,7 +330,7 @@ fn scan_file(
 	io::copy(io::empty, tee)?; // Finish spooling out the file for the SHA
 
 	let tmp: [sha256::SIZE]u8 = [0...];
-	hash::finish(sha, tmp);
+	hash::sum(sha, tmp);
 
 	let checksum: []u8 = alloc([], sha.sz);
 	append(checksum, tmp...);