diff options
Diffstat (limited to 'src/Boot')
57 files changed, 6 insertions, 7 deletions
diff --git a/src/Boot/EFI/DcsBoot.efi b/src/Boot/EFI/DcsBoot.efi Binary files differindex 0fcd48e3..8586811b 100644 --- a/src/Boot/EFI/DcsBoot.efi +++ b/src/Boot/EFI/DcsBoot.efi diff --git a/src/Boot/EFI/DcsBoot32.efi b/src/Boot/EFI/DcsBoot32.efi Binary files differindex 48db0ca5..74aa566d 100644 --- a/src/Boot/EFI/DcsBoot32.efi +++ b/src/Boot/EFI/DcsBoot32.efi diff --git a/src/Boot/EFI/DcsCfg.efi b/src/Boot/EFI/DcsCfg.efi Binary files differindex 03c9761e..00bc092b 100644 --- a/src/Boot/EFI/DcsCfg.efi +++ b/src/Boot/EFI/DcsCfg.efi diff --git a/src/Boot/EFI/DcsCfg32.efi b/src/Boot/EFI/DcsCfg32.efi Binary files differindex 22cc0d5a..2b128f6c 100644 --- a/src/Boot/EFI/DcsCfg32.efi +++ b/src/Boot/EFI/DcsCfg32.efi diff --git a/src/Boot/EFI/DcsInfo.efi b/src/Boot/EFI/DcsInfo.efi Binary files differindex 6be1cb8f..734a37a1 100644 --- a/src/Boot/EFI/DcsInfo.efi +++ b/src/Boot/EFI/DcsInfo.efi diff --git a/src/Boot/EFI/DcsInfo32.efi b/src/Boot/EFI/DcsInfo32.efi Binary files differindex 006adfb6..ccb535a4 100644 --- a/src/Boot/EFI/DcsInfo32.efi +++ b/src/Boot/EFI/DcsInfo32.efi diff --git a/src/Boot/EFI/DcsInt.efi b/src/Boot/EFI/DcsInt.efi Binary files differindex a0c2975a..b99dc7e9 100644 --- a/src/Boot/EFI/DcsInt.efi +++ b/src/Boot/EFI/DcsInt.efi diff --git a/src/Boot/EFI/DcsInt32.efi b/src/Boot/EFI/DcsInt32.efi Binary files differindex 991885f9..ec17389b 100644 --- a/src/Boot/EFI/DcsInt32.efi +++ b/src/Boot/EFI/DcsInt32.efi diff --git a/src/Boot/EFI/DcsRe.efi b/src/Boot/EFI/DcsRe.efi Binary files differindex 070cc97c..4805129e 100644 --- a/src/Boot/EFI/DcsRe.efi +++ b/src/Boot/EFI/DcsRe.efi diff --git a/src/Boot/EFI/DcsRe32.efi b/src/Boot/EFI/DcsRe32.efi Binary files differindex c4f2013b..841c1497 100644 --- a/src/Boot/EFI/DcsRe32.efi +++ b/src/Boot/EFI/DcsRe32.efi diff --git a/src/Boot/EFI/LegacySpeaker.efi b/src/Boot/EFI/LegacySpeaker.efi Binary files differindex a1d14eb2..2164ad57 100644 --- a/src/Boot/EFI/LegacySpeaker.efi +++ b/src/Boot/EFI/LegacySpeaker.efi diff --git a/src/Boot/EFI/LegacySpeaker32.efi b/src/Boot/EFI/LegacySpeaker32.efi Binary files differindex 1ec5ba69..2b6e8cbd 100644 --- a/src/Boot/EFI/LegacySpeaker32.efi +++ b/src/Boot/EFI/LegacySpeaker32.efi diff --git a/src/Boot/EFI/Readme.txt b/src/Boot/EFI/Readme.txt index 43e29986..a43b0589 100644 --- a/src/Boot/EFI/Readme.txt +++ b/src/Boot/EFI/Readme.txt @@ -1,17 +1,16 @@ The source code for VeraCrypt EFI bootloader files is available at: https://github.com/veracrypt/VeraCrypt-DCS -VeraCrypt-DCS uses EDK II as its UEFI development environement. +VeraCrypt-DCS uses EDK II as its UEFI development environment. VeraCrypt-DCS is licensed under LGPL: https://github.com/veracrypt/VeraCrypt-DCS/blob/master/LICENSE Here the steps to build VeraCrypt-DCS (Visual Studio 2010 SP1 should be installed) * Clone EDK: git clone https://github.com/tianocore/tianocore.github.io.git edk2 * Switch to UDK2015 branche: git checkout UDK2015 - * Clone VeraCrypt-DCS as DcsPkg inside edk2 folder: git clone https://github.com/veracrypt/VeraCrypt-DCS.git DcsPkg + * Clone VeraCrypt-DCS as DcsPkg inside edk2 folder: git clone https://github.com/veracrypt/VeraCrypt-DCS.git DcsPkg * Switch to VeraCrypt_1.18 branche: git checkout VeraCrypt_1.18 * Setup EDK by typing edksetup.bat at the root of folder edk2 * change directoty to DcsPkg and then type setenv.bat. * change directory to DcsPkg\Library\VeraCryptLib and then type mklinks_src.bat: you will be asked to provide the path to VeraCrypt src folder. * change directory to DcsPkg and then type dcs_bld.bat X64Rel * After the build is finished, EFI bootloader files will be present at edk2\Build\DcsPkg\RELEASE_VS2010x86\X64 -
\ No newline at end of file diff --git a/src/Boot/Windows/BootCommon.h b/src/Boot/Windows/BootCommon.h index b77b8802..78bf55d8 100644 --- a/src/Boot/Windows/BootCommon.h +++ b/src/Boot/Windows/BootCommon.h @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2017 IDRIX and are governed by the Apache License 2.0 the full text of which is contained in the file License.txt included in VeraCrypt binary and source @@ -178,7 +178,7 @@ CSTATIC_ASSERT(FIELD_OFFSET(DCS_DISK_ENTRY, Length) == FIELD_OFFSET(DCS_DISK_ENT CSTATIC_ASSERT(FIELD_OFFSET(DCS_DISK_ENTRY, Offset) == FIELD_OFFSET(DCS_DISK_ENTRY_SECTORS, Offset), Wrong_Offset_offset); CSTATIC_ASSERT(FIELD_OFFSET(DCS_DISK_ENTRY, Offset) == FIELD_OFFSET(DCS_DISK_ENTRY_PARAMS, Offset), Wrong_Offset_offset); -// DE type specific data +// DE type specific data // DE List typedef struct _DCS_DISK_ENTRY_LIST { // EFI_TABLE_HEADER diff --git a/src/Boot/Windows/BootConsoleIo.cpp b/src/Boot/Windows/BootConsoleIo.cpp index 9148f5c9..706e36f6 100644 --- a/src/Boot/Windows/BootConsoleIo.cpp +++ b/src/Boot/Windows/BootConsoleIo.cpp @@ -260,7 +260,7 @@ byte GetKeyboardChar (byte *scanCode) { // reduce CPU usage by halting CPU until the next external interrupt is fired __asm - { + { hlt } } diff --git a/src/Boot/Windows/Makefile b/src/Boot/Windows/Makefile index 1966a3cb..9689b7cf 100644 --- a/src/Boot/Windows/Makefile +++ b/src/Boot/Windows/Makefile @@ -196,7 +196,7 @@ $(LIBS) $(LD) $(LFLAGS) @$(PROJ).crf del $(PROJ).crf $(PROJ).crf2 -# Compress the Rescue Disk botloader for Cascades and Serpent since it is too big (size > 31232 bytes) +# Compress the Rescue Disk bootloader for Cascades and Serpent since it is too big (size > 31232 bytes) #!if DEFINED(RESCUE_DISK) && (!DEFINED (SINGLE_CIPHER) || ("$(SINGLE_CIPHER)" == "SERPENT") || ("$(SINGLE_CIPHER)" == "CAMELLIA")) upx $(PROJ).$(TARGETEXT) #!endif diff --git a/src/Boot/Windows/Release/BootLoader.com.gz b/src/Boot/Windows/Release/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..9f1db6e6 --- /dev/null +++ b/src/Boot/Windows/Release/BootLoader.com.gz diff --git a/src/Boot/Windows/Release/BootSector.bin b/src/Boot/Windows/Release/BootSector.bin Binary files differnew file mode 100644 index 00000000..556a2036 --- /dev/null +++ b/src/Boot/Windows/Release/BootSector.bin diff --git a/src/Boot/Windows/Release/Decompressor.com b/src/Boot/Windows/Release/Decompressor.com Binary files differnew file mode 100644 index 00000000..14b4e5d4 --- /dev/null +++ b/src/Boot/Windows/Release/Decompressor.com diff --git a/src/Boot/Windows/Release_AES/BootLoader.com.gz b/src/Boot/Windows/Release_AES/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..4599e36a --- /dev/null +++ b/src/Boot/Windows/Release_AES/BootLoader.com.gz diff --git a/src/Boot/Windows/Release_AES/BootSector.bin b/src/Boot/Windows/Release_AES/BootSector.bin Binary files differnew file mode 100644 index 00000000..7d041a36 --- /dev/null +++ b/src/Boot/Windows/Release_AES/BootSector.bin diff --git a/src/Boot/Windows/Release_AES_SHA2/BootLoader.com.gz b/src/Boot/Windows/Release_AES_SHA2/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..e851a608 --- /dev/null +++ b/src/Boot/Windows/Release_AES_SHA2/BootLoader.com.gz diff --git a/src/Boot/Windows/Release_AES_SHA2/BootSector.bin b/src/Boot/Windows/Release_AES_SHA2/BootSector.bin Binary files differnew file mode 100644 index 00000000..7d041a36 --- /dev/null +++ b/src/Boot/Windows/Release_AES_SHA2/BootSector.bin diff --git a/src/Boot/Windows/Release_Camellia/BootLoader.com.gz b/src/Boot/Windows/Release_Camellia/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..bd7f976f --- /dev/null +++ b/src/Boot/Windows/Release_Camellia/BootLoader.com.gz diff --git a/src/Boot/Windows/Release_Camellia/BootSector.bin b/src/Boot/Windows/Release_Camellia/BootSector.bin Binary files differnew file mode 100644 index 00000000..9ff1b39e --- /dev/null +++ b/src/Boot/Windows/Release_Camellia/BootSector.bin diff --git a/src/Boot/Windows/Release_Camellia_SHA2/BootLoader.com.gz b/src/Boot/Windows/Release_Camellia_SHA2/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..fe4b76de --- /dev/null +++ b/src/Boot/Windows/Release_Camellia_SHA2/BootLoader.com.gz diff --git a/src/Boot/Windows/Release_Camellia_SHA2/BootSector.bin b/src/Boot/Windows/Release_Camellia_SHA2/BootSector.bin Binary files differnew file mode 100644 index 00000000..9ff1b39e --- /dev/null +++ b/src/Boot/Windows/Release_Camellia_SHA2/BootSector.bin diff --git a/src/Boot/Windows/Release_SHA2/BootLoader.com.gz b/src/Boot/Windows/Release_SHA2/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..81412de3 --- /dev/null +++ b/src/Boot/Windows/Release_SHA2/BootLoader.com.gz diff --git a/src/Boot/Windows/Release_SHA2/BootSector.bin b/src/Boot/Windows/Release_SHA2/BootSector.bin Binary files differnew file mode 100644 index 00000000..556a2036 --- /dev/null +++ b/src/Boot/Windows/Release_SHA2/BootSector.bin diff --git a/src/Boot/Windows/Release_Serpent/BootLoader.com.gz b/src/Boot/Windows/Release_Serpent/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..81784fcc --- /dev/null +++ b/src/Boot/Windows/Release_Serpent/BootLoader.com.gz diff --git a/src/Boot/Windows/Release_Serpent/BootSector.bin b/src/Boot/Windows/Release_Serpent/BootSector.bin Binary files differnew file mode 100644 index 00000000..8020da87 --- /dev/null +++ b/src/Boot/Windows/Release_Serpent/BootSector.bin diff --git a/src/Boot/Windows/Release_Serpent_SHA2/BootLoader.com.gz b/src/Boot/Windows/Release_Serpent_SHA2/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..e7ccf708 --- /dev/null +++ b/src/Boot/Windows/Release_Serpent_SHA2/BootLoader.com.gz diff --git a/src/Boot/Windows/Release_Serpent_SHA2/BootSector.bin b/src/Boot/Windows/Release_Serpent_SHA2/BootSector.bin Binary files differnew file mode 100644 index 00000000..8020da87 --- /dev/null +++ b/src/Boot/Windows/Release_Serpent_SHA2/BootSector.bin diff --git a/src/Boot/Windows/Release_Twofish/BootLoader.com.gz b/src/Boot/Windows/Release_Twofish/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..13a43c0e --- /dev/null +++ b/src/Boot/Windows/Release_Twofish/BootLoader.com.gz diff --git a/src/Boot/Windows/Release_Twofish/BootSector.bin b/src/Boot/Windows/Release_Twofish/BootSector.bin Binary files differnew file mode 100644 index 00000000..eff8e12a --- /dev/null +++ b/src/Boot/Windows/Release_Twofish/BootSector.bin diff --git a/src/Boot/Windows/Release_Twofish_SHA2/BootLoader.com.gz b/src/Boot/Windows/Release_Twofish_SHA2/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..5aedbb85 --- /dev/null +++ b/src/Boot/Windows/Release_Twofish_SHA2/BootLoader.com.gz diff --git a/src/Boot/Windows/Release_Twofish_SHA2/BootSector.bin b/src/Boot/Windows/Release_Twofish_SHA2/BootSector.bin Binary files differnew file mode 100644 index 00000000..eff8e12a --- /dev/null +++ b/src/Boot/Windows/Release_Twofish_SHA2/BootSector.bin diff --git a/src/Boot/Windows/Rescue/BootLoader.com.gz b/src/Boot/Windows/Rescue/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..29da4d15 --- /dev/null +++ b/src/Boot/Windows/Rescue/BootLoader.com.gz diff --git a/src/Boot/Windows/Rescue/BootSector.bin b/src/Boot/Windows/Rescue/BootSector.bin Binary files differnew file mode 100644 index 00000000..556a2036 --- /dev/null +++ b/src/Boot/Windows/Rescue/BootSector.bin diff --git a/src/Boot/Windows/Rescue_AES/BootLoader.com.gz b/src/Boot/Windows/Rescue_AES/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..da0c096c --- /dev/null +++ b/src/Boot/Windows/Rescue_AES/BootLoader.com.gz diff --git a/src/Boot/Windows/Rescue_AES/BootSector.bin b/src/Boot/Windows/Rescue_AES/BootSector.bin Binary files differnew file mode 100644 index 00000000..9ff1b39e --- /dev/null +++ b/src/Boot/Windows/Rescue_AES/BootSector.bin diff --git a/src/Boot/Windows/Rescue_AES_SHA2/BootLoader.com.gz b/src/Boot/Windows/Rescue_AES_SHA2/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..fbda8050 --- /dev/null +++ b/src/Boot/Windows/Rescue_AES_SHA2/BootLoader.com.gz diff --git a/src/Boot/Windows/Rescue_AES_SHA2/BootSector.bin b/src/Boot/Windows/Rescue_AES_SHA2/BootSector.bin Binary files differnew file mode 100644 index 00000000..9ff1b39e --- /dev/null +++ b/src/Boot/Windows/Rescue_AES_SHA2/BootSector.bin diff --git a/src/Boot/Windows/Rescue_Camellia/BootLoader.com.gz b/src/Boot/Windows/Rescue_Camellia/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..fa5f04c8 --- /dev/null +++ b/src/Boot/Windows/Rescue_Camellia/BootLoader.com.gz diff --git a/src/Boot/Windows/Rescue_Camellia/BootSector.bin b/src/Boot/Windows/Rescue_Camellia/BootSector.bin Binary files differnew file mode 100644 index 00000000..9ff1b39e --- /dev/null +++ b/src/Boot/Windows/Rescue_Camellia/BootSector.bin diff --git a/src/Boot/Windows/Rescue_Camellia_SHA2/BootLoader.com.gz b/src/Boot/Windows/Rescue_Camellia_SHA2/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..1c55524b --- /dev/null +++ b/src/Boot/Windows/Rescue_Camellia_SHA2/BootLoader.com.gz diff --git a/src/Boot/Windows/Rescue_Camellia_SHA2/BootSector.bin b/src/Boot/Windows/Rescue_Camellia_SHA2/BootSector.bin Binary files differnew file mode 100644 index 00000000..9ff1b39e --- /dev/null +++ b/src/Boot/Windows/Rescue_Camellia_SHA2/BootSector.bin diff --git a/src/Boot/Windows/Rescue_SHA2/BootLoader.com.gz b/src/Boot/Windows/Rescue_SHA2/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..ba34bf3b --- /dev/null +++ b/src/Boot/Windows/Rescue_SHA2/BootLoader.com.gz diff --git a/src/Boot/Windows/Rescue_SHA2/BootSector.bin b/src/Boot/Windows/Rescue_SHA2/BootSector.bin Binary files differnew file mode 100644 index 00000000..556a2036 --- /dev/null +++ b/src/Boot/Windows/Rescue_SHA2/BootSector.bin diff --git a/src/Boot/Windows/Rescue_Serpent/BootLoader.com.gz b/src/Boot/Windows/Rescue_Serpent/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..bb52b491 --- /dev/null +++ b/src/Boot/Windows/Rescue_Serpent/BootLoader.com.gz diff --git a/src/Boot/Windows/Rescue_Serpent/BootSector.bin b/src/Boot/Windows/Rescue_Serpent/BootSector.bin Binary files differnew file mode 100644 index 00000000..8020da87 --- /dev/null +++ b/src/Boot/Windows/Rescue_Serpent/BootSector.bin diff --git a/src/Boot/Windows/Rescue_Serpent_SHA2/BootLoader.com.gz b/src/Boot/Windows/Rescue_Serpent_SHA2/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..78c246e8 --- /dev/null +++ b/src/Boot/Windows/Rescue_Serpent_SHA2/BootLoader.com.gz diff --git a/src/Boot/Windows/Rescue_Serpent_SHA2/BootSector.bin b/src/Boot/Windows/Rescue_Serpent_SHA2/BootSector.bin Binary files differnew file mode 100644 index 00000000..8020da87 --- /dev/null +++ b/src/Boot/Windows/Rescue_Serpent_SHA2/BootSector.bin diff --git a/src/Boot/Windows/Rescue_Twofish/BootLoader.com.gz b/src/Boot/Windows/Rescue_Twofish/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..81e2a072 --- /dev/null +++ b/src/Boot/Windows/Rescue_Twofish/BootLoader.com.gz diff --git a/src/Boot/Windows/Rescue_Twofish/BootSector.bin b/src/Boot/Windows/Rescue_Twofish/BootSector.bin Binary files differnew file mode 100644 index 00000000..eff8e12a --- /dev/null +++ b/src/Boot/Windows/Rescue_Twofish/BootSector.bin diff --git a/src/Boot/Windows/Rescue_Twofish_SHA2/BootLoader.com.gz b/src/Boot/Windows/Rescue_Twofish_SHA2/BootLoader.com.gz Binary files differnew file mode 100644 index 00000000..958228cb --- /dev/null +++ b/src/Boot/Windows/Rescue_Twofish_SHA2/BootLoader.com.gz diff --git a/src/Boot/Windows/Rescue_Twofish_SHA2/BootSector.bin b/src/Boot/Windows/Rescue_Twofish_SHA2/BootSector.bin Binary files differnew file mode 100644 index 00000000..eff8e12a --- /dev/null +++ b/src/Boot/Windows/Rescue_Twofish_SHA2/BootSector.bin |