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

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/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"
 
 /*

src/Crypto/Argon2/src/opt_sse2.c

@@ -25,7 +25,7 @@
 
 #if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
 
-#include "blake2/blake2.h"
+#include "blake2/blake2b.h"
 #include "blake2/blamka-round-opt.h"
 
 /*

src/Crypto/Argon2/src/ref.c

@@ -22,7 +22,7 @@
 
 #include "blake2/blamka-round-ref.h"
 #include "blake2/blake2-impl.h"
-#include "blake2/blake2.h"
+#include "blake2/blake2b.h"
 
 #include "Crypto/config.h"
 #include "Crypto/cpu.h"

src/Crypto/Crypto.vcxproj

@@ -85,7 +85,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..;$(ProjectDir)\..\Common;$(ProjectDir)\Argon2\include;$(ProjectDir)\Argon2\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..;$(ProjectDir)\..\Common;$(ProjectDir)\Argon2\include;$(ProjectDir)\Argon2\src;$(ProjectDir)\Argon2\src\blake2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;ARGON2_NO_THREADS;DEBUG;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -105,7 +105,7 @@
     <Midl />
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..;$(ProjectDir)\..\Common;$(ProjectDir)\Argon2\include;$(ProjectDir)\Argon2\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..;$(ProjectDir)\..\Common;$(ProjectDir)\Argon2\include;$(ProjectDir)\Argon2\src;$(ProjectDir)\Argon2\src\blake2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;ARGON2_NO_THREADS;DEBUG;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -127,7 +127,7 @@
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..;$(ProjectDir)\..\Common;$(ProjectDir)\Argon2\include;$(ProjectDir)\Argon2\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..;$(ProjectDir)\..\Common;$(ProjectDir)\Argon2\include;$(ProjectDir)\Argon2\src;$(ProjectDir)\Argon2\src\blake2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;ARGON2_NO_THREADS;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>true</BufferSecurityCheck>
@@ -149,7 +149,7 @@
     <Midl />
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..;$(ProjectDir)\..\Common;$(ProjectDir)\Argon2\include;$(ProjectDir)\Argon2\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..;$(ProjectDir)\..\Common;$(ProjectDir)\Argon2\include;$(ProjectDir)\Argon2\src;$(ProjectDir)\Argon2\src\blake2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;ARGON2_NO_THREADS;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>true</BufferSecurityCheck>

src/Crypto/blake2s-ref.c

@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <STRING.H>
 
-#include "blake2.h"
+#include "blake2s.h"
 
 #pragma optimize ("tl", on)
 

src/Crypto/blake2s.c

@@ -15,7 +15,7 @@
 
 /* Adapted for VeraCrypt */
 
-#include "blake2.h"
+#include "blake2s.h"
 #include "Common/Endian.h"
 #include "Crypto/config.h"
 #include "Crypto/cpu.h"

src/Crypto/blake2s_SSE2.c

@@ -15,7 +15,7 @@
 
 /* Adapted for VeraCrypt */
 
-#include "blake2.h"
+#include "blake2s.h"
 #include "Common/Endian.h"
 #include "Crypto/config.h"
 #include "Crypto/cpu.h"

src/Crypto/blake2s_SSE41.c

@@ -15,7 +15,7 @@
 
 /* Adapted for VeraCrypt */
 
-#include "blake2.h"
+#include "blake2s.h"
 #include "Common/Endian.h"
 #include "Crypto/config.h"
 #include "Crypto/cpu.h"

src/Crypto/blake2s_SSSE3.c

@@ -15,7 +15,7 @@
 
 /* Adapted for VeraCrypt */
 
-#include "blake2.h"
+#include "blake2s.h"
 #include "Common/Endian.h"
 #include "Crypto/config.h"
 #include "Crypto/cpu.h"