DcsInfo is added

src/Common/BootEncryption.cpp

@@ -2566,6 +2566,10 @@ namespace VeraCrypt
 			byte *BootMenuLockerImg = MapResource(L"BIN", Is64BitOs()? IDR_EFI_DCSBML: IDR_EFI_DCSBML32, &sizeBootMenuLocker);
 			if (!BootMenuLockerImg)
 				throw ErrorException(L"Out of resource DcsBml", SRC_POS);
+			DWORD sizeDcsInfo;
+			byte *DcsInfoImg = MapResource(L"BIN", Is64BitOs()? IDR_EFI_DCSINFO: IDR_EFI_DCSINFO32, &sizeDcsInfo);
+			if (!DcsInfoImg)
+				throw ErrorException(L"Out of resource DcsInfo", SRC_POS);
 
 			finally_do ({ EfiBootInst.DismountBootPartition(); });
 			EfiBootInst.MountBootPartition(0);			
@@ -2582,6 +2586,8 @@ namespace VeraCrypt
 				EfiBootInst.SaveFile(L"\\EFI\\VeraCrypt\\DcsCfg.dcs", dcsCfgImg, sizeDcsCfg);
 				EfiBootInst.SaveFile(L"\\EFI\\VeraCrypt\\LegacySpeaker.dcs", LegacySpeakerImg, sizeLegacySpeaker);
 				EfiBootInst.SaveFile(L"\\EFI\\VeraCrypt\\DcsBml.dcs", BootMenuLockerImg, sizeBootMenuLocker);
+				EfiBootInst.SaveFile(L"\\EFI\\VeraCrypt\\DcsInfo.dcs", DcsInfoImg, sizeDcsInfo);
+				EfiBootInst.DelFile(L"\\EFI\\VeraCrypt\\PlatformInfo");
 				EfiBootInst.SetStartExec(L"VeraCrypt BootLoader (DcsBoot)", L"\\EFI\\VeraCrypt\\DcsBoot.efi");
 
 				// move configuration file from old location (if it exists) to new location
@@ -2766,6 +2772,10 @@ namespace VeraCrypt
 			byte *DcsRescueImg = MapResource(L"BIN", Is64BitOs()? IDR_EFI_DCSRE: IDR_EFI_DCSRE32, &sizeDcsRescue);
 			if (!DcsRescueImg)
 				throw ParameterIncorrect (SRC_POS);
+			DWORD sizeDcsInfo;
+			byte *DcsInfoImg = MapResource(L"BIN", Is64BitOs()? IDR_EFI_DCSINFO: IDR_EFI_DCSINFO32, &sizeDcsInfo);
+			if (!DcsInfoImg)
+				throw ErrorException(L"Out of resource DcsInfo", SRC_POS);
 
 			char szTmpPath[MAX_PATH + 1], szTmpFilePath[MAX_PATH + 1];
 			if (!GetTempPathA (MAX_PATH, szTmpPath))
@@ -2794,6 +2804,8 @@ namespace VeraCrypt
 				throw ParameterIncorrect (SRC_POS);
 			if (!ZipAdd (z, "EFI/VeraCrypt/LegacySpeaker.dcs", LegacySpeakerImg, sizeLegacySpeaker))
 				throw ParameterIncorrect (SRC_POS);
+			if (!ZipAdd (z, "EFI/VeraCrypt/DcsInfo.dcs", DcsInfoImg, sizeDcsInfo))
+				throw ParameterIncorrect (SRC_POS);
 
 			Buffer volHeader(TC_BOOT_ENCRYPTION_VOLUME_HEADER_SIZE);
 
@@ -3532,6 +3544,8 @@ namespace VeraCrypt
 			EfiBootInst.DelFile(L"\\EFI\\VeraCrypt\\LegacySpeaker.dcs");
 			EfiBootInst.DelFile(L"\\EFI\\VeraCrypt\\DcsBml.dcs");
 			EfiBootInst.DelFile(L"\\EFI\\VeraCrypt\\DcsBoot");
+			EfiBootInst.DelFile(L"\\EFI\\VeraCrypt\\DcsInfo.dcs");
+			EfiBootInst.DelFile(L"\\EFI\\VeraCrypt\\PlatformInfo");
 			EfiBootInst.DelFile(L"\\EFI\\VeraCrypt\\DcsProp");
 			EfiBootInst.DelDir (L"\\EFI\\VeraCrypt");
 		}

src/Common/Common.rc

@@ -544,6 +544,8 @@ IDR_EFI_DCSCFG32          BIN                     "..\\Boot\\EFI\\DcsCfg32.efi"
 IDR_EFI_LEGACYSPEAKER32   BIN                     "..\\Boot\\EFI\\LegacySpeaker32.efi"
 IDR_EFI_DCSBML32         BIN                     "..\\Boot\\EFI\\DcsBml32.efi"
 IDR_EFI_DCSRE32          BIN                     "..\\Boot\\EFI\\DcsRe32.efi"
+IDR_EFI_DCSINFO         BIN                     "..\\Boot\\EFI\\DcsInfo.efi"
+IDR_EFI_DCSINFO32         BIN                     "..\\Boot\\EFI\\DcsInfo32.efi"
 
 /////////////////////////////////////////////////////////////////////////////
 //

src/Common/Resource.h

@@ -71,14 +71,16 @@
 #define IDR_EFI_DCSINT                  567
 #define IDR_EFI_DCSCFG                  568
 #define IDR_EFI_LEGACYSPEAKER           569
-#define IDR_EFI_DCSBML           		570
-#define IDR_EFI_DCSRE           		571
+#define IDR_EFI_DCSBML                  570
+#define IDR_EFI_DCSRE                   571
 #define IDR_EFI_DCSBOOT32               572
 #define IDR_EFI_DCSINT32                573
 #define IDR_EFI_DCSCFG32                574
 #define IDR_EFI_LEGACYSPEAKER32         575
-#define IDR_EFI_DCSBML32           		576
-#define IDR_EFI_DCSRE32           		577
+#define IDR_EFI_DCSBML32                576
+#define IDR_EFI_DCSRE32                 577
+#define IDR_EFI_DCSINFO                 578
+#define IDR_EFI_DCSINFO32               579
 #define IDC_HW_AES_LABEL_LINK           5000
 #define IDC_HW_AES                      5001
 #define IDC_PARALLELIZATION_LABEL_LINK  5002