From 7e73208e62b441f836f27433a4e297a0e07233b8 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sun, 13 Sep 2015 00:16:14 +0200
Subject: Windows Bootloader: Fix Rescue Disk issue when Cascades and SHA256
 used. It was caused by the bootloader becoming too big in this case with PIM
 implementation (larger than the limit of 31232 bytes). We also increase
 memory requirement for this case

---
 src/Boot/Windows/BootCommon.h | 2 +-
 src/Boot/Windows/BootDefs.h   | 6 +++++-
 src/Boot/Windows/Makefile     | 4 ++++
 src/Readme.txt                | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Boot/Windows/BootCommon.h b/src/Boot/Windows/BootCommon.h
index e8aa8218..48682fd6 100644
--- a/src/Boot/Windows/BootCommon.h
+++ b/src/Boot/Windows/BootCommon.h
@@ -17,7 +17,7 @@
 #include "BootDefs.h"
 
 // The user will be advised to upgrade the rescue disk if upgrading from the following or any previous version
-#define TC_RESCUE_DISK_UPGRADE_NOTICE_MAX_VERSION 0x0111
+#define TC_RESCUE_DISK_UPGRADE_NOTICE_MAX_VERSION 0x0113
 
 #define TC_BOOT_LOADER_AREA_SIZE (TC_BOOT_LOADER_AREA_SECTOR_COUNT * TC_SECTOR_SIZE_BIOS)
 
diff --git a/src/Boot/Windows/BootDefs.h b/src/Boot/Windows/BootDefs.h
index eb8629dc..5aef6589 100644
--- a/src/Boot/Windows/BootDefs.h
+++ b/src/Boot/Windows/BootDefs.h
@@ -14,7 +14,11 @@
 #define TC_HEADER_Boot_BootDefs
 
 // Total memory required (CODE + DATA + BSS + STACK + 0x100) in KBytes - determined from linker map.
-#define TC__BOOT_MEMORY_REQUIRED	42
+#ifdef TC_WINDOWS_BOOT_RESCUE_DISK_MODE
+	#define TC__BOOT_MEMORY_REQUIRED	44
+#else
+	#define TC__BOOT_MEMORY_REQUIRED	42
+#endif
 
 #ifdef TC_WINDOWS_BOOT_SINGLE_CIPHER_MODE
 #	undef TC__BOOT_MEMORY_REQUIRED
diff --git a/src/Boot/Windows/Makefile b/src/Boot/Windows/Makefile
index e25965d7..3ce069c7 100644
--- a/src/Boot/Windows/Makefile
+++ b/src/Boot/Windows/Makefile
@@ -193,6 +193,10 @@ $(LIBS)
 	$(LD) $(LFLAGS) @$(PROJ).crf
 	del $(PROJ).crf $(PROJ).crf2
 
+# Compress the Rescue Disk botloader for Cascades and SHA2 since it is too big (size > 31232 bytes)
+!if DEFINED(RESCUE_DISK) && !DEFINED (SINGLE_CIPHER) && "$(SINGLE_PRF)" == "SHA2"
+	upx $(PROJ).$(TARGETEXT)
+!endif
 	gzip.exe -c -n --best $(PROJ).$(TARGETEXT) >$(PROJ).$(TARGETEXT).gz
 	-dd.exe conv=notrunc,sync bs=512 seek=5 if=$(PROJ).$(TARGETEXT).gz of=$(PROJ).flp 2>NUL:
 	cd ..
diff --git a/src/Readme.txt b/src/Readme.txt
index c281caaf..2aff947f 100644
--- a/src/Readme.txt
+++ b/src/Readme.txt
@@ -51,6 +51,7 @@ Requirements for Building VeraCrypt for Windows:
   header files (available at ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20)
 - NASM assembler 2.08 or compatible
 - gzip compressor
+- upx packer (available at http://upx.sourceforge.net/)
 
 IMPORTANT:
 
-- 
cgit v1.2.3