From 36795a688fd1d5bb9f497970938d9fcb08cfc330 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Mon, 7 Mar 2022 00:45:30 +0100
Subject: Implement support of Blake2s-256 hash algorithm and remove deprecated
 algorithms RIPEMD-160 and GOST89.

---
 src/Boot/Windows/Boot.vcxproj         | 2 +-
 src/Boot/Windows/Boot.vcxproj.filters | 6 +++---
 src/Boot/Windows/Makefile             | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/Boot')

diff --git a/src/Boot/Windows/Boot.vcxproj b/src/Boot/Windows/Boot.vcxproj
index 68d5d270..b9a04d80 100644
--- a/src/Boot/Windows/Boot.vcxproj
+++ b/src/Boot/Windows/Boot.vcxproj
@@ -222,6 +222,7 @@ nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH</NMakeReBuildCommandLine>
   <ItemDefinitionGroup>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\Crypto\blake2s-ref.c" />
     <ClCompile Include="BootConfig.cpp" />
     <ClCompile Include="BootConsoleIo.cpp" />
     <ClCompile Include="BootDebug.cpp" />
@@ -240,7 +241,6 @@ nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH</NMakeReBuildCommandLine>
     <ClCompile Include="..\..\Common\Xts.c" />
     <ClCompile Include="..\..\Crypto\AesSmall.c" />
     <ClCompile Include="..\..\Crypto\CamelliaSmall.c" />
-    <ClCompile Include="..\..\Crypto\Rmd160.c" />
     <ClCompile Include="..\..\Crypto\Serpent.c" />
     <ClCompile Include="..\..\Crypto\Sha2Small.c" />
     <ClCompile Include="..\..\Crypto\Twofish.c" />
diff --git a/src/Boot/Windows/Boot.vcxproj.filters b/src/Boot/Windows/Boot.vcxproj.filters
index 1a60ac81..24d23894 100644
--- a/src/Boot/Windows/Boot.vcxproj.filters
+++ b/src/Boot/Windows/Boot.vcxproj.filters
@@ -74,9 +74,6 @@
     <ClCompile Include="..\..\Crypto\CamelliaSmall.c">
       <Filter>Source Files\Crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Crypto\Rmd160.c">
-      <Filter>Source Files\Crypto</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Crypto\Serpent.c">
       <Filter>Source Files\Crypto</Filter>
     </ClCompile>
@@ -86,6 +83,9 @@
     <ClCompile Include="..\..\Crypto\Twofish.c">
       <Filter>Source Files\Crypto</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Crypto\blake2s-ref.c">
+      <Filter>Source Files\Crypto</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="BootCrt.asm">
diff --git a/src/Boot/Windows/Makefile b/src/Boot/Windows/Makefile
index 9689b7cf..d08e1f50 100644
--- a/src/Boot/Windows/Makefile
+++ b/src/Boot/Windows/Makefile
@@ -46,7 +46,7 @@ CFLAGS = $(CFLAGS) /D TC_WINDOWS_BOOT_SINGLE_CIPHER_MODE /D TC_WINDOWS_BOOT_$(SI
 OBJDIR = $(OBJDIR)_$(SINGLE_PRF)
 CFLAGS = $(CFLAGS) /D TC_WINDOWS_BOOT_$(SINGLE_PRF)
 !else
-CFLAGS = $(CFLAGS) /D TC_WINDOWS_BOOT_RIPEMD160
+CFLAGS = $(CFLAGS) /D TC_WINDOWS_BOOT_BLAKE2S
 !endif
 
 OUTDIR = $(OBJDIR)
@@ -85,7 +85,7 @@ OBJS = $(OBJS) $(OUTDIR)\Xts.obj
 !if "$(SINGLE_PRF)" == "SHA2"
 OBJS = $(OBJS) $(OUTDIR)\Sha2Small.obj
 !else
-OBJS = $(OBJS) $(OUTDIR)\Rmd160.obj
+OBJS = $(OBJS) $(OUTDIR)\blake2s-ref.obj
 !endif
 
 !if !DEFINED (SINGLE_CIPHER)
-- 
cgit v1.2.3