Use previous digest size as a default value in BLAKE2

noloader · noloader · commit 322c67f373ec · 2018-11-21T13:28:21.000-05:00
diff --git a/blake2.cpp b/blake2.cpp
@@ -389,7 +389,7 @@ void BLAKE2s::UncheckedSetKey(const byte *key, unsigned int length, const Crypto
         m_keyLength = 0;
     }
 
-    m_digestSize = params.GetIntValueWithDefault(Name::DigestSize(), DIGESTSIZE);
+    m_digestSize = params.GetIntValueWithDefault(Name::DigestSize(), m_digestSize);
 
     m_state.Reset();
     m_block.Reset(m_digestSize, m_keyLength);
@@ -420,7 +420,7 @@ void BLAKE2b::UncheckedSetKey(const byte *key, unsigned int length, const Crypto
         m_keyLength = 0;
     }
 
-    m_digestSize = params.GetIntValueWithDefault(Name::DigestSize(), DIGESTSIZE);
+    m_digestSize = params.GetIntValueWithDefault(Name::DigestSize(), m_digestSize);
 
     m_state.Reset();
     m_block.Reset(m_digestSize, m_keyLength);

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ void BLAKE2s::UncheckedSetKey(const byte *key, unsigned int length, const Crypto`
`389`	`389`	`m_keyLength = 0;`
`390`	`390`	`}`
`391`	`391`
`392`		`- m_digestSize = params.GetIntValueWithDefault(Name::DigestSize(), DIGESTSIZE);`
	`392`	`+ m_digestSize = params.GetIntValueWithDefault(Name::DigestSize(), m_digestSize);`
`393`	`393`
`394`	`394`	`m_state.Reset();`
`395`	`395`	`m_block.Reset(m_digestSize, m_keyLength);`
`@@ -420,7 +420,7 @@ void BLAKE2b::UncheckedSetKey(const byte *key, unsigned int length, const Crypto`
`420`	`420`	`m_keyLength = 0;`
`421`	`421`	`}`
`422`	`422`
`423`		`- m_digestSize = params.GetIntValueWithDefault(Name::DigestSize(), DIGESTSIZE);`
	`423`	`+ m_digestSize = params.GetIntValueWithDefault(Name::DigestSize(), m_digestSize);`
`424`	`424`
`425`	`425`	`m_state.Reset();`
`426`	`426`	`m_block.Reset(m_digestSize, m_keyLength);`