From 9e2b4f84eec15f2545966193736fb045f8daf0eb Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Fri, 22 Apr 2016 18:09:47 -0400
Subject: [PATCH] Change default key size to output size per BLAKE2
 recommendation

---
 bench1.cpp | 2 ++
 blake2.h   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bench1.cpp b/bench1.cpp
index 83cde881..736ef204 100644
--- a/bench1.cpp
+++ b/bench1.cpp
@@ -304,6 +304,8 @@ void BenchmarkAll(double t, double hertz)
 	BenchMarkByName<MessageAuthenticationCode>("Two-Track-MAC");
 	BenchMarkByName<MessageAuthenticationCode>("CMAC(AES)");
 	BenchMarkByName<MessageAuthenticationCode>("DMAC(AES)");
+	BenchMarkByName<MessageAuthenticationCode>("BLAKE2s");
+	BenchMarkByName<MessageAuthenticationCode>("BLAKE2b");
 
 	cout << "\n<TBODY style=\"background: yellow\">";
 	BenchMarkByNameKeyLess<HashTransformation>("CRC32");
diff --git a/blake2.h b/blake2.h
index f0be8d36..b0984688 100644
--- a/blake2.h
+++ b/blake2.h
@@ -36,9 +36,9 @@ NAMESPACE_BEGIN(CryptoPP)
 //! \brief BLAKE2 hash information
 //! \tparam T_64bit flag indicating 64-bit
 template <bool T_64bit>
-struct CRYPTOPP_NO_VTABLE BLAKE2_Info : public VariableKeyLength<0,0,(T_64bit ? 64 : 32),1,SimpleKeyingInterface::NOT_RESYNCHRONIZABLE>
+struct CRYPTOPP_NO_VTABLE BLAKE2_Info : public VariableKeyLength<(T_64bit ? 64 : 32),0,(T_64bit ? 64 : 32),1,SimpleKeyingInterface::NOT_RESYNCHRONIZABLE>
 {
-	typedef VariableKeyLength<0,0,(T_64bit ? 64 : 32),1,SimpleKeyingInterface::NOT_RESYNCHRONIZABLE> KeyBase;
+	typedef VariableKeyLength<(T_64bit ? 64 : 32),0,(T_64bit ? 64 : 32),1,SimpleKeyingInterface::NOT_RESYNCHRONIZABLE> KeyBase;
 	CRYPTOPP_CONSTANT(MIN_KEYLENGTH = KeyBase::MIN_KEYLENGTH);
 	CRYPTOPP_CONSTANT(MAX_KEYLENGTH = KeyBase::MAX_KEYLENGTH);
 	CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = KeyBase::DEFAULT_KEYLENGTH);