support --blake2s and --blake2b options

Author: rhash

ChangeLog

@@ -1,3 +1,6 @@
+Mon 04 Jan 2021 Aleksey
+	* supported --blake2s, --blake2b options for the BLAKE2 hash functions
+
 Sun 03 Jan 2021 Aleksey
 	* Bugfix: fix computing of EDON-R 512 by big data chunks
 

dist/rhash.1

@@ -13,7 +13,7 @@ rhash \- calculate/check CRC32, MD5, SHA1, GOST, TTH, BTIH or other message dige
 computes and verifies various message digests and checksums of files.
 Supported hash algorithms include CRC32, CRC32C, MD4, MD5, SHA1,
 SHA256, SHA512, SHA3, Tiger, DC++ TTH, BTIH, AICH, ED2K, GOST R 34.11\-*,
-RIPEMD\-160, HAS\-160, EDON\-R 256/512, Whirlpool, Snefru\-128/256.
+RIPEMD\-160, HAS\-160, BLAKE2s/BLAKE2b, EDON\-R 256/512, Whirlpool, Snefru\-128/256.
 
 The program can create and verify Magnet links
 and eDonkey ed2k:// links, see \-\-magnet and \-\-ed2k\-link options.
@@ -111,6 +111,8 @@ HAS\-160: Select HAS\-160 hash function.
 SNEFRU: Select SNEFRU\-128/256 hash function.
 .IP "\-\-edonr256, \-\-edonr512"
 EDON\-R: Select EDON\-R 256/512 hash function.
+.IP "\-\-blake2b, \-\-blake2s"
+BLAKE2: Select BLAKE2b/BLAKE2s hash function.
 
 .IP "\-a, \-\-all"
 Calculate all supported hash functions.
@@ -282,7 +284,8 @@ Whirlpool message digest.
  %{gost94}, %{gost94\-cryptopro}, %{gost12\-256}, %{gost12\-512},\
  %{sha\-224}, %{sha\-256}, %{sha\-384}, %{sha\-512},\
  %{sha3\-224}, %{sha3\-256}, %{sha3\-384}, %{sha3\-512},\
- %{edon\-r256}, %{edon\-r512}, %{snefru128}, %{snefru256}"
+ %{edon\-r256}, %{edon\-r512}, %{blake2s}, %{blake2b},\
+ %{snefru128}, %{snefru256}"
 Print the specified message digest. It is printed in uppercase, if the
 hash function name starts with a capital letter, e.g. %{TTH}, %{Sha-512}.
 .IP "%x<hash>, %b<hash>, %B<hash>, %@<hash>"
@@ -296,7 +299,8 @@ placing a hardlink/symlink to it with a filename containing strings `crc32',
 `sha3\-256', `sha3\-512', `sha3\-224', `sha3\-384', `tiger', `tth',
 `btih', `aich', `ed2k', `ed2k\-link', `gost12\-256', `gost12\-512',
 `gost94', `gost94\-cryptopro', `rmd160', `has160', `whirlpool',
-`edonr256', `edonr512', `snefru128', `snefru256', `sfv' , `bsd' or `magnet'.
+`edonr256', `edonr512', `blake2s', `blake2b',
+`snefru128', `snefru256', `sfv' , `bsd' or `magnet'.
 
 .SH CONFIG FILE
 RHash looks for a config file

hash_check.c

@@ -281,9 +281,10 @@ static unsigned char test_hash_string(char** ptr, char* end, int* p_len)
  */
 static unsigned bsd_hash_name_to_id(const char* name, unsigned length)
 {
-#define code2mask_size (18 * 2)
+#define code2mask_size (19 * 2)
 	static unsigned code2mask[code2mask_size] = {
 		FOURC2U('A', 'I', 'C', 'H'), RHASH_AICH,
+		FOURC2U('B', 'L', 'A', 'K'), (RHASH_BLAKE2S | RHASH_BLAKE2B),
 		FOURC2U('B', 'T', 'I', 'H'), RHASH_BTIH,
 		FOURC2U('C', 'R', 'C', '3'), (RHASH_CRC32 | RHASH_CRC32C),
 		FOURC2U('E', 'D', '2', 'K'), RHASH_ED2K,

hash_print.c

@@ -552,7 +552,7 @@ void init_hash_info_table(void)
 {
 	unsigned bit;
 	const unsigned fullmask = RHASH_ALL_HASHES | OPT_ED2K_LINK;
-	const unsigned custom_bsd_name = RHASH_RIPEMD160 |
+	const unsigned custom_bsd_name = RHASH_RIPEMD160 | RHASH_BLAKE2S | RHASH_BLAKE2B |
 		RHASH_SHA224 | RHASH_SHA256 | RHASH_SHA384 | RHASH_SHA512;
 	const unsigned short_opt_mask = RHASH_CRC32 | RHASH_MD5 | RHASH_SHA1 | RHASH_TTH | RHASH_ED2K |
 		RHASH_AICH | RHASH_WHIRLPOOL | RHASH_RIPEMD160 | RHASH_GOST12_256 | OPT_ED2K_LINK;
@@ -616,6 +616,12 @@ void init_hash_info_table(void)
 				case RHASH_SHA512:
 					info->bsd_name = "SHA512";
 					break;
+				case RHASH_BLAKE2S:
+					info->bsd_name = "BLAKE2s";
+					break;
+				case RHASH_BLAKE2B:
+					info->bsd_name = "BLAKE2b";
+					break;
 			}
 		} else
 			info->bsd_name = info->name;

parse_cmdline.c

@@ -88,8 +88,9 @@ static void print_help(void)
 	print_help_line("      --gost94-cryptopro ", digest_format, _("GOST R 34.11-94 CryptoPro"));
 	print_help_line("      --ripemd160  ", digest_format, "RIPEMD-160");
 	print_help_line("      --has160     ", digest_format, "HAS-160");
-	print_help_line("      --edonr256, --edonr512  ", digest_format, "EDON-R 256/512");
-	print_help_line("      --snefru128, --snefru256  ", digest_format, "SNEFRU-128/256");
+	print_help_line("      --blake2s,   --blake2b   ", digest_format, "BLAKE2S/BLAKE2B");
+	print_help_line("      --edonr256,  --edonr512  ", digest_format, "EDON-R 256/512");
+	print_help_line("      --snefru128, --snefru256 ", digest_format, "SNEFRU-128/256");
 	print_help_line("  -a, --all        ", _("Calculate all supported hash functions.\n"));
 	print_help_line("  -c, --check      ", _("Check hash files specified by command line.\n"));
 	print_help_line("  -u, --update=<file> ", _("Update the specified hash file.\n"));
@@ -395,6 +396,8 @@ cmdline_opt_t cmdline_opt[] =
 	{ F_UFLG,   0,   0, "snefru256", &opt.sum_flags, RHASH_SNEFRU256 },
 	{ F_UFLG,   0,   0, "edonr256",  &opt.sum_flags, RHASH_EDONR256 },
 	{ F_UFLG,   0,   0, "edonr512",  &opt.sum_flags, RHASH_EDONR512 },
+	{ F_UFLG,   0,   0, "blake2s",   &opt.sum_flags, RHASH_BLAKE2S },
+	{ F_UFLG,   0,   0, "blake2b",   &opt.sum_flags, RHASH_BLAKE2B },
 	{ F_UFLG, 'L',   0, "ed2k-link", &opt.sum_flags, OPT_ED2K_LINK },
 
 	/* output formats */
@@ -1008,11 +1011,13 @@ static void set_default_sums_flags(const char* progName)
 	else if (strstr(buf, "gost94"))  res |= RHASH_GOST94;
 	if (strstr(buf, "has160"))  res |= RHASH_HAS160;
 	if (strstr(buf, "ripemd160") || strstr(buf, "rmd160"))  res |= RHASH_RIPEMD160;
-	if (strstr(buf, "whirlpool"))  res |= RHASH_WHIRLPOOL;
-	if (strstr(buf, "edonr256"))   res |= RHASH_EDONR256;
-	if (strstr(buf, "edonr512"))   res |= RHASH_EDONR512;
-	if (strstr(buf, "snefru256"))  res |= RHASH_SNEFRU128;
-	if (strstr(buf, "snefru128"))  res |= RHASH_SNEFRU256;
+	if (strstr(buf, "whirlpool")) res |= RHASH_WHIRLPOOL;
+	if (strstr(buf, "edonr256"))  res |= RHASH_EDONR256;
+	if (strstr(buf, "edonr512"))  res |= RHASH_EDONR512;
+	if (strstr(buf, "blake2s"))   res |= RHASH_BLAKE2S;
+	if (strstr(buf, "blake2b"))   res |= RHASH_BLAKE2B;
+	if (strstr(buf, "snefru256")) res |= RHASH_SNEFRU128;
+	if (strstr(buf, "snefru128")) res |= RHASH_SNEFRU256;
 	if (strstr(buf, "ed2k-link")) res |= OPT_ED2K_LINK;
 	else if (strstr(buf, "ed2k")) res |= RHASH_ED2K;