aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2022-01-19 20:50:20 +0100
committerMattias Andrée <maandree@kth.se>2022-01-19 20:50:20 +0100
commit2ee68995c80c1716eee3d1bd85673f0ee0997a3a (patch)
tree505de7c59dd872fcaa01b0c17b12fb58f9c3994c
parentm + add b2sum (diff)
downloadblakesum-2ee68995c80c1716eee3d1bd85673f0ee0997a3a.tar.gz
blakesum-2ee68995c80c1716eee3d1bd85673f0ee0997a3a.tar.bz2
blakesum-2ee68995c80c1716eee3d1bd85673f0ee0997a3a.tar.xz
m
Signed-off-by: Mattias Andrée <maandree@kth.se>
-rw-r--r--b2sum.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/b2sum.c b/b2sum.c
index b70aad8..1b48ad2 100644
--- a/b2sum.c
+++ b/b2sum.c
@@ -20,7 +20,8 @@ static void
usage(void)
{
/* TODO add support for key, salt, and personalization */
- /* TODO add support for parallel versions */
+ /* TODO add support for parallel versions */
+ /* TODO add support for tree hashing */
fprintf(stderr, "usage: %s [-l bits | -X bits] [-c | -B | -L | -U] [-sxz] [file] ...", argv0);
exit(2);
}
@@ -100,7 +101,7 @@ hash_fd_blake2bs(int fd, const char *fname, int decode_hex, unsigned char hash[]
}
static int
-hash_fd_blake2bsx(int fd, const char *fname, int decode_hex, unsigned char hash[])
+hash_fd_blake2xbs(int fd, const char *fname, int decode_hex, unsigned char hash[])
{
struct libblake_blake2xb_state state2xb;
struct libblake_blake2xb_params params2xb;
@@ -173,7 +174,7 @@ hash_fd_blake2bsx(int fd, const char *fname, int decode_hex, unsigned char hash[
else
libblake_blake2xb_predigest(&state2xb, buf, len, 0);
if (flag_small) {
- for (i = 0; i * 32 < hashlen / 8; i++) { /* TODO this could be done parallel (also below) */
+ for (i = 0; i * 32 < hashlen / 8; i++) { /* TODO this could be done parallel (but align hash) (also below) */
n = (i + 1) * 32 > hashlen / 8 ? hashlen / 8 - i * 32 : 32;
libblake_blake2xs_digest(&state2xs, (uint_least32_t)i, (uint_least8_t)n, &hash[i * 32]);
}
@@ -193,7 +194,7 @@ hash_fd(int fd, const char *fname, int decode_hex, unsigned char hash[])
int ret;
if (flag_extended)
- ret = hash_fd_blake2bsx(fd, fname, decode_hex, hash);
+ ret = hash_fd_blake2xbs(fd, fname, decode_hex, hash);
else
ret = hash_fd_blake2bs(fd, fname, decode_hex, hash);