Use blake2b as hash for random generator from Argon2 is used.

Author: idrassi

src/Common/Crypto.c

@@ -133,7 +133,7 @@ static Hash Hashes[] =
         { BLAKE2S,		L"BLAKE2s-256",				FALSE,	TRUE },
         { WHIRLPOOL,	L"Whirlpool",			FALSE,	FALSE },
 	{ STREEBOG,		L"Streebog",	FALSE,	FALSE },
-	{ ARGON2,		L"Argon2",	FALSE,	FALSE },
+	{ ARGON2,		L"BLAKE2b-512",	FALSE,	FALSE },
     #endif
         { 0, 0, 0 }
 };
@@ -780,7 +780,7 @@ BOOL HashForSystemEncryption (int hashId)
 
 BOOL HashIsAvailable (int hashId)
 {
-   return (hashId != ARGON2) && (HashGet(hashId) != 0); // Argon2 is not a hash function
+   return (HashGet(hashId) != 0);
 }
 
 // Returns the largest key size needed by an EA for the specified mode of operation

src/Common/Crypto.h

@@ -200,11 +200,12 @@ typedef struct
 #endif
 #include "Twofish.h"
 
-#include "blake2.h"
+#include "blake2s.h"
 #ifndef TC_WINDOWS_BOOT
 #	include "Sha2.h"
 #	include "Whirlpool.h"
 #	include "argon2.h"
+#	include "blake2b.h"
 #	include "Streebog.h"
 #	include "kuznyechik.h"
 #	include "Camellia.h"

src/Common/Dlgcode.c

@@ -6343,20 +6343,18 @@ static BOOL PerformBenchmark(HWND hBenchDlg, HWND hwndDlg)
 		{
 			BYTE digest [MAX_DIGESTSIZE];
 		#ifndef WOLFCRYPT_BACKEND	
-                        WHIRLPOOL_CTX	wctx;
+			WHIRLPOOL_CTX	wctx;
 			STREEBOG_CTX		stctx;
-                        blake2s_state   bctx;
-               #endif
+			blake2s_state   bctx;
+			blake2b_state   b2ctx;
+		#endif
 			sha512_ctx		s2ctx;
 			sha256_ctx		s256ctx;
 
 			int hid, i;
 
 			for (hid = FIRST_PRF_ID; hid <= LAST_PRF_ID; hid++) 
 			{
-				// Skip Argon2 since it is not a hash function
-				if (hid == ARGON2)
-					continue;
 				if (QueryPerformanceCounter (&performanceCountStart) == 0)
 					goto counter_error;
 
@@ -6394,6 +6392,12 @@ static BOOL PerformBenchmark(HWND hBenchDlg, HWND hwndDlg)
 						STREEBOG_add(&stctx, lpTestBuffer, benchmarkBufferSize);
 						STREEBOG_finalize(&stctx, (unsigned char *)digest);
 						break;
+					case ARGON2:
+						// For Argon2, we measure speed of the underlying blake2b hash function
+						blake2b_init(&b2ctx, BLAKE2B_OUTBYTES);
+						blake2b_update(&b2ctx, lpTestBuffer, benchmarkBufferSize);
+						blake2b_final(&b2ctx, digest, BLAKE2B_OUTBYTES);
+						break;
 
 					}
 			        #endif	

src/Common/Pkcs5.c

@@ -16,7 +16,7 @@
 #include <memory.h>
 #include <stdlib.h>
 #endif
-#include "blake2.h"
+#include "blake2s.h"
 #ifndef TC_WINDOWS_BOOT
 #include "Sha2.h"
 #include "Whirlpool.h"

src/Common/Random.c

@@ -258,8 +258,9 @@ BOOL Randmix ()
 	{
 		unsigned char hashOutputBuffer [MAX_DIGESTSIZE];
         #ifndef WOLFCRYPT_BACKEND		
-                WHIRLPOOL_CTX	wctx;
-                blake2s_state   bctx;
+		WHIRLPOOL_CTX	wctx;
+		blake2s_state   bctx;
+		blake2b_state   b2ctx;
 		STREEBOG_CTX	stctx;
         #endif
 		sha512_ctx		sctx;
@@ -314,9 +315,8 @@ BOOL Randmix ()
 				sha256_end (hashOutputBuffer, &s256ctx);
 				break;
 
-                #ifndef WOLFCRYPT_BACKEND
-                      case BLAKE2S:
-                      case ARGON2: // in case of Argon2, we use Blake2s
+#ifndef WOLFCRYPT_BACKEND
+			case BLAKE2S:
 				blake2s_init(&bctx);
 				blake2s_update(&bctx, pRandPool, RNG_POOL_SIZE);
 				blake2s_final(&bctx, hashOutputBuffer);
@@ -333,7 +333,14 @@ BOOL Randmix ()
 				STREEBOG_add (&stctx, pRandPool, RNG_POOL_SIZE);
 				STREEBOG_finalize (&stctx, hashOutputBuffer);
 				break;
-                #endif
+
+			case ARGON2:
+				// For Argon2, we use the underlying Blake2b hash function
+				blake2b_init(&b2ctx, BLAKE2B_OUTBYTES);
+				blake2b_update(&b2ctx, pRandPool, RNG_POOL_SIZE);
+				blake2b_final(&b2ctx, hashOutputBuffer, BLAKE2B_OUTBYTES);
+				break;
+#endif
 			default:
 				// Unknown/wrong ID
 				TC_THROW_FATAL_EXCEPTION;

src/Crypto/Argon2/src/blake2/blake2b.c

@@ -18,7 +18,7 @@
 #include "Crypto/config.h"
 #include "Crypto/cpu.h"
 #include "Crypto/misc.h"
-#include "blake2.h"
+#include "blake2b.h"
 #include "blake2-impl.h"
 
 static const uint64_t blake2b_IV[8] = {

src/Crypto/Argon2/src/blake2/blake2.h src/Crypto/Argon2/src/blake2/blake2b.hsrc/Crypto/Argon2/src/blake2/blake2.h renamed to src/Crypto/Argon2/src/blake2/blake2b.h

@@ -61,9 +61,9 @@ typedef struct __blake2b_state {
 /* Ensure param structs have not been wrongly padded */
 /* Poor man's static_assert */
 enum {
-    blake2_size_check_0 = 1 / !!(CHAR_BIT == 8),
+    blake2_size_check_0 = 1 / (!!(CHAR_BIT == 8) ? 1 : 0),
     blake2_size_check_2 =
-        1 / !!(sizeof(blake2b_param) == sizeof(uint64_t) * CHAR_BIT)
+    1 / (!!(sizeof(blake2b_param) == sizeof(uint64_t) * CHAR_BIT) ? 1 : 0)
 };
 
 /* Streaming API */

src/Crypto/Argon2/src/blake2/blamka-round-ref.h

@@ -18,7 +18,7 @@
 #ifndef BLAKE_ROUND_MKA_H
 #define BLAKE_ROUND_MKA_H
 
-#include "blake2.h"
+#include "blake2b.h"
 #include "blake2-impl.h"
 
 /* designed by the Lyra PHC team */

src/Crypto/Argon2/src/core.c

@@ -26,7 +26,7 @@
 #endif
 #include "Crypto/cpu.h"
 #include "Crypto/misc.h"
-#include "blake2/blake2.h"
+#include "blake2/blake2b.h"
 #include "blake2/blake2-impl.h"
 
 #define secure_wipe_memory(v, n) burn((v), (n))

src/Crypto/Argon2/src/opt_avx2.c

@@ -26,7 +26,7 @@
 
 #if defined(__AVX2__)
 
-#include "blake2/blake2.h"
+#include "blake2/blake2b.h"
 #include "blake2/blamka-round-opt.h"
 
 /*