svn commit: r331628 - head/tools/tools/crypto

[Conrad Meyer]

Author: cem
Date: Tue Mar 27 17:34:28 2018
New Revision: 331628
URL: https://svnweb.freebsd.org/changeset/base/331628

Log:
  cryptotest: Add blake2 hashes to tool
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/tools/tools/crypto/cryptotest.c

Modified: head/tools/tools/crypto/cryptotest.c
==============================================================================
--- head/tools/tools/crypto/cryptotest.c	Tue Mar 27 17:17:58 2018	(r331627)
+++ head/tools/tools/crypto/cryptotest.c	Tue Mar 27 17:34:28 2018	(r331628)
@@ -56,6 +56,8 @@
  *	aes	rijndael/aes 128-bit cbc
  *	aes192	rijndael/aes 192-bit cbc
  *	aes256	rijndael/aes 256-bit cbc
+ *	blake2b	Blake2b
+ *	blake2s	Blake2s
  *	md5	md5 hmac
  *	sha1	sha1 hmac
  *	sha256	256-bit sha2 hmac
@@ -132,6 +134,8 @@ struct alg {
 	{ "aes",	0,	16,	16,	16,	CRYPTO_AES_CBC},
 	{ "aes192",	0,	16,	24,	24,	CRYPTO_AES_CBC},
 	{ "aes256",	0,	16,	32,	32,	CRYPTO_AES_CBC},
+	{ "blake2b",	1,	128,	64,	64,	CRYPTO_BLAKE2B },
+	{ "blake2s",	1,	64,	32,	32,	CRYPTO_BLAKE2S },
 	{ "md5",	1,	8,	16,	16,	CRYPTO_MD5_HMAC },
 	{ "sha1",	1,	8,	20,	20,	CRYPTO_SHA1_HMAC },
 	{ "sha256",	1,	8,	32,	32,	CRYPTO_SHA2_256_HMAC },
@@ -147,6 +151,7 @@ usage(const char* cmd)
 	printf("where algorithm is one of:\n");
 	printf("    null des 3des (default) blowfish cast skipjack rij\n");
 	printf("    aes aes192 aes256 md5 sha1 sha256 sha384 sha512\n");
+	printf("    blake2b blake2s\n");
 	printf(" or an encryption algorithm concatented with authentication\n");
 	printf(" algorithm with '+' in the middle, e.g., aes+sha1.\n");
 	printf("count is the number of encrypt/decrypt ops to do\n");