diff options
Diffstat (limited to 'src/Boot')
225 files changed, 206 insertions, 294 deletions
diff --git a/src/Boot/EFI/DcsBml.efi b/src/Boot/EFI/DcsBml.efi Binary files differdeleted file mode 100644 index 97b13024..00000000 --- a/src/Boot/EFI/DcsBml.efi +++ /dev/null diff --git a/src/Boot/EFI/DcsBml32.efi b/src/Boot/EFI/DcsBml32.efi Binary files differdeleted file mode 100644 index a6d32b12..00000000 --- a/src/Boot/EFI/DcsBml32.efi +++ /dev/null diff --git a/src/Boot/EFI/DcsBoot.efi b/src/Boot/EFI/DcsBoot.efi Binary files differindex eabfbcb1..02884df9 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 0cdeb429..1447e98b 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 d740962c..82dc446a 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 1341f98b..899197ff 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 a5468d03..15810f4d 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 588b9a1e..ddb1e64b 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 a8ec8e10..3816327a 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 d65c765c..36d7b61f 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 4401192b..599f7026 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 bc53a0c1..f2a935b7 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 3095bf7a..034c760b 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 71e28c6d..5b52ba9f 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 12a8b30f..ed732bc2 100644 --- a/src/Boot/EFI/Readme.txt +++ b/src/Boot/EFI/Readme.txt @@ -1,38 +1,16 @@ The source code for VeraCrypt EFI bootloader files is available at: https://github.com/veracrypt/VeraCrypt-DCS -Use tag "VeraCrypt_1.18" to extract the sources that were used when building VeraCrypt 1.18. -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 + * Clone EDK: git clone https://github.com/tianocore/edk2.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 - -Secure Boot: -In order to allow VeraCrypt EFI bootloader to run when EFI Secure Boot is enabled, VeraCrypt EFI bootloader files are signed by custom key(DCS_sign) -whose public part can be loaded into Secure Boot to allow verification of VeraCrypt EFI files. - -to update Secure Boot configuration steps: -1. Run the tool dumpEfiVars (https://www.veracrypt.fr/downloads/tools/dumpEfiVars.exe) to dump the SecureBoot data. -2. Go through all folders created by dumpEfiVars (other than "77fa9abd-0359-4d32-bd60-28f4e78f784b" and "SigLists") and note the file names of the certificates created inside the folders (.der extension). -3. Enter BIOS configuration -4. Switch Secure boot to setup mode (or custom mode or clear keys). It deletes PK (platform certificate) and allows to load DCS platform key. -5. Boot Windows -6. Edit the file sb_set_siglists.ps1 and uncomment the lines related to the manufacturer of the machine and which reference the certfiicates names gethered from step 2. -5. execute from admin command prompt - powershell -ExecutionPolicy Bypass -File sb_set_siglists.ps1 -It sets in PK (platform key) - DCS_platform -It sets in KEK (key exchange key) - DCS_key_exchange -It sets in db - DCS_sign MicWinProPCA2011_2011-10-19 MicCorUEFCA2011_2011-06-27 and the other certificates specific to your machine. - -All DCS modules are protected by DCS_sign. -All Windows modules are protected by MicWinProPCA2011_2011-10-19 -All SHIM(linux) modules are protected by MicCorUEFCA2011_2011-06-27
\ No newline at end of file diff --git a/src/Boot/EFI/certs/ASUSTeK_MotherBoard_SW_Key_Certificate_2011-12_27.crt b/src/Boot/EFI/certs/ASUSTeK_MotherBoard_SW_Key_Certificate_2011-12_27.crt Binary files differdeleted file mode 100644 index 4f8c0c91..00000000 --- a/src/Boot/EFI/certs/ASUSTeK_MotherBoard_SW_Key_Certificate_2011-12_27.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/ASUSTeK_Notebook_SW_Key_Certificate_2011-12_27.crt b/src/Boot/EFI/certs/ASUSTeK_Notebook_SW_Key_Certificate_2011-12_27.crt Binary files differdeleted file mode 100644 index d841207c..00000000 --- a/src/Boot/EFI/certs/ASUSTeK_Notebook_SW_Key_Certificate_2011-12_27.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Acer_2012-05-31.crt b/src/Boot/EFI/certs/Acer_2012-05-31.crt Binary files differdeleted file mode 100644 index b0aa0ce1..00000000 --- a/src/Boot/EFI/certs/Acer_2012-05-31.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Acer_ABO_2010-12-31.crt b/src/Boot/EFI/certs/Acer_ABO_2010-12-31.crt Binary files differdeleted file mode 100644 index 09585a9e..00000000 --- a/src/Boot/EFI/certs/Acer_ABO_2010-12-31.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Acer_Database_2013-07-10.crt b/src/Boot/EFI/certs/Acer_Database_2013-07-10.crt Binary files differdeleted file mode 100644 index b69e5a4e..00000000 --- a/src/Boot/EFI/certs/Acer_Database_2013-07-10.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Acer_DisablePW_2012-12-31.crt b/src/Boot/EFI/certs/Acer_DisablePW_2012-12-31.crt Binary files differdeleted file mode 100644 index 8d7af17c..00000000 --- a/src/Boot/EFI/certs/Acer_DisablePW_2012-12-31.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Acer_LINPUS_2012-10-09.crt b/src/Boot/EFI/certs/Acer_LINPUS_2012-10-09.crt Binary files differdeleted file mode 100644 index 5e38f209..00000000 --- a/src/Boot/EFI/certs/Acer_LINPUS_2012-10-09.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Acer_Quanta_NB4_2012-07-18.crt b/src/Boot/EFI/certs/Acer_Quanta_NB4_2012-07-18.crt Binary files differdeleted file mode 100644 index d05e8de3..00000000 --- a/src/Boot/EFI/certs/Acer_Quanta_NB4_2012-07-18.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Acer_Wistron_Secure_Flash_2013-05-17.crt b/src/Boot/EFI/certs/Acer_Wistron_Secure_Flash_2013-05-17.crt Binary files differdeleted file mode 100644 index ef903584..00000000 --- a/src/Boot/EFI/certs/Acer_Wistron_Secure_Flash_2013-05-17.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Acer_db_Manufacture_2015-06-17.crt b/src/Boot/EFI/certs/Acer_db_Manufacture_2015-06-17.crt Binary files differdeleted file mode 100644 index 394b37c9..00000000 --- a/src/Boot/EFI/certs/Acer_db_Manufacture_2015-06-17.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Canonical_Master_CA_2012_04_12.crt b/src/Boot/EFI/certs/Canonical_Master_CA_2012_04_12.crt Binary files differdeleted file mode 100644 index fe395689..00000000 --- a/src/Boot/EFI/certs/Canonical_Master_CA_2012_04_12.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/DCS_key_exchange.crt b/src/Boot/EFI/certs/DCS_key_exchange.crt Binary files differdeleted file mode 100644 index 80bc7ca4..00000000 --- a/src/Boot/EFI/certs/DCS_key_exchange.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/DCS_platform.crt b/src/Boot/EFI/certs/DCS_platform.crt Binary files differdeleted file mode 100644 index a7cf8ce9..00000000 --- a/src/Boot/EFI/certs/DCS_platform.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/DCS_sign.crt b/src/Boot/EFI/certs/DCS_sign.crt Binary files differdeleted file mode 100644 index f0538dbb..00000000 --- a/src/Boot/EFI/certs/DCS_sign.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Dell_CompalA31CSMB_2012-07-17.crt b/src/Boot/EFI/certs/Dell_CompalA31CSMB_2012-07-17.crt Binary files differdeleted file mode 100644 index cd79bf31..00000000 --- a/src/Boot/EFI/certs/Dell_CompalA31CSMB_2012-07-17.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Dell_UEFI_DB_2016_06_03.crt b/src/Boot/EFI/certs/Dell_UEFI_DB_2016_06_03.crt Binary files differdeleted file mode 100644 index bb4df002..00000000 --- a/src/Boot/EFI/certs/Dell_UEFI_DB_2016_06_03.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/HP_UEFI_Secure_Boot_2013_DB_key_2013_08_23.crt b/src/Boot/EFI/certs/HP_UEFI_Secure_Boot_2013_DB_key_2013_08_23.crt Binary files differdeleted file mode 100644 index 6072ffc5..00000000 --- a/src/Boot/EFI/certs/HP_UEFI_Secure_Boot_2013_DB_key_2013_08_23.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/HP_UEFI_Secure_Boot_DB_2017_2017-01-20.crt b/src/Boot/EFI/certs/HP_UEFI_Secure_Boot_DB_2017_2017-01-20.crt Binary files differdeleted file mode 100644 index faacb2e5..00000000 --- a/src/Boot/EFI/certs/HP_UEFI_Secure_Boot_DB_2017_2017-01-20.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Lenovo_1T110-1415ISK-2016-02-17.crt b/src/Boot/EFI/certs/Lenovo_1T110-1415ISK-2016-02-17.crt Binary files differdeleted file mode 100644 index 32776f53..00000000 --- a/src/Boot/EFI/certs/Lenovo_1T110-1415ISK-2016-02-17.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Lenovo_2JYoga910_2015-12-02.crt b/src/Boot/EFI/certs/Lenovo_2JYoga910_2015-12-02.crt Binary files differdeleted file mode 100644 index 1c8b284d..00000000 --- a/src/Boot/EFI/certs/Lenovo_2JYoga910_2015-12-02.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Lenovo_4MYoga720-15IKB_2016-11-09.crt b/src/Boot/EFI/certs/Lenovo_4MYoga720-15IKB_2016-11-09.crt Binary files differdeleted file mode 100644 index 196de328..00000000 --- a/src/Boot/EFI/certs/Lenovo_4MYoga720-15IKB_2016-11-09.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Lenovo_DCU31-80E31-80_2015-03-03.crt b/src/Boot/EFI/certs/Lenovo_DCU31-80E31-80_2015-03-03.crt Binary files differdeleted file mode 100644 index b95ba3e7..00000000 --- a/src/Boot/EFI/certs/Lenovo_DCU31-80E31-80_2015-03-03.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Lenovo_LCFC_2015-05-29.crt b/src/Boot/EFI/certs/Lenovo_LCFC_2015-05-29.crt Binary files differdeleted file mode 100644 index bd2ad26b..00000000 --- a/src/Boot/EFI/certs/Lenovo_LCFC_2015-05-29.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Lenovo_Mocca_2012-06-20.crt b/src/Boot/EFI/certs/Lenovo_Mocca_2012-06-20.crt Binary files differdeleted file mode 100644 index 37fda34d..00000000 --- a/src/Boot/EFI/certs/Lenovo_Mocca_2012-06-20.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Lenovo_ThinkPad_Product_CA_2012-06-29.crt b/src/Boot/EFI/certs/Lenovo_ThinkPad_Product_CA_2012-06-29.crt Binary files differdeleted file mode 100644 index d8d09555..00000000 --- a/src/Boot/EFI/certs/Lenovo_ThinkPad_Product_CA_2012-06-29.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Lenovo_UEFI_CA_2014-01-24.crt b/src/Boot/EFI/certs/Lenovo_UEFI_CA_2014-01-24.crt Binary files differdeleted file mode 100644 index 4541127d..00000000 --- a/src/Boot/EFI/certs/Lenovo_UEFI_CA_2014-01-24.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/MSI_SHIP_OWN_CA_2012-06-09.crt b/src/Boot/EFI/certs/MSI_SHIP_OWN_CA_2012-06-09.crt Binary files differdeleted file mode 100644 index a1e9cde1..00000000 --- a/src/Boot/EFI/certs/MSI_SHIP_OWN_CA_2012-06-09.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/MicCorUEFCA2011_2011-06-27.crt b/src/Boot/EFI/certs/MicCorUEFCA2011_2011-06-27.crt Binary files differdeleted file mode 100644 index 9aa6ac6c..00000000 --- a/src/Boot/EFI/certs/MicCorUEFCA2011_2011-06-27.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/MicWinProPCA2011_2011-10-19.crt b/src/Boot/EFI/certs/MicWinProPCA2011_2011-10-19.crt Binary files differdeleted file mode 100644 index a6d001c2..00000000 --- a/src/Boot/EFI/certs/MicWinProPCA2011_2011-10-19.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/OriginPC_OWN_CA_2018-01-09.crt b/src/Boot/EFI/certs/OriginPC_OWN_CA_2018-01-09.crt Binary files differdeleted file mode 100644 index 7f849647..00000000 --- a/src/Boot/EFI/certs/OriginPC_OWN_CA_2018-01-09.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Panasonic_Corporation_db_CA_2013-03-31.crt b/src/Boot/EFI/certs/Panasonic_Corporation_db_CA_2013-03-31.crt Binary files differdeleted file mode 100644 index d839ce28..00000000 --- a/src/Boot/EFI/certs/Panasonic_Corporation_db_CA_2013-03-31.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Readme.txt b/src/Boot/EFI/certs/Readme.txt deleted file mode 100644 index 3f6fd557..00000000 --- a/src/Boot/EFI/certs/Readme.txt +++ /dev/null @@ -1,3 +0,0 @@ -There are two public DB entries - one for Windows and one for the UEFI Certificate Authority (CA). -Windows DB: http://www.microsoft.com/pkiops/certs/MicWinProPCA2011_2011-10-19.crt -UEFI DB: http://www.microsoft.com/pkiops/certs/MicCorUEFCA2011_2011-06-27.crt diff --git a/src/Boot/EFI/certs/Samsung_SEC_PRODUCTION_KeyUEFI_2012-07-05.crt b/src/Boot/EFI/certs/Samsung_SEC_PRODUCTION_KeyUEFI_2012-07-05.crt Binary files differdeleted file mode 100644 index ca4ebf02..00000000 --- a/src/Boot/EFI/certs/Samsung_SEC_PRODUCTION_KeyUEFI_2012-07-05.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Toshiba_Corporation_Utility_CA_2012-08-10.crt b/src/Boot/EFI/certs/Toshiba_Corporation_Utility_CA_2012-08-10.crt Binary files differdeleted file mode 100644 index b7728795..00000000 --- a/src/Boot/EFI/certs/Toshiba_Corporation_Utility_CA_2012-08-10.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Toshiba_QCI_2012-07-24.crt b/src/Boot/EFI/certs/Toshiba_QCI_2012-07-24.crt Binary files differdeleted file mode 100644 index 461c91a7..00000000 --- a/src/Boot/EFI/certs/Toshiba_QCI_2012-07-24.crt +++ /dev/null diff --git a/src/Boot/EFI/certs/Toshiba_QCI_Shell_2012-07-24.crt b/src/Boot/EFI/certs/Toshiba_QCI_Shell_2012-07-24.crt Binary files differdeleted file mode 100644 index 496f7642..00000000 --- a/src/Boot/EFI/certs/Toshiba_QCI_Shell_2012-07-24.crt +++ /dev/null diff --git a/src/Boot/EFI/sb_set_siglists.ps1 b/src/Boot/EFI/sb_set_siglists.ps1 deleted file mode 100644 index d26feb85..00000000 --- a/src/Boot/EFI/sb_set_siglists.ps1 +++ /dev/null @@ -1,94 +0,0 @@ -Set-ExecutionPolicy Bypass -Force -Import-Module secureboot - -$scriptPath = split-path -parent $MyInvocation.MyCommand.Definition - -try -{ - Set-SecureBootUEFI -Name dbx -Time 2018-07-05T00:00:00Z -Content $null - Set-SecureBootUEFI -Name db -Time 2018-07-05T00:00:00Z -Content $null - Set-SecureBootUEFI -Name KEK -Time 2018-07-05T00:00:00Z -Content $null - Set-SecureBootUEFI -Name PK -Time 2018-07-05T00:00:00Z -Content $null -} -catch -{ -} - -Write-Host "Setting KEK-signed content of dbx..." -Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\dbx_list_SigList.bin -SignedFilePath $scriptPath\siglists\dbx_list_SigList_Serialization.bin.p7 -Name dbx - -Write-Host "Setting KEK-signed DCS cert in db..." -Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\DCS_sign_SigList.bin -SignedFilePath $scriptPath\siglists\DCS_sign_SigList_Serialization.bin.p7 -Name db - -Write-Host "Setting KEK-signed MS cert in db..." -Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\MicWinProPCA2011_2011-10-19_SigList.bin -SignedFilePath $scriptPath\siglists\MicWinProPCA2011_2011-10-19_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true - -Write-Host "Setting KEK-signed MS UEFI cert in db..." -Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\MicCorUEFCA2011_2011-06-27_SigList.bin -SignedFilePath $scriptPath\siglists\MicCorUEFCA2011_2011-06-27_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true - -# Add any additional certificate that already existed in your original db variable (see output of dumpEfiVars tool) -# Below is a list of commands for each manufacturer. Uncommand only the lines that correspond to your configuration -# as displayed by dumpEfiVars tool - -############### Acer ############### -# Write-Host "Setting KEK-signed Acer certs in db..." -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Acer_2012-05-31_SigList.bin -SignedFilePath $scriptPath\siglists\Acer_2012-05-31_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Acer_Database_2013-07-10_SigList.bin -SignedFilePath $scriptPath\siglists\Acer_Database_2013-07-10_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Acer_db_Manufacture_2015-06-17_SigList.bin -SignedFilePath $scriptPath\siglists\Acer_db_Manufacture_2015-06-17_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Acer_LINPUS_2012-10-09_SigList.bin -SignedFilePath $scriptPath\siglists\Acer_LINPUS_2012-10-09_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Acer_Quanta_NB4_2012-07-18_SigList.bin -SignedFilePath $scriptPath\siglists\Acer_Quanta_NB4_2012-07-18_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Acer_ABO_2010-12-31_SigList.bin -SignedFilePath $scriptPath\siglists\Acer_ABO_2010-12-31_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Acer_DisablePW_2012-12-31_SigList.bin -SignedFilePath $scriptPath\siglists\Acer_DisablePW_2012-12-31_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Acer_Wistron_Secure_Flash_2013-05-17_SigList.bin -SignedFilePath $scriptPath\siglists\Acer_Wistron_Secure_Flash_2013-05-17_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true - -############### ASUS ############### -# Write-Host "Setting KEK-signed ASUS certs in db..." -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\ASUSTeK_MotherBoard_SW_Key_Certificate_2011-12_27_SigList.bin -SignedFilePath $scriptPath\siglists\ASUSTeK_MotherBoard_SW_Key_Certificate_2011-12_27_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\ASUSTeK_Notebook_SW_Key_Certificate_2011-12_27_SigList.bin -SignedFilePath $scriptPath\siglists\ASUSTeK_Notebook_SW_Key_Certificate_2011-12_27_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Canonical_Master_CA_2012_04_12_SigList.bin -SignedFilePath $scriptPath\siglists\Canonical_Master_CA_2012_04_12_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true - -############### DELL ############### -# Write-Host "Setting KEK-signed Dell cert in db..." -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Dell_UEFI_DB_2016_06_03_SigList.bin -SignedFilePath $scriptPath\siglists\Dell_UEFI_DB_2016_06_03_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Dell_CompalA31CSMB_2012-07-17_SigList.bin -SignedFilePath $scriptPath\siglists\Dell_CompalA31CSMB_2012-07-17_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true - -############### HP ############### -# Write-Host "Setting KEK-signed HP cert in db..." -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\HP_UEFI_Secure_Boot_2013_DB_key_2013_08_23_SigList.bin -SignedFilePath $scriptPath\siglists\HP_UEFI_Secure_Boot_2013_DB_key_2013_08_23_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\HP_UEFI_Secure_Boot_DB_2017_2017-01-20_SigList.bin -SignedFilePath $scriptPath\siglists\HP_UEFI_Secure_Boot_DB_2017_2017-01-20_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true - -############### Lenovo ############### -# Write-Host "Setting KEK-signed Lenovo certs in db..." -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Lenovo_1T110-1415ISK-2016-02-17_SigList.bin -SignedFilePath $scriptPath\siglists\Lenovo_1T110-1415ISK-2016-02-17_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Lenovo_DCU31-80E31-80_2015-03-03_SigList.bin -SignedFilePath $scriptPath\siglists\Lenovo_DCU31-80E31-80_2015-03-03_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Lenovo_ThinkPad_Product_CA_2012-06-29_SigList.bin -SignedFilePath $scriptPath\siglists\Lenovo_ThinkPad_Product_CA_2012-06-29_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Lenovo_UEFI_CA_2014-01-24_SigList.bin -SignedFilePath $scriptPath\siglists\Lenovo_UEFI_CA_2014-01-24_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Lenovo_2JYoga910_2015-12-02_SigList.bin -SignedFilePath $scriptPath\siglists\Lenovo_2JYoga910_2015-12-02_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Lenovo_LCFC_2015-05-29_SigList.bin -SignedFilePath $scriptPath\siglists\Lenovo_LCFC_2015-05-29_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Lenovo_Mocca_2012-06-20_SigList.bin -SignedFilePath $scriptPath\siglists\Lenovo_Mocca_2012-06-20_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Lenovo_4MYoga720-15IKB_2016-11-09_SigList.bin -SignedFilePath $scriptPath\siglists\Lenovo_4MYoga720-15IKB_2016-11-09_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true - -############### MSI ############### -# Write-Host "Setting KEK-signed MSI certs in db..." -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\MSI_SHIP_OWN_CA_2012-06-09_SigList.bin -SignedFilePath $scriptPath\siglists\MSI_SHIP_OWN_CA_2012-06-09_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true - -############### OriginPC ############### -# Write-Host "Setting KEK-signed OriginPC certs in db..." -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\OriginPC_OWN_CA_2018-01-09_SigList.bin -SignedFilePath $scriptPath\siglists\OriginPC_OWN_CA_2018-01-09_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true - -############### Panasonic ############### -# Write-Host "Setting KEK-signed Panasonic certs in db..." -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Panasonic_Corporation_db_CA_2013-03-31_SigList.bin -SignedFilePath $scriptPath\siglists\Panasonic_Corporation_db_CA_2013-03-31_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true - -############### Toshiba ############### -# Write-Host "Setting KEK-signed Toshiba certs in db..." -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Toshiba_Corporation_Utility_CA_2012-08-10_SigList.bin -SignedFilePath $scriptPath\siglists\Toshiba_Corporation_Utility_CA_2012-08-10_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Toshiba_QCI_2012-07-24_SigList.bin -SignedFilePath $scriptPath\siglists\Toshiba_QCI_2012-07-24_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true -# Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\Toshiba_QCI_Shell_2012-07-24_SigList.bin -SignedFilePath $scriptPath\siglists\Toshiba_QCI_Shell_2012-07-24_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true - -Write-Host "Setting PK-signed KEK..." -Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\DCS_key_exchange_SigList.bin -SignedFilePath $scriptPath\siglists\DCS_key_exchange_SigList_Serialization.bin.p7 -Name KEK - -Write-Host "Setting self-signed PK..." -Set-SecureBootUEFI -Time 2018-07-05T00:00:00Z -ContentFilePath $scriptPath\siglists\DCS_platform_SigList.bin -SignedFilePath $scriptPath\siglists\DCS_platform_SigList_Serialization.bin.p7 -Name PK - diff --git a/src/Boot/EFI/siglists/ASUSTeK_MotherBoard_SW_Key_Certificate_2011-12_27_SigList.bin b/src/Boot/EFI/siglists/ASUSTeK_MotherBoard_SW_Key_Certificate_2011-12_27_SigList.bin Binary files differdeleted file mode 100644 index d1ba71cc..00000000 --- a/src/Boot/EFI/siglists/ASUSTeK_MotherBoard_SW_Key_Certificate_2011-12_27_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/ASUSTeK_MotherBoard_SW_Key_Certificate_2011-12_27_SigList_Serialization.bin b/src/Boot/EFI/siglists/ASUSTeK_MotherBoard_SW_Key_Certificate_2011-12_27_SigList_Serialization.bin Binary files differdeleted file mode 100644 index ad5283e4..00000000 --- a/src/Boot/EFI/siglists/ASUSTeK_MotherBoard_SW_Key_Certificate_2011-12_27_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/ASUSTeK_MotherBoard_SW_Key_Certificate_2011-12_27_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/ASUSTeK_MotherBoard_SW_Key_Certificate_2011-12_27_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index f24a7f86..00000000 --- a/src/Boot/EFI/siglists/ASUSTeK_MotherBoard_SW_Key_Certificate_2011-12_27_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/ASUSTeK_Notebook_SW_Key_Certificate_2011-12_27_SigList.bin b/src/Boot/EFI/siglists/ASUSTeK_Notebook_SW_Key_Certificate_2011-12_27_SigList.bin Binary files differdeleted file mode 100644 index 72b09358..00000000 --- a/src/Boot/EFI/siglists/ASUSTeK_Notebook_SW_Key_Certificate_2011-12_27_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/ASUSTeK_Notebook_SW_Key_Certificate_2011-12_27_SigList_Serialization.bin b/src/Boot/EFI/siglists/ASUSTeK_Notebook_SW_Key_Certificate_2011-12_27_SigList_Serialization.bin Binary files differdeleted file mode 100644 index a93a198d..00000000 --- a/src/Boot/EFI/siglists/ASUSTeK_Notebook_SW_Key_Certificate_2011-12_27_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/ASUSTeK_Notebook_SW_Key_Certificate_2011-12_27_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/ASUSTeK_Notebook_SW_Key_Certificate_2011-12_27_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 5e95d122..00000000 --- a/src/Boot/EFI/siglists/ASUSTeK_Notebook_SW_Key_Certificate_2011-12_27_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_2012-05-31_SigList.bin b/src/Boot/EFI/siglists/Acer_2012-05-31_SigList.bin Binary files differdeleted file mode 100644 index 8644ef35..00000000 --- a/src/Boot/EFI/siglists/Acer_2012-05-31_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_2012-05-31_SigList_Serialization.bin b/src/Boot/EFI/siglists/Acer_2012-05-31_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 9e3759c7..00000000 --- a/src/Boot/EFI/siglists/Acer_2012-05-31_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_2012-05-31_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Acer_2012-05-31_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 70606b12..00000000 --- a/src/Boot/EFI/siglists/Acer_2012-05-31_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_ABO_2010-12-31_SigList.bin b/src/Boot/EFI/siglists/Acer_ABO_2010-12-31_SigList.bin Binary files differdeleted file mode 100644 index db88eae5..00000000 --- a/src/Boot/EFI/siglists/Acer_ABO_2010-12-31_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_ABO_2010-12-31_SigList_Serialization.bin b/src/Boot/EFI/siglists/Acer_ABO_2010-12-31_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 9fd45eb1..00000000 --- a/src/Boot/EFI/siglists/Acer_ABO_2010-12-31_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_ABO_2010-12-31_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Acer_ABO_2010-12-31_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 1a1da862..00000000 --- a/src/Boot/EFI/siglists/Acer_ABO_2010-12-31_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_Database_2013-07-10_SigList.bin b/src/Boot/EFI/siglists/Acer_Database_2013-07-10_SigList.bin Binary files differdeleted file mode 100644 index 183d0ede..00000000 --- a/src/Boot/EFI/siglists/Acer_Database_2013-07-10_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_Database_2013-07-10_SigList_Serialization.bin b/src/Boot/EFI/siglists/Acer_Database_2013-07-10_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 8f3d3731..00000000 --- a/src/Boot/EFI/siglists/Acer_Database_2013-07-10_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_Database_2013-07-10_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Acer_Database_2013-07-10_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index a7194264..00000000 --- a/src/Boot/EFI/siglists/Acer_Database_2013-07-10_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_DisablePW_2012-12-31_SigList.bin b/src/Boot/EFI/siglists/Acer_DisablePW_2012-12-31_SigList.bin Binary files differdeleted file mode 100644 index 20db064e..00000000 --- a/src/Boot/EFI/siglists/Acer_DisablePW_2012-12-31_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_DisablePW_2012-12-31_SigList_Serialization.bin b/src/Boot/EFI/siglists/Acer_DisablePW_2012-12-31_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 08d03763..00000000 --- a/src/Boot/EFI/siglists/Acer_DisablePW_2012-12-31_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_DisablePW_2012-12-31_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Acer_DisablePW_2012-12-31_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 47acae15..00000000 --- a/src/Boot/EFI/siglists/Acer_DisablePW_2012-12-31_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09-standalone_SigList.bin b/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09-standalone_SigList.bin Binary files differdeleted file mode 100644 index 13c7aeba..00000000 --- a/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09-standalone_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09-standalone_SigList_Serialization.bin b/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09-standalone_SigList_Serialization.bin Binary files differdeleted file mode 100644 index d29d5a07..00000000 --- a/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09-standalone_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09-standalone_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09-standalone_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 48f20f5c..00000000 --- a/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09-standalone_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09_SigList.bin b/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09_SigList.bin Binary files differdeleted file mode 100644 index e991ce3d..00000000 --- a/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09_SigList_Serialization.bin b/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 5eea9573..00000000 --- a/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index ddb47938..00000000 --- a/src/Boot/EFI/siglists/Acer_LINPUS_2012-10-09_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_Quanta_NB4_2012-07-18_SigList.bin b/src/Boot/EFI/siglists/Acer_Quanta_NB4_2012-07-18_SigList.bin Binary files differdeleted file mode 100644 index d535398d..00000000 --- a/src/Boot/EFI/siglists/Acer_Quanta_NB4_2012-07-18_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_Quanta_NB4_2012-07-18_SigList_Serialization.bin b/src/Boot/EFI/siglists/Acer_Quanta_NB4_2012-07-18_SigList_Serialization.bin Binary files differdeleted file mode 100644 index bb76d7c9..00000000 --- a/src/Boot/EFI/siglists/Acer_Quanta_NB4_2012-07-18_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_Quanta_NB4_2012-07-18_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Acer_Quanta_NB4_2012-07-18_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index e862e2c2..00000000 --- a/src/Boot/EFI/siglists/Acer_Quanta_NB4_2012-07-18_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_Wistron_Secure_Flash_2013-05-17_SigList.bin b/src/Boot/EFI/siglists/Acer_Wistron_Secure_Flash_2013-05-17_SigList.bin Binary files differdeleted file mode 100644 index 8b315e76..00000000 --- a/src/Boot/EFI/siglists/Acer_Wistron_Secure_Flash_2013-05-17_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_Wistron_Secure_Flash_2013-05-17_SigList_Serialization.bin b/src/Boot/EFI/siglists/Acer_Wistron_Secure_Flash_2013-05-17_SigList_Serialization.bin Binary files differdeleted file mode 100644 index f6ad4913..00000000 --- a/src/Boot/EFI/siglists/Acer_Wistron_Secure_Flash_2013-05-17_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_Wistron_Secure_Flash_2013-05-17_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Acer_Wistron_Secure_Flash_2013-05-17_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 19e34550..00000000 --- a/src/Boot/EFI/siglists/Acer_Wistron_Secure_Flash_2013-05-17_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_db_Manufacture_2015-06-17_SigList.bin b/src/Boot/EFI/siglists/Acer_db_Manufacture_2015-06-17_SigList.bin Binary files differdeleted file mode 100644 index 5105d7ac..00000000 --- a/src/Boot/EFI/siglists/Acer_db_Manufacture_2015-06-17_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_db_Manufacture_2015-06-17_SigList_Serialization.bin b/src/Boot/EFI/siglists/Acer_db_Manufacture_2015-06-17_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 7b89dba7..00000000 --- a/src/Boot/EFI/siglists/Acer_db_Manufacture_2015-06-17_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Acer_db_Manufacture_2015-06-17_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Acer_db_Manufacture_2015-06-17_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 1c4aa51d..00000000 --- a/src/Boot/EFI/siglists/Acer_db_Manufacture_2015-06-17_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Canonical_Master_CA_2012_04_12_SigList.bin b/src/Boot/EFI/siglists/Canonical_Master_CA_2012_04_12_SigList.bin Binary files differdeleted file mode 100644 index d1709471..00000000 --- a/src/Boot/EFI/siglists/Canonical_Master_CA_2012_04_12_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Canonical_Master_CA_2012_04_12_SigList_Serialization.bin b/src/Boot/EFI/siglists/Canonical_Master_CA_2012_04_12_SigList_Serialization.bin Binary files differdeleted file mode 100644 index addf8ab7..00000000 --- a/src/Boot/EFI/siglists/Canonical_Master_CA_2012_04_12_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Canonical_Master_CA_2012_04_12_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Canonical_Master_CA_2012_04_12_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index dfc53c45..00000000 --- a/src/Boot/EFI/siglists/Canonical_Master_CA_2012_04_12_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/DCS_key_exchange_SigList.bin b/src/Boot/EFI/siglists/DCS_key_exchange_SigList.bin Binary files differdeleted file mode 100644 index 62f5cc6f..00000000 --- a/src/Boot/EFI/siglists/DCS_key_exchange_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/DCS_key_exchange_SigList_Serialization.bin b/src/Boot/EFI/siglists/DCS_key_exchange_SigList_Serialization.bin Binary files differdeleted file mode 100644 index a8c1a91a..00000000 --- a/src/Boot/EFI/siglists/DCS_key_exchange_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/DCS_key_exchange_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/DCS_key_exchange_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 3e3087af..00000000 --- a/src/Boot/EFI/siglists/DCS_key_exchange_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/DCS_platform_SigList.bin b/src/Boot/EFI/siglists/DCS_platform_SigList.bin Binary files differdeleted file mode 100644 index 0b6d7e12..00000000 --- a/src/Boot/EFI/siglists/DCS_platform_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/DCS_platform_SigList_Serialization.bin b/src/Boot/EFI/siglists/DCS_platform_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 18e17e01..00000000 --- a/src/Boot/EFI/siglists/DCS_platform_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/DCS_platform_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/DCS_platform_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 7299f142..00000000 --- a/src/Boot/EFI/siglists/DCS_platform_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/DCS_sign_SigList.bin b/src/Boot/EFI/siglists/DCS_sign_SigList.bin Binary files differdeleted file mode 100644 index 9a3f568b..00000000 --- a/src/Boot/EFI/siglists/DCS_sign_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/DCS_sign_SigList_Serialization.bin b/src/Boot/EFI/siglists/DCS_sign_SigList_Serialization.bin Binary files differdeleted file mode 100644 index c6218bfe..00000000 --- a/src/Boot/EFI/siglists/DCS_sign_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/DCS_sign_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/DCS_sign_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 05d02fdd..00000000 --- a/src/Boot/EFI/siglists/DCS_sign_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Dell_CompalA31CSMB_2012-07-17_SigList.bin b/src/Boot/EFI/siglists/Dell_CompalA31CSMB_2012-07-17_SigList.bin Binary files differdeleted file mode 100644 index 59fbcce0..00000000 --- a/src/Boot/EFI/siglists/Dell_CompalA31CSMB_2012-07-17_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Dell_CompalA31CSMB_2012-07-17_SigList_Serialization.bin b/src/Boot/EFI/siglists/Dell_CompalA31CSMB_2012-07-17_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 0c744996..00000000 --- a/src/Boot/EFI/siglists/Dell_CompalA31CSMB_2012-07-17_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Dell_CompalA31CSMB_2012-07-17_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Dell_CompalA31CSMB_2012-07-17_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index c0b03786..00000000 --- a/src/Boot/EFI/siglists/Dell_CompalA31CSMB_2012-07-17_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Dell_UEFI_DB_2016_06_03_SigList.bin b/src/Boot/EFI/siglists/Dell_UEFI_DB_2016_06_03_SigList.bin Binary files differdeleted file mode 100644 index 80792171..00000000 --- a/src/Boot/EFI/siglists/Dell_UEFI_DB_2016_06_03_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Dell_UEFI_DB_2016_06_03_SigList_Serialization.bin b/src/Boot/EFI/siglists/Dell_UEFI_DB_2016_06_03_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 83b237cb..00000000 --- a/src/Boot/EFI/siglists/Dell_UEFI_DB_2016_06_03_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Dell_UEFI_DB_2016_06_03_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Dell_UEFI_DB_2016_06_03_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index cbea703b..00000000 --- a/src/Boot/EFI/siglists/Dell_UEFI_DB_2016_06_03_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_2013_DB_key_2013_08_23_SigList.bin b/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_2013_DB_key_2013_08_23_SigList.bin Binary files differdeleted file mode 100644 index ff2a46b8..00000000 --- a/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_2013_DB_key_2013_08_23_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_2013_DB_key_2013_08_23_SigList_Serialization.bin b/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_2013_DB_key_2013_08_23_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 7c89478e..00000000 --- a/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_2013_DB_key_2013_08_23_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_2013_DB_key_2013_08_23_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_2013_DB_key_2013_08_23_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index c88b4455..00000000 --- a/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_2013_DB_key_2013_08_23_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_DB_2017_2017-01-20_SigList.bin b/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_DB_2017_2017-01-20_SigList.bin Binary files differdeleted file mode 100644 index 8780d612..00000000 --- a/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_DB_2017_2017-01-20_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_DB_2017_2017-01-20_SigList_Serialization.bin b/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_DB_2017_2017-01-20_SigList_Serialization.bin Binary files differdeleted file mode 100644 index a89606e1..00000000 --- a/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_DB_2017_2017-01-20_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_DB_2017_2017-01-20_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_DB_2017_2017-01-20_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 99fbed79..00000000 --- a/src/Boot/EFI/siglists/HP_UEFI_Secure_Boot_DB_2017_2017-01-20_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_1T110-1415ISK-2016-02-17_SigList.bin b/src/Boot/EFI/siglists/Lenovo_1T110-1415ISK-2016-02-17_SigList.bin Binary files differdeleted file mode 100644 index 6c7b9a15..00000000 --- a/src/Boot/EFI/siglists/Lenovo_1T110-1415ISK-2016-02-17_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_1T110-1415ISK-2016-02-17_SigList_Serialization.bin b/src/Boot/EFI/siglists/Lenovo_1T110-1415ISK-2016-02-17_SigList_Serialization.bin Binary files differdeleted file mode 100644 index d0a52598..00000000 --- a/src/Boot/EFI/siglists/Lenovo_1T110-1415ISK-2016-02-17_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_1T110-1415ISK-2016-02-17_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Lenovo_1T110-1415ISK-2016-02-17_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 0ae7bf84..00000000 --- a/src/Boot/EFI/siglists/Lenovo_1T110-1415ISK-2016-02-17_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_2JYoga910_2015-12-02_SigList.bin b/src/Boot/EFI/siglists/Lenovo_2JYoga910_2015-12-02_SigList.bin Binary files differdeleted file mode 100644 index 87614b53..00000000 --- a/src/Boot/EFI/siglists/Lenovo_2JYoga910_2015-12-02_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_2JYoga910_2015-12-02_SigList_Serialization.bin b/src/Boot/EFI/siglists/Lenovo_2JYoga910_2015-12-02_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 04b6efec..00000000 --- a/src/Boot/EFI/siglists/Lenovo_2JYoga910_2015-12-02_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_2JYoga910_2015-12-02_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Lenovo_2JYoga910_2015-12-02_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index ee782e46..00000000 --- a/src/Boot/EFI/siglists/Lenovo_2JYoga910_2015-12-02_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_4MYoga720-15IKB_2016-11-09_SigList.bin b/src/Boot/EFI/siglists/Lenovo_4MYoga720-15IKB_2016-11-09_SigList.bin Binary files differdeleted file mode 100644 index e2afe35b..00000000 --- a/src/Boot/EFI/siglists/Lenovo_4MYoga720-15IKB_2016-11-09_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_4MYoga720-15IKB_2016-11-09_SigList_Serialization.bin b/src/Boot/EFI/siglists/Lenovo_4MYoga720-15IKB_2016-11-09_SigList_Serialization.bin Binary files differdeleted file mode 100644 index fbf3a922..00000000 --- a/src/Boot/EFI/siglists/Lenovo_4MYoga720-15IKB_2016-11-09_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_4MYoga720-15IKB_2016-11-09_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Lenovo_4MYoga720-15IKB_2016-11-09_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 3b2129a3..00000000 --- a/src/Boot/EFI/siglists/Lenovo_4MYoga720-15IKB_2016-11-09_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_DCU31-80E31-80_2015-03-03_SigList.bin b/src/Boot/EFI/siglists/Lenovo_DCU31-80E31-80_2015-03-03_SigList.bin Binary files differdeleted file mode 100644 index 5b8b6293..00000000 --- a/src/Boot/EFI/siglists/Lenovo_DCU31-80E31-80_2015-03-03_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_DCU31-80E31-80_2015-03-03_SigList_Serialization.bin b/src/Boot/EFI/siglists/Lenovo_DCU31-80E31-80_2015-03-03_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 526838b9..00000000 --- a/src/Boot/EFI/siglists/Lenovo_DCU31-80E31-80_2015-03-03_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_DCU31-80E31-80_2015-03-03_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Lenovo_DCU31-80E31-80_2015-03-03_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 7bc4fa92..00000000 --- a/src/Boot/EFI/siglists/Lenovo_DCU31-80E31-80_2015-03-03_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_LCFC_2015-05-29_SigList.bin b/src/Boot/EFI/siglists/Lenovo_LCFC_2015-05-29_SigList.bin Binary files differdeleted file mode 100644 index 30d793b8..00000000 --- a/src/Boot/EFI/siglists/Lenovo_LCFC_2015-05-29_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_LCFC_2015-05-29_SigList_Serialization.bin b/src/Boot/EFI/siglists/Lenovo_LCFC_2015-05-29_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 2335a89c..00000000 --- a/src/Boot/EFI/siglists/Lenovo_LCFC_2015-05-29_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_LCFC_2015-05-29_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Lenovo_LCFC_2015-05-29_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index c4aadff1..00000000 --- a/src/Boot/EFI/siglists/Lenovo_LCFC_2015-05-29_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_Mocca_2012-06-20_SigList.bin b/src/Boot/EFI/siglists/Lenovo_Mocca_2012-06-20_SigList.bin Binary files differdeleted file mode 100644 index 9443b4bc..00000000 --- a/src/Boot/EFI/siglists/Lenovo_Mocca_2012-06-20_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_Mocca_2012-06-20_SigList_Serialization.bin b/src/Boot/EFI/siglists/Lenovo_Mocca_2012-06-20_SigList_Serialization.bin Binary files differdeleted file mode 100644 index f9748e05..00000000 --- a/src/Boot/EFI/siglists/Lenovo_Mocca_2012-06-20_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_Mocca_2012-06-20_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Lenovo_Mocca_2012-06-20_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index c5e9aeb4..00000000 --- a/src/Boot/EFI/siglists/Lenovo_Mocca_2012-06-20_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_ThinkPad_Product_CA_2012-06-29_SigList.bin b/src/Boot/EFI/siglists/Lenovo_ThinkPad_Product_CA_2012-06-29_SigList.bin Binary files differdeleted file mode 100644 index b29b3a1c..00000000 --- a/src/Boot/EFI/siglists/Lenovo_ThinkPad_Product_CA_2012-06-29_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_ThinkPad_Product_CA_2012-06-29_SigList_Serialization.bin b/src/Boot/EFI/siglists/Lenovo_ThinkPad_Product_CA_2012-06-29_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 397558ab..00000000 --- a/src/Boot/EFI/siglists/Lenovo_ThinkPad_Product_CA_2012-06-29_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_ThinkPad_Product_CA_2012-06-29_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Lenovo_ThinkPad_Product_CA_2012-06-29_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 58a7f0ac..00000000 --- a/src/Boot/EFI/siglists/Lenovo_ThinkPad_Product_CA_2012-06-29_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_UEFI_CA_2014-01-24_SigList.bin b/src/Boot/EFI/siglists/Lenovo_UEFI_CA_2014-01-24_SigList.bin Binary files differdeleted file mode 100644 index eb93739f..00000000 --- a/src/Boot/EFI/siglists/Lenovo_UEFI_CA_2014-01-24_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_UEFI_CA_2014-01-24_SigList_Serialization.bin b/src/Boot/EFI/siglists/Lenovo_UEFI_CA_2014-01-24_SigList_Serialization.bin Binary files differdeleted file mode 100644 index ec5325a3..00000000 --- a/src/Boot/EFI/siglists/Lenovo_UEFI_CA_2014-01-24_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Lenovo_UEFI_CA_2014-01-24_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Lenovo_UEFI_CA_2014-01-24_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index d73db141..00000000 --- a/src/Boot/EFI/siglists/Lenovo_UEFI_CA_2014-01-24_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/MSI_SHIP_OWN_CA_2012-06-09_SigList.bin b/src/Boot/EFI/siglists/MSI_SHIP_OWN_CA_2012-06-09_SigList.bin Binary files differdeleted file mode 100644 index 5ddec7d3..00000000 --- a/src/Boot/EFI/siglists/MSI_SHIP_OWN_CA_2012-06-09_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/MSI_SHIP_OWN_CA_2012-06-09_SigList_Serialization.bin b/src/Boot/EFI/siglists/MSI_SHIP_OWN_CA_2012-06-09_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 983b55e4..00000000 --- a/src/Boot/EFI/siglists/MSI_SHIP_OWN_CA_2012-06-09_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/MSI_SHIP_OWN_CA_2012-06-09_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/MSI_SHIP_OWN_CA_2012-06-09_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index eeccfedd..00000000 --- a/src/Boot/EFI/siglists/MSI_SHIP_OWN_CA_2012-06-09_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/MicCorUEFCA2011_2011-06-27_SigList.bin b/src/Boot/EFI/siglists/MicCorUEFCA2011_2011-06-27_SigList.bin Binary files differdeleted file mode 100644 index 37325b00..00000000 --- a/src/Boot/EFI/siglists/MicCorUEFCA2011_2011-06-27_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/MicCorUEFCA2011_2011-06-27_SigList_Serialization.bin b/src/Boot/EFI/siglists/MicCorUEFCA2011_2011-06-27_SigList_Serialization.bin Binary files differdeleted file mode 100644 index ab778bf3..00000000 --- a/src/Boot/EFI/siglists/MicCorUEFCA2011_2011-06-27_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/MicCorUEFCA2011_2011-06-27_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/MicCorUEFCA2011_2011-06-27_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 08747267..00000000 --- a/src/Boot/EFI/siglists/MicCorUEFCA2011_2011-06-27_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/MicWinProPCA2011_2011-10-19_SigList.bin b/src/Boot/EFI/siglists/MicWinProPCA2011_2011-10-19_SigList.bin Binary files differdeleted file mode 100644 index 58cb0a1b..00000000 --- a/src/Boot/EFI/siglists/MicWinProPCA2011_2011-10-19_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/MicWinProPCA2011_2011-10-19_SigList_Serialization.bin b/src/Boot/EFI/siglists/MicWinProPCA2011_2011-10-19_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 11a0b3e1..00000000 --- a/src/Boot/EFI/siglists/MicWinProPCA2011_2011-10-19_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/MicWinProPCA2011_2011-10-19_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/MicWinProPCA2011_2011-10-19_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 17561bf7..00000000 --- a/src/Boot/EFI/siglists/MicWinProPCA2011_2011-10-19_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/OriginPC_OWN_CA_2018-01-09_SigList.bin b/src/Boot/EFI/siglists/OriginPC_OWN_CA_2018-01-09_SigList.bin Binary files differdeleted file mode 100644 index 81a82adb..00000000 --- a/src/Boot/EFI/siglists/OriginPC_OWN_CA_2018-01-09_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/OriginPC_OWN_CA_2018-01-09_SigList_Serialization.bin b/src/Boot/EFI/siglists/OriginPC_OWN_CA_2018-01-09_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 8294bfc7..00000000 --- a/src/Boot/EFI/siglists/OriginPC_OWN_CA_2018-01-09_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/OriginPC_OWN_CA_2018-01-09_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/OriginPC_OWN_CA_2018-01-09_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 1632b020..00000000 --- a/src/Boot/EFI/siglists/OriginPC_OWN_CA_2018-01-09_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Panasonic_Corporation_db_CA_2013-03-31_SigList.bin b/src/Boot/EFI/siglists/Panasonic_Corporation_db_CA_2013-03-31_SigList.bin Binary files differdeleted file mode 100644 index 70a3321b..00000000 --- a/src/Boot/EFI/siglists/Panasonic_Corporation_db_CA_2013-03-31_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Panasonic_Corporation_db_CA_2013-03-31_SigList_Serialization.bin b/src/Boot/EFI/siglists/Panasonic_Corporation_db_CA_2013-03-31_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 64c1cc7e..00000000 --- a/src/Boot/EFI/siglists/Panasonic_Corporation_db_CA_2013-03-31_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Panasonic_Corporation_db_CA_2013-03-31_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Panasonic_Corporation_db_CA_2013-03-31_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 6527a836..00000000 --- a/src/Boot/EFI/siglists/Panasonic_Corporation_db_CA_2013-03-31_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Samsung_SEC_PRODUCTION_KeyUEFI_2012-07-05_SigList.bin b/src/Boot/EFI/siglists/Samsung_SEC_PRODUCTION_KeyUEFI_2012-07-05_SigList.bin Binary files differdeleted file mode 100644 index f5ebfabb..00000000 --- a/src/Boot/EFI/siglists/Samsung_SEC_PRODUCTION_KeyUEFI_2012-07-05_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Samsung_SEC_PRODUCTION_KeyUEFI_2012-07-05_SigList_Serialization.bin b/src/Boot/EFI/siglists/Samsung_SEC_PRODUCTION_KeyUEFI_2012-07-05_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 802ea0d5..00000000 --- a/src/Boot/EFI/siglists/Samsung_SEC_PRODUCTION_KeyUEFI_2012-07-05_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Samsung_SEC_PRODUCTION_KeyUEFI_2012-07-05_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Samsung_SEC_PRODUCTION_KeyUEFI_2012-07-05_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index b6a7d176..00000000 --- a/src/Boot/EFI/siglists/Samsung_SEC_PRODUCTION_KeyUEFI_2012-07-05_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Toshiba_Corporation_Utility_CA_2012-08-10_SigList.bin b/src/Boot/EFI/siglists/Toshiba_Corporation_Utility_CA_2012-08-10_SigList.bin Binary files differdeleted file mode 100644 index b476fc75..00000000 --- a/src/Boot/EFI/siglists/Toshiba_Corporation_Utility_CA_2012-08-10_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Toshiba_Corporation_Utility_CA_2012-08-10_SigList_Serialization.bin b/src/Boot/EFI/siglists/Toshiba_Corporation_Utility_CA_2012-08-10_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 017e05c8..00000000 --- a/src/Boot/EFI/siglists/Toshiba_Corporation_Utility_CA_2012-08-10_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Toshiba_Corporation_Utility_CA_2012-08-10_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Toshiba_Corporation_Utility_CA_2012-08-10_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 2fb61bbe..00000000 --- a/src/Boot/EFI/siglists/Toshiba_Corporation_Utility_CA_2012-08-10_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Toshiba_QCI_2012-07-24_SigList.bin b/src/Boot/EFI/siglists/Toshiba_QCI_2012-07-24_SigList.bin Binary files differdeleted file mode 100644 index e6ab7669..00000000 --- a/src/Boot/EFI/siglists/Toshiba_QCI_2012-07-24_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Toshiba_QCI_2012-07-24_SigList_Serialization.bin b/src/Boot/EFI/siglists/Toshiba_QCI_2012-07-24_SigList_Serialization.bin Binary files differdeleted file mode 100644 index b98e9385..00000000 --- a/src/Boot/EFI/siglists/Toshiba_QCI_2012-07-24_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Toshiba_QCI_2012-07-24_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Toshiba_QCI_2012-07-24_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 959d1439..00000000 --- a/src/Boot/EFI/siglists/Toshiba_QCI_2012-07-24_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/Toshiba_QCI_Shell_2012-07-24_SigList.bin b/src/Boot/EFI/siglists/Toshiba_QCI_Shell_2012-07-24_SigList.bin Binary files differdeleted file mode 100644 index d9c4dfb7..00000000 --- a/src/Boot/EFI/siglists/Toshiba_QCI_Shell_2012-07-24_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Toshiba_QCI_Shell_2012-07-24_SigList_Serialization.bin b/src/Boot/EFI/siglists/Toshiba_QCI_Shell_2012-07-24_SigList_Serialization.bin Binary files differdeleted file mode 100644 index 8792188b..00000000 --- a/src/Boot/EFI/siglists/Toshiba_QCI_Shell_2012-07-24_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/Toshiba_QCI_Shell_2012-07-24_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/Toshiba_QCI_Shell_2012-07-24_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index bf988060..00000000 --- a/src/Boot/EFI/siglists/Toshiba_QCI_Shell_2012-07-24_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/EFI/siglists/dbx_list_SigList.bin b/src/Boot/EFI/siglists/dbx_list_SigList.bin Binary files differdeleted file mode 100644 index 8c3cf6da..00000000 --- a/src/Boot/EFI/siglists/dbx_list_SigList.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/dbx_list_SigList_Serialization.bin b/src/Boot/EFI/siglists/dbx_list_SigList_Serialization.bin Binary files differdeleted file mode 100644 index fffa8b19..00000000 --- a/src/Boot/EFI/siglists/dbx_list_SigList_Serialization.bin +++ /dev/null diff --git a/src/Boot/EFI/siglists/dbx_list_SigList_Serialization.bin.p7 b/src/Boot/EFI/siglists/dbx_list_SigList_Serialization.bin.p7 Binary files differdeleted file mode 100644 index 1ee3110e..00000000 --- a/src/Boot/EFI/siglists/dbx_list_SigList_Serialization.bin.p7 +++ /dev/null diff --git a/src/Boot/Windows/Bios.h b/src/Boot/Windows/Bios.h index 4e1cec59..0282fad7 100644 --- a/src/Boot/Windows/Bios.h +++ b/src/Boot/Windows/Bios.h @@ -24,9 +24,10 @@ enum { BiosResultSuccess = 0x00, - BiosResultInvalidFunction = 0x01 + BiosResultInvalidFunction = 0x01, + BiosResultTimeout = 0x80 }; -typedef byte BiosResult; +typedef uint8 BiosResult; #endif // TC_HEADER_Boot_Bios 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/BootCommon.h b/src/Boot/Windows/BootCommon.h index 6de6ca6e..45a1a650 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 @@ -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 0x0122 +#define TC_RESCUE_DISK_UPGRADE_NOTICE_MAX_VERSION 0x0125 #define TC_BOOT_LOADER_AREA_SIZE (TC_BOOT_LOADER_AREA_SECTOR_COUNT * TC_SECTOR_SIZE_BIOS) @@ -43,7 +43,7 @@ typedef struct { - byte Flags; + uint8 Flags; } BootSectorConfiguration; @@ -58,7 +58,7 @@ typedef struct uint16 CryptoInfoOffset; uint16 CryptoInfoLength; uint32 HeaderSaltCrc32; - Password BootPassword; + PasswordLegacy BootPassword; uint64 HiddenSystemPartitionStart; uint64 DecoySystemPartitionStart; uint32 Flags; @@ -120,7 +120,7 @@ typedef struct { uint32 Data1; uint16 Data2; uint16 Data3; - byte Data4[8]; + uint8 Data4[8]; } DCS_GUID; // DE types @@ -155,7 +155,7 @@ typedef struct _DCS_DISK_ENTRY { struct { uint32 Type; uint32 Offset; - byte reserved[16]; + uint8 reserved[16]; uint64 Length; // size of structure at Offset }; DCS_DISK_ENTRY_SECTORS Sectors; @@ -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 @@ -206,9 +206,9 @@ typedef struct _DCS_DEP_PWD_CACHE { uint64 Sign; uint32 CRC; uint32 Count; - Password Pwd[4]; + PasswordLegacy Pwd[4]; int32 Pim[4]; - byte pad[512 - 8 - 4 - 4 - (sizeof(Password) + 4) * 4]; + uint8 pad[512 - 8 - 4 - 4 - (sizeof(PasswordLegacy) + 4) * 4]; } DCS_DEP_PWD_CACHE; CSTATIC_ASSERT(sizeof(DCS_DEP_PWD_CACHE) == 512, Wrong_size_DCS_DEP_PWD_CACHE); #pragma pack() diff --git a/src/Boot/Windows/BootConfig.cpp b/src/Boot/Windows/BootConfig.cpp index 6b28794d..948dfd93 100644 --- a/src/Boot/Windows/BootConfig.cpp +++ b/src/Boot/Windows/BootConfig.cpp @@ -12,10 +12,10 @@ #include "BootConfig.h" -byte BootSectorFlags; +uint8 BootSectorFlags; -byte BootLoaderDrive; -byte BootDrive; +uint8 BootLoaderDrive; +uint8 BootDrive; bool BootDriveGeometryValid = false; bool PreventNormalSystemBoot = false; bool PreventBootMenu = false; @@ -39,7 +39,7 @@ uint64 HiddenVolumeStartSector; void ReadBootSectorUserConfiguration () { - byte userConfig; + uint8 userConfig; AcquireSectorBuffer(); @@ -83,16 +83,31 @@ ret: } -BiosResult UpdateBootSectorConfiguration (byte drive) +BiosResult UpdateBootSectorConfiguration (uint8 drive) { - AcquireSectorBuffer(); + uint64 mbrSector; + mbrSector.HighPart = 0; + mbrSector.LowPart = 0; + AcquireSectorBuffer(); +/* BiosResult result = ReadWriteMBR (false, drive); if (result != BiosResultSuccess) goto ret; SectorBuffer[TC_BOOT_SECTOR_CONFIG_OFFSET] = BootSectorFlags; result = ReadWriteMBR (true, drive); +*/ + + BiosResult result = ReadWriteSectors (false, TC_BOOT_LOADER_BUFFER_SEGMENT, 0, drive, mbrSector, 8, false); + if (result != BiosResultSuccess) + goto ret; + + CopyMemory (TC_BOOT_LOADER_BUFFER_SEGMENT, 0, SectorBuffer, TC_LB_SIZE); + SectorBuffer[TC_BOOT_SECTOR_CONFIG_OFFSET] = BootSectorFlags; + CopyMemory (SectorBuffer, TC_BOOT_LOADER_BUFFER_SEGMENT,0, TC_LB_SIZE); + + result = ReadWriteSectors (true, TC_BOOT_LOADER_BUFFER_SEGMENT, 0, drive, mbrSector, 8, false); ret: ReleaseSectorBuffer(); diff --git a/src/Boot/Windows/BootConfig.h b/src/Boot/Windows/BootConfig.h index b66dc233..5338109f 100644 --- a/src/Boot/Windows/BootConfig.h +++ b/src/Boot/Windows/BootConfig.h @@ -17,10 +17,10 @@ #include "Platform.h" #include "BootDiskIo.h" -extern byte BootSectorFlags; +extern uint8 BootSectorFlags; -extern byte BootLoaderDrive; -extern byte BootDrive; +extern uint8 BootLoaderDrive; +extern uint8 BootDrive; extern bool BootDriveGeometryValid; extern DriveGeometry BootDriveGeometry; extern bool PreventNormalSystemBoot; @@ -41,6 +41,6 @@ extern uint64 HiddenVolumeStartSector; void ReadBootSectorUserConfiguration (); -BiosResult UpdateBootSectorConfiguration (byte drive); +BiosResult UpdateBootSectorConfiguration (uint8 drive); #endif // TC_HEADER_Boot_BootConfig diff --git a/src/Boot/Windows/BootConsoleIo.cpp b/src/Boot/Windows/BootConsoleIo.cpp index 9148f5c9..046f580b 100644 --- a/src/Boot/Windows/BootConsoleIo.cpp +++ b/src/Boot/Windows/BootConsoleIo.cpp @@ -101,7 +101,7 @@ void Print (const uint64 &number) } -void PrintHex (byte b) +void PrintHex (uint8 b) { PrintChar (((b >> 4) >= 0xA ? 'A' - 0xA : '0') + (b >> 4)); PrintChar (((b & 0xF) >= 0xA ? 'A' - 0xA : '0') + (b & 0xF)); @@ -110,8 +110,8 @@ void PrintHex (byte b) void PrintHex (uint16 data) { - PrintHex (byte (data >> 8)); - PrintHex (byte (data)); + PrintHex (uint8 (data >> 8)); + PrintHex (uint8 (data)); } @@ -219,9 +219,9 @@ void PrintErrorNoEndl (const char *message) } -byte GetShiftFlags () +uint8 GetShiftFlags () { - byte flags; + uint8 flags; __asm { mov ah, 2 @@ -233,7 +233,7 @@ byte GetShiftFlags () } -byte GetKeyboardChar () +uint8 GetKeyboardChar () { return GetKeyboardChar (nullptr); } @@ -253,20 +253,20 @@ inline void Sleep () } */ -byte GetKeyboardChar (byte *scanCode) +uint8 GetKeyboardChar (uint8 *scanCode) { // Work around potential BIOS bugs (Windows boot manager polls the keystroke buffer) while (!IsKeyboardCharAvailable()) { // reduce CPU usage by halting CPU until the next external interrupt is fired __asm - { + { hlt } } - byte asciiCode; - byte scan; + uint8 asciiCode; + uint8 scan; __asm { mov ah, 0 @@ -302,7 +302,7 @@ bool EscKeyPressed () { if (IsKeyboardCharAvailable ()) { - byte keyScanCode; + uint8 keyScanCode; GetKeyboardChar (&keyScanCode); return keyScanCode == TC_BIOS_KEY_ESC; } @@ -346,8 +346,8 @@ bool IsDigit (char c) int GetString (char *buffer, size_t bufferSize) { - byte c; - byte scanCode; + uint8 c; + uint8 scanCode; size_t pos = 0; while (pos < bufferSize) diff --git a/src/Boot/Windows/BootConsoleIo.h b/src/Boot/Windows/BootConsoleIo.h index 349782eb..cf10d2c6 100644 --- a/src/Boot/Windows/BootConsoleIo.h +++ b/src/Boot/Windows/BootConsoleIo.h @@ -45,9 +45,9 @@ void ClearScreen (); void DisableScreenOutput (); void EnableScreenOutput (); bool EscKeyPressed (); -byte GetKeyboardChar (); -byte GetKeyboardChar (byte *scanCode); -byte GetShiftFlags (); +uint8 GetKeyboardChar (); +uint8 GetKeyboardChar (uint8 *scanCode); +uint8 GetShiftFlags (); int GetString (char *buffer, size_t bufferSize); void InitVideoMode (); bool IsKeyboardCharAvailable (); @@ -64,7 +64,7 @@ void PrintEndl (int cnt); void PrintRepeatedChar (char c, int n); void PrintError (const char *message); void PrintErrorNoEndl (const char *message); -void PrintHex (byte b); +void PrintHex (uint8 b); void PrintHex (uint16 data); void PrintHex (uint32 data); void PrintHex (const uint64 &data); diff --git a/src/Boot/Windows/BootDebug.cpp b/src/Boot/Windows/BootDebug.cpp index bea063c1..b490f5e8 100644 --- a/src/Boot/Windows/BootDebug.cpp +++ b/src/Boot/Windows/BootDebug.cpp @@ -34,7 +34,7 @@ void InitDebugPort () } -void WriteDebugPort (byte dataByte) +void WriteDebugPort (uint8 dataByte) { __asm { @@ -82,7 +82,7 @@ void PrintVal (const char *message, const uint64 &value, bool newLine, bool hex) } -void PrintHexDump (byte *mem, size_t size, uint16 *memSegment) +void PrintHexDump (uint8 *mem, size_t size, uint16 *memSegment) { const size_t width = 16; for (size_t pos = 0; pos < size; ) @@ -92,7 +92,7 @@ void PrintHexDump (byte *mem, size_t size, uint16 *memSegment) size_t i; for (i = 0; i < width && pos < size; ++i) { - byte dataByte; + uint8 dataByte; if (memSegment) { __asm @@ -134,7 +134,7 @@ void PrintHexDump (byte *mem, size_t size, uint16 *memSegment) void PrintHexDump (uint16 memSegment, uint16 memOffset, size_t size) { - PrintHexDump ((byte *) memOffset, size, &memSegment); + PrintHexDump ((uint8 *) memOffset, size, &memSegment); } #endif // TC_BOOT_DEBUG_ENABLED diff --git a/src/Boot/Windows/BootDebug.h b/src/Boot/Windows/BootDebug.h index f94ab900..35fce41f 100644 --- a/src/Boot/Windows/BootDebug.h +++ b/src/Boot/Windows/BootDebug.h @@ -51,8 +51,8 @@ void InitDebugPort (); void InitStackChecker (); -void WriteDebugPort (byte dataByte); -void PrintHexDump (byte *mem, size_t size, uint16 *memSegment = nullptr); +void WriteDebugPort (uint8 dataByte); +void PrintHexDump (uint8 *mem, size_t size, uint16 *memSegment = nullptr); void PrintHexDump (uint16 memSegment, uint16 memOffset, size_t size); void PrintVal (const char *message, const uint32 value, bool newLine = true, bool hex = false); void PrintVal (const char *message, const uint64 &value, bool newLine = true, bool hex = false); diff --git a/src/Boot/Windows/BootDefs.h b/src/Boot/Windows/BootDefs.h index cd4b2263..3d65f0a0 100644 --- a/src/Boot/Windows/BootDefs.h +++ b/src/Boot/Windows/BootDefs.h @@ -205,6 +205,7 @@ TC_HIDDEN_OS_CREATION_PHASE_WIPED = TC__HIDDEN_OS_CREATION_PHASE_WIPED 0x100000, 0x200000, 0x300000, 0x400000, 0x500000, 0x600000, 0x700000, 0x800000, \ 0x900000, 0xA00000, 0xB00000, 0xC00000, 0xD00000, 0xE00000, 0xF00000, 0x1000000 -#define EFI_BOOTARGS_REGIONS EFI_BOOTARGS_REGIONS_LOW, EFI_BOOTARGS_REGIONS_HIGH +#define EFI_BOOTARGS_REGIONS_DEFAULT EFI_BOOTARGS_REGIONS_LOW, EFI_BOOTARGS_REGIONS_HIGH +#define EFI_BOOTARGS_REGIONS_EFI EFI_BOOTARGS_REGIONS_HIGH, EFI_BOOTARGS_REGIONS_LOW #endif // TC_HEADER_Boot_BootDefs diff --git a/src/Boot/Windows/BootDiskIo.cpp b/src/Boot/Windows/BootDiskIo.cpp index ea808dd4..ddd00e1c 100644 --- a/src/Boot/Windows/BootDiskIo.cpp +++ b/src/Boot/Windows/BootDiskIo.cpp @@ -19,7 +19,7 @@ #include "BootStrings.h" -byte SectorBuffer[TC_LB_SIZE]; +uint8 SectorBuffer[TC_LB_SIZE]; #ifdef TC_BOOT_DEBUG_ENABLED static bool SectorBufferInUse = false; @@ -41,9 +41,9 @@ void ReleaseSectorBuffer () #endif -bool IsLbaSupported (byte drive) +bool IsLbaSupported (uint8 drive) { - static byte CachedDrive = TC_INVALID_BIOS_DRIVE; + static uint8 CachedDrive = TC_INVALID_BIOS_DRIVE; static bool CachedStatus; uint16 result = 0; @@ -68,7 +68,7 @@ ret: } -void PrintDiskError (BiosResult error, bool write, byte drive, const uint64 *sector, const ChsAddress *chs) +void PrintDiskError (BiosResult error, bool write, uint8 drive, const uint64 *sector, const ChsAddress *chs) { PrintEndl(); Print (write ? "Write" : "Read"); Print (" error:"); @@ -105,21 +105,21 @@ void Print (const ChsAddress &chs) void PrintSectorCountInMB (const uint64 §orCount) { - Print (sectorCount >> (TC_LB_SIZE_BIT_SHIFT_DIVISOR + 2)); Print (" MB "); + Print (sectorCount >> (TC_LB_SIZE_BIT_SHIFT_DIVISOR + 2)); Print (" MiB "); } -BiosResult ReadWriteSectors (bool write, uint16 bufferSegment, uint16 bufferOffset, byte drive, const ChsAddress &chs, byte sectorCount, bool silent) +BiosResult ReadWriteSectors (bool write, uint16 bufferSegment, uint16 bufferOffset, uint8 drive, const ChsAddress &chs, uint8 sectorCount, bool silent) { CheckStack(); - byte cylinderLow = (byte) chs.Cylinder; - byte sector = chs.Sector; - sector |= byte (chs.Cylinder >> 2) & 0xc0; - byte function = write ? 0x03 : 0x02; + uint8 cylinderLow = (uint8) chs.Cylinder; + uint8 sector = chs.Sector; + sector |= uint8 (chs.Cylinder >> 2) & 0xc0; + uint8 function = write ? 0x03 : 0x02; BiosResult result; - byte tryCount = TC_MAX_BIOS_DISK_IO_RETRIES; + uint8 tryCount = TC_MAX_BIOS_DISK_IO_RETRIES; do { @@ -159,20 +159,20 @@ BiosResult ReadWriteSectors (bool write, uint16 bufferSegment, uint16 bufferOffs #ifdef TC_WINDOWS_BOOT_RESCUE_DISK_MODE -BiosResult ReadWriteSectors (bool write, byte *buffer, byte drive, const ChsAddress &chs, byte sectorCount, bool silent) +BiosResult ReadWriteSectors (bool write, uint8 *buffer, uint8 drive, const ChsAddress &chs, uint8 sectorCount, bool silent) { uint16 codeSeg; __asm mov codeSeg, cs return ReadWriteSectors (write, codeSeg, (uint16) buffer, drive, chs, sectorCount, silent); } -BiosResult ReadSectors (byte *buffer, byte drive, const ChsAddress &chs, byte sectorCount, bool silent) +BiosResult ReadSectors (uint8 *buffer, uint8 drive, const ChsAddress &chs, uint8 sectorCount, bool silent) { return ReadWriteSectors (false, buffer, drive, chs, sectorCount, silent); } #if 0 -BiosResult WriteSectors (byte *buffer, byte drive, const ChsAddress &chs, byte sectorCount, bool silent) +BiosResult WriteSectors (uint8 *buffer, uint8 drive, const ChsAddress &chs, uint8 sectorCount, bool silent) { return ReadWriteSectors (true, buffer, drive, chs, sectorCount, silent); } @@ -180,7 +180,7 @@ BiosResult WriteSectors (byte *buffer, byte drive, const ChsAddress &chs, byte s #endif -static BiosResult ReadWriteSectors (bool write, BiosLbaPacket &dapPacket, byte drive, const uint64 §or, uint16 sectorCount, bool silent) +static BiosResult ReadWriteSectors (bool write, BiosLbaPacket &dapPacket, uint8 drive, const uint64 §or, uint16 sectorCount, bool silent) { CheckStack(); @@ -202,10 +202,10 @@ static BiosResult ReadWriteSectors (bool write, BiosLbaPacket &dapPacket, byte d dapPacket.SectorCount = sectorCount; dapPacket.Sector = sector; - byte function = write ? 0x43 : 0x42; + uint8 function = write ? 0x43 : 0x42; BiosResult result; - byte tryCount = TC_MAX_BIOS_DISK_IO_RETRIES; + uint8 tryCount = TC_MAX_BIOS_DISK_IO_RETRIES; do { @@ -237,7 +237,7 @@ static BiosResult ReadWriteSectors (bool write, BiosLbaPacket &dapPacket, byte d } -static BiosResult ReadWriteSectors (bool write, byte *buffer, byte drive, const uint64 §or, uint16 sectorCount, bool silent) +BiosResult ReadWriteSectors (bool write, uint8 *buffer, uint8 drive, const uint64 §or, uint16 sectorCount, bool silent) { BiosLbaPacket dapPacket; dapPacket.Buffer = (uint32) buffer; @@ -245,20 +245,20 @@ static BiosResult ReadWriteSectors (bool write, byte *buffer, byte drive, const } -BiosResult ReadWriteSectors (bool write, uint16 bufferSegment, uint16 bufferOffset, byte drive, const uint64 §or, uint16 sectorCount, bool silent) +BiosResult ReadWriteSectors (bool write, uint16 bufferSegment, uint16 bufferOffset, uint8 drive, const uint64 §or, uint16 sectorCount, bool silent) { BiosLbaPacket dapPacket; dapPacket.Buffer = ((uint32) bufferSegment << 16) | bufferOffset; return ReadWriteSectors (write, dapPacket, drive, sector, sectorCount, silent); } -BiosResult ReadSectors (uint16 bufferSegment, uint16 bufferOffset, byte drive, const uint64 §or, uint16 sectorCount, bool silent) +BiosResult ReadSectors (uint16 bufferSegment, uint16 bufferOffset, uint8 drive, const uint64 §or, uint16 sectorCount, bool silent) { return ReadWriteSectors (false, bufferSegment, bufferOffset, drive, sector, sectorCount, silent); } -BiosResult ReadSectors (byte *buffer, byte drive, const uint64 §or, uint16 sectorCount, bool silent) +BiosResult ReadSectors (uint8 *buffer, uint8 drive, const uint64 §or, uint16 sectorCount, bool silent) { BiosResult result; uint16 codeSeg; @@ -274,17 +274,17 @@ BiosResult ReadSectors (byte *buffer, byte drive, const uint64 §or, uint16 s } -BiosResult WriteSectors (byte *buffer, byte drive, const uint64 §or, uint16 sectorCount, bool silent) +BiosResult WriteSectors (uint8 *buffer, uint8 drive, const uint64 §or, uint16 sectorCount, bool silent) { return ReadWriteSectors (true, buffer, drive, sector, sectorCount, silent); } -BiosResult GetDriveGeometry (byte drive, DriveGeometry &geometry, bool silent) +BiosResult GetDriveGeometry (uint8 drive, DriveGeometry &geometry, bool silent) { CheckStack(); - byte maxCylinderLow, maxHead, maxSector; + uint8 maxCylinderLow, maxHead, maxSector; BiosResult result; __asm { @@ -329,9 +329,9 @@ void ChsToLba (const DriveGeometry &geometry, const ChsAddress &chs, uint64 &lba void LbaToChs (const DriveGeometry &geometry, const uint64 &lba, ChsAddress &chs) { - chs.Sector = (byte) ((lba.LowPart % geometry.Sectors) + 1); + chs.Sector = (uint8) ((lba.LowPart % geometry.Sectors) + 1); uint32 ch = lba.LowPart / geometry.Sectors; - chs.Head = (byte) (ch % geometry.Heads); + chs.Head = (uint8) (ch % geometry.Heads); chs.Cylinder = (uint16) (ch / geometry.Heads); } @@ -349,7 +349,7 @@ void PartitionEntryMBRToPartition (const PartitionEntryMBR &partEntry, Partition } -BiosResult ReadWriteMBR (bool write, byte drive, bool silent) +BiosResult ReadWriteMBR (bool write, uint8 drive, bool silent) { uint64 mbrSector; mbrSector.HighPart = 0; @@ -362,7 +362,7 @@ BiosResult ReadWriteMBR (bool write, byte drive, bool silent) } -BiosResult GetDrivePartitions (byte drive, Partition *partitionArray, size_t partitionArrayCapacity, size_t &partitionCount, bool activeOnly, Partition *findPartitionFollowingThis, bool silent) +BiosResult GetDrivePartitions (uint8 drive, Partition *partitionArray, size_t partitionArrayCapacity, size_t &partitionCount, bool activeOnly, Partition *findPartitionFollowingThis, bool silent) { Partition *followingPartition; Partition tmpPartition; @@ -419,7 +419,7 @@ BiosResult GetDrivePartitions (byte drive, Partition *partitionArray, size_t par MBR *extMbr = (MBR *) SectorBuffer; while (partitionArrayPos < partitionArrayCapacity && - (result = ReadSectors ((byte *) extMbr, drive, extStartLBA, 1, silent)) == BiosResultSuccess + (result = ReadSectors ((uint8 *) extMbr, drive, extStartLBA, 1, silent)) == BiosResultSuccess && extMbr->Signature == 0xaa55) { if (extMbr->Partitions[0].SectorCountLBA > 0) @@ -478,7 +478,7 @@ BiosResult GetDrivePartitions (byte drive, Partition *partitionArray, size_t par } -bool GetActivePartition (byte drive) +bool GetActivePartition (uint8 drive) { size_t partCount; diff --git a/src/Boot/Windows/BootDiskIo.h b/src/Boot/Windows/BootDiskIo.h index d4e8cf04..0b92aa29 100644 --- a/src/Boot/Windows/BootDiskIo.h +++ b/src/Boot/Windows/BootDiskIo.h @@ -28,17 +28,17 @@ enum struct PartitionEntryMBR { - byte BootIndicator; + uint8 BootIndicator; - byte StartHead; - byte StartCylSector; - byte StartCylinder; + uint8 StartHead; + uint8 StartCylSector; + uint8 StartCylinder; - byte Type; + uint8 Type; - byte EndHead; - byte EndSector; - byte EndCylinder; + uint8 EndHead; + uint8 EndSector; + uint8 EndCylinder; uint32 StartLBA; uint32 SectorCountLBA; @@ -46,15 +46,15 @@ struct PartitionEntryMBR struct MBR { - byte Code[446]; + uint8 Code[446]; PartitionEntryMBR Partitions[4]; uint16 Signature; }; struct BiosLbaPacket { - byte Size; - byte Reserved; + uint8 Size; + uint8 Reserved; uint16 SectorCount; uint32 Buffer; uint64 Sector; @@ -66,27 +66,27 @@ struct BiosLbaPacket struct ChsAddress { uint16 Cylinder; - byte Head; - byte Sector; + uint8 Head; + uint8 Sector; }; struct Partition { - byte Number; - byte Drive; + uint8 Number; + uint8 Drive; bool Active; uint64 EndSector; bool Primary; uint64 SectorCount; uint64 StartSector; - byte Type; + uint8 Type; }; struct DriveGeometry { uint16 Cylinders; - byte Heads; - byte Sectors; + uint8 Heads; + uint8 Sectors; }; @@ -99,22 +99,23 @@ void ReleaseSectorBuffer (); #endif void ChsToLba (const DriveGeometry &geometry, const ChsAddress &chs, uint64 &lba); -bool GetActivePartition (byte drive); -BiosResult GetDriveGeometry (byte drive, DriveGeometry &geometry, bool silent = false); -BiosResult GetDrivePartitions (byte drive, Partition *partitionArray, size_t partitionArrayCapacity, size_t &partitionCount, bool activeOnly = false, Partition *findPartitionFollowingThis = nullptr, bool silent = false); -bool IsLbaSupported (byte drive); +bool GetActivePartition (uint8 drive); +BiosResult GetDriveGeometry (uint8 drive, DriveGeometry &geometry, bool silent = false); +BiosResult GetDrivePartitions (uint8 drive, Partition *partitionArray, size_t partitionArrayCapacity, size_t &partitionCount, bool activeOnly = false, Partition *findPartitionFollowingThis = nullptr, bool silent = false); +bool IsLbaSupported (uint8 drive); void LbaToChs (const DriveGeometry &geometry, const uint64 &lba, ChsAddress &chs); void Print (const ChsAddress &chs); -void PrintDiskError (BiosResult error, bool write, byte drive, const uint64 *sector, const ChsAddress *chs = nullptr); +void PrintDiskError (BiosResult error, bool write, uint8 drive, const uint64 *sector, const ChsAddress *chs = nullptr); void PrintSectorCountInMB (const uint64 §orCount); -BiosResult ReadWriteMBR (bool write, byte drive, bool silent = false); -BiosResult ReadSectors (uint16 bufferSegment, uint16 bufferOffset, byte drive, const uint64 §or, uint16 sectorCount, bool silent = false); -BiosResult ReadSectors (byte *buffer, byte drive, const uint64 §or, uint16 sectorCount, bool silent = false); -BiosResult ReadSectors (byte *buffer, byte drive, const ChsAddress &chs, byte sectorCount, bool silent = false); -BiosResult ReadWriteSectors (bool write, uint16 bufferSegment, uint16 bufferOffset, byte drive, const uint64 §or, uint16 sectorCount, bool silent); -BiosResult WriteSectors (byte *buffer, byte drive, const uint64 §or, uint16 sectorCount, bool silent = false); -BiosResult WriteSectors (byte *buffer, byte drive, const ChsAddress &chs, byte sectorCount, bool silent = false); - -extern byte SectorBuffer[TC_LB_SIZE]; +BiosResult ReadWriteMBR (bool write, uint8 drive, bool silent = false); +BiosResult ReadSectors (uint16 bufferSegment, uint16 bufferOffset, uint8 drive, const uint64 §or, uint16 sectorCount, bool silent = false); +BiosResult ReadSectors (uint8 *buffer, uint8 drive, const uint64 §or, uint16 sectorCount, bool silent = false); +BiosResult ReadSectors (uint8 *buffer, uint8 drive, const ChsAddress &chs, uint8 sectorCount, bool silent = false); +BiosResult ReadWriteSectors (bool write, uint16 bufferSegment, uint16 bufferOffset, uint8 drive, const uint64 §or, uint16 sectorCount, bool silent); +BiosResult ReadWriteSectors (bool write, uint8 *buffer, uint8 drive, const uint64 §or, uint16 sectorCount, bool silent); +BiosResult WriteSectors (uint8 *buffer, uint8 drive, const uint64 §or, uint16 sectorCount, bool silent = false); +BiosResult WriteSectors (uint8 *buffer, uint8 drive, const ChsAddress &chs, uint8 sectorCount, bool silent = false); + +extern uint8 SectorBuffer[TC_LB_SIZE]; #endif // TC_HEADER_Boot_BootDiskIo diff --git a/src/Boot/Windows/BootEncryptedIo.cpp b/src/Boot/Windows/BootEncryptedIo.cpp index 25fe1dc4..24fbbbd0 100644 --- a/src/Boot/Windows/BootEncryptedIo.cpp +++ b/src/Boot/Windows/BootEncryptedIo.cpp @@ -19,7 +19,7 @@ #include "BootEncryptedIo.h" -BiosResult ReadEncryptedSectors (uint16 destSegment, uint16 destOffset, byte drive, uint64 sector, uint16 sectorCount) +BiosResult ReadEncryptedSectors (uint16 destSegment, uint16 destOffset, uint8 drive, uint64 sector, uint16 sectorCount) { BiosResult result; bool decrypt = true; @@ -76,7 +76,7 @@ BiosResult ReadEncryptedSectors (uint16 destSegment, uint16 destOffset, byte dri } -BiosResult WriteEncryptedSectors (uint16 sourceSegment, uint16 sourceOffset, byte drive, uint64 sector, uint16 sectorCount) +BiosResult WriteEncryptedSectors (uint16 sourceSegment, uint16 sourceOffset, uint8 drive, uint64 sector, uint16 sectorCount) { BiosResult result = BiosResultSuccess; AcquireSectorBuffer(); @@ -108,10 +108,22 @@ BiosResult WriteEncryptedSectors (uint16 sourceSegment, uint16 sourceOffset, byt EncryptDataUnits (SectorBuffer, &dataUnitNo, 1, BootCryptoInfo); } - result = WriteSectors (SectorBuffer, drive, sector + writeOffset, 1); + result = ReadWriteSectors (true, SectorBuffer, drive, sector + writeOffset, 1, true); + if (BiosResultTimeout == result) + { + if (BiosResultSuccess == ReadWriteSectors (false, TC_BOOT_LOADER_BUFFER_SEGMENT, 0, drive, sector + writeOffset, 8, false)) + { + CopyMemory (SectorBuffer, TC_BOOT_LOADER_BUFFER_SEGMENT,0, TC_LB_SIZE); + result = ReadWriteSectors (true, TC_BOOT_LOADER_BUFFER_SEGMENT, 0, drive, sector + writeOffset, 8, true); + } + } if (result != BiosResultSuccess) + { + sector += writeOffset; + PrintDiskError (result, true, drive, §or); break; + } ++sector; ++dataUnitNo; diff --git a/src/Boot/Windows/BootEncryptedIo.h b/src/Boot/Windows/BootEncryptedIo.h index d1c9e5f3..d2fa6d96 100644 --- a/src/Boot/Windows/BootEncryptedIo.h +++ b/src/Boot/Windows/BootEncryptedIo.h @@ -15,8 +15,8 @@ #include "Platform.h" -BiosResult ReadEncryptedSectors (uint16 destSegment, uint16 destOffset, byte drive, uint64 sector, uint16 sectorCount); -BiosResult WriteEncryptedSectors (uint16 sourceSegment, uint16 sourceOffset, byte drive, uint64 sector, uint16 sectorCount); +BiosResult ReadEncryptedSectors (uint16 destSegment, uint16 destOffset, uint8 drive, uint64 sector, uint16 sectorCount); +BiosResult WriteEncryptedSectors (uint16 sourceSegment, uint16 sourceOffset, uint8 drive, uint64 sector, uint16 sectorCount); static bool ReadWritePartiallyCoversEncryptedArea (const uint64 §or, uint16 sectorCount); #endif // TC_HEADER_Boot_BootEncryptionIo diff --git a/src/Boot/Windows/BootMain.cpp b/src/Boot/Windows/BootMain.cpp index 8bfbe4b3..e85f2be5 100644 --- a/src/Boot/Windows/BootMain.cpp +++ b/src/Boot/Windows/BootMain.cpp @@ -84,7 +84,7 @@ static void PrintMainMenu () } -static bool IsMenuKey (byte scanCode) +static bool IsMenuKey (uint8 scanCode) { #ifdef TC_WINDOWS_BOOT_RESCUE_DISK_MODE return scanCode == TC_MENU_KEY_REPAIR; @@ -149,12 +149,12 @@ static int AskSelection (const char *options[], size_t optionCount) } -static byte AskPassword (Password &password, int& pim) +static uint8 AskPassword (Password &password, int& pim) { size_t pos = 0; - byte scanCode; - byte asciiCode; - byte hidePassword = 1; + uint8 scanCode; + uint8 asciiCode; + uint8 hidePassword = 1; pim = 0; @@ -312,7 +312,7 @@ static byte AskPassword (Password &password, int& pim) } -static void ExecuteBootSector (byte drive, byte *sectorBuffer) +static void ExecuteBootSector (uint8 drive, uint8 *sectorBuffer) { Print ("Booting...\r\n"); CopyMemory (sectorBuffer, 0x0000, 0x7c00, TC_LB_SIZE); @@ -338,7 +338,7 @@ static void ExecuteBootSector (byte drive, byte *sectorBuffer) } -static bool OpenVolume (byte drive, Password &password, int pim, CRYPTO_INFO **cryptoInfo, uint32 *headerSaltCrc32, bool skipNormal, bool skipHidden) +static bool OpenVolume (uint8 drive, Password &password, int pim, CRYPTO_INFO **cryptoInfo, uint32 *headerSaltCrc32, bool skipNormal, bool skipHidden) { int volumeType; bool hiddenVolume; @@ -420,7 +420,7 @@ static bool CheckMemoryRequirements () } -static bool MountVolume (byte drive, byte &exitKey, bool skipNormal, bool skipHidden) +static bool MountVolume (uint8 drive, uint8 &exitKey, bool skipNormal, bool skipHidden) { BootArguments *bootArguments = (BootArguments *) TC_BOOT_LOADER_ARGS_OFFSET; int incorrectPasswordCount = 0, pim = 0; @@ -499,7 +499,7 @@ static bool MountVolume (byte drive, byte &exitKey, bool skipNormal, bool skipHi } -static bool GetSystemPartitions (byte drive) +static bool GetSystemPartitions (uint8 drive) { size_t partCount; @@ -524,10 +524,10 @@ static bool GetSystemPartitions (byte drive) } -static byte BootEncryptedDrive () +static uint8 BootEncryptedDrive () { BootArguments *bootArguments = (BootArguments *) TC_BOOT_LOADER_ARGS_OFFSET; - byte exitKey; + uint8 exitKey; BootCryptoInfo = NULL; if (!GetSystemPartitions (BootDrive)) @@ -556,7 +556,7 @@ static byte BootEncryptedDrive () if (!InstallInterruptFilters()) goto err; - bootArguments->BootArgumentsCrc32 = GetCrc32 ((byte *) bootArguments, (byte *) &bootArguments->BootArgumentsCrc32 - (byte *) bootArguments); + bootArguments->BootArgumentsCrc32 = GetCrc32 ((uint8 *) bootArguments, (uint8 *) &bootArguments->BootArgumentsCrc32 - (uint8 *) bootArguments); while (true) { @@ -587,7 +587,7 @@ err: EncryptedVirtualPartition.Drive = TC_INVALID_BIOS_DRIVE; EraseMemory ((void *) TC_BOOT_LOADER_ARGS_OFFSET, sizeof (BootArguments)); - byte scanCode; + uint8 scanCode; GetKeyboardChar (&scanCode); return scanCode; } @@ -601,7 +601,7 @@ static void BootMenu () size_t partitionCount; size_t bootablePartitionCount = 0; - for (byte drive = TC_FIRST_BIOS_DRIVE; drive <= TC_LAST_BIOS_DRIVE; ++drive) + for (uint8 drive = TC_FIRST_BIOS_DRIVE; drive <= TC_LAST_BIOS_DRIVE; ++drive) { if (GetDrivePartitions (drive, partitions, array_capacity (partitions), partitionCount, false, nullptr, true) == BiosResultSuccess) { @@ -689,7 +689,7 @@ static void BootMenu () #ifndef TC_WINDOWS_BOOT_RESCUE_DISK_MODE -static bool CopySystemPartitionToHiddenVolume (byte drive, byte &exitKey) +static bool CopySystemPartitionToHiddenVolume (uint8 drive, uint8 &exitKey) { bool status = false; @@ -812,9 +812,9 @@ ret: #else // TC_WINDOWS_BOOT_RESCUE_DISK_MODE -static void DecryptDrive (byte drive) +static void DecryptDrive (uint8 drive) { - byte exitKey; + uint8 exitKey; if (!MountVolume (drive, exitKey, false, true)) return; @@ -925,7 +925,7 @@ askBadSectorSkip: for (int i = 7; i >= 0; --i) { - SectorBuffer[TC_HEADER_OFFSET_ENCRYPTED_AREA_LENGTH + i] = (byte) encryptedAreaLength.LowPart; + SectorBuffer[TC_HEADER_OFFSET_ENCRYPTED_AREA_LENGTH + i] = (uint8) encryptedAreaLength.LowPart; encryptedAreaLength = encryptedAreaLength >> 8; } @@ -933,7 +933,7 @@ askBadSectorSkip: for (i = 3; i >= 0; --i) { - SectorBuffer[TC_HEADER_OFFSET_HEADER_CRC + i] = (byte) headerCrc32; + SectorBuffer[TC_HEADER_OFFSET_HEADER_CRC + i] = (uint8) headerCrc32; headerCrc32 >>= 8; } @@ -1020,7 +1020,7 @@ static void RepairMenu () sector.HighPart = 0; ChsAddress chs; - byte mbrPartTable[TC_LB_SIZE - TC_MAX_MBR_BOOT_CODE_SIZE]; + uint8 mbrPartTable[TC_LB_SIZE - TC_MAX_MBR_BOOT_CODE_SIZE]; AcquireSectorBuffer(); for (int i = (selection == RestoreVolumeHeader ? TC_BOOT_VOLUME_HEADER_SECTOR : TC_MBR_SECTOR); @@ -1073,7 +1073,7 @@ static void RepairMenu () Password password; int pim; - byte exitKey = AskPassword (password, pim); + uint8 exitKey = AskPassword (password, pim); if (exitKey != TC_BIOS_KEY_ENTER) goto abort; @@ -1221,13 +1221,13 @@ void main () while (true) { - byte exitKey; + uint8 exitKey; InitScreen(); #ifndef TC_WINDOWS_BOOT_RESCUE_DISK_MODE // Hidden system setup - byte hiddenSystemCreationPhase = BootSectorFlags & TC_BOOT_CFG_MASK_HIDDEN_OS_CREATION_PHASE; + uint8 hiddenSystemCreationPhase = BootSectorFlags & TC_BOOT_CFG_MASK_HIDDEN_OS_CREATION_PHASE; if (hiddenSystemCreationPhase != TC_HIDDEN_OS_CREATION_PHASE_NONE) { diff --git a/src/Boot/Windows/BootMain.h b/src/Boot/Windows/BootMain.h index 52d5c8cc..af445024 100644 --- a/src/Boot/Windows/BootMain.h +++ b/src/Boot/Windows/BootMain.h @@ -16,16 +16,16 @@ #include "TCdefs.h" #include "Platform.h" -static byte AskPassword (Password &password, int& pim); +static uint8 AskPassword (Password &password, int& pim); static int AskSelection (const char *options[], size_t optionCount); static bool AskYesNo (const char *message); -static byte BootEncryptedDrive (); +static uint8 BootEncryptedDrive (); static void BootMenu (); -static void ExecuteBootSector (byte drive, byte *sectorBuffer); +static void ExecuteBootSector (uint8 drive, uint8 *sectorBuffer); static void InitScreen (); -static bool IsMenuKey (byte scanCode); -static bool MountVolume (byte drive, byte &exitKey); -static bool OpenVolume (byte drive, Password &password, CRYPTO_INFO **cryptoInfo, uint32 *headerSaltCrc32 = nullptr, bool skipNormal = false, bool skipHidden = false); +static bool IsMenuKey (uint8 scanCode); +static bool MountVolume (uint8 drive, uint8 &exitKey); +static bool OpenVolume (uint8 drive, Password &password, CRYPTO_INFO **cryptoInfo, uint32 *headerSaltCrc32 = nullptr, bool skipNormal = false, bool skipHidden = false); static void PrintMainMenu (); static void RepairMenu (); diff --git a/src/Boot/Windows/BootSector.asm b/src/Boot/Windows/BootSector.asm index 33674146..0d2bbdca 100644 --- a/src/Boot/Windows/BootSector.asm +++ b/src/Boot/Windows/BootSector.asm @@ -43,23 +43,24 @@ main: call print skip_loader_name_msg: - ; Determine boot loader segment - mov ax, TC_BOOT_LOADER_SEGMENT - - ; Check available memory - cmp word ptr [ds:413h], TC_BOOT_LOADER_SEGMENT / 1024 * 16 + TC_BOOT_MEMORY_REQUIRED - jge memory_ok - - mov ax, TC_BOOT_LOADER_SEGMENT_LOW - - cmp word ptr [ds:413h], TC_BOOT_LOADER_SEGMENT_LOW / 1024 * 16 + TC_BOOT_MEMORY_REQUIRED - jge memory_ok - - ; Insufficient memory - mov ax, TC_BOOT_LOADER_LOWMEM_SEGMENT + ; Determine boot loader segment + mov ax, word ptr [ds:413h] ;available kB from BIOS + sub ax, TC_BOOT_MEMORY_REQUIRED ;minus TC_BOOT_MEMORY_REQUIRED + jc mem_toolow + and ax, 0FFE0h ;32K align + shl ax, 6 ;convert kB to segment addr (*1024/16) + cmp ax, 8000h + jb mem_toolow ;we can't load below 8000h + cmp ax, TC_BOOT_LOADER_SEGMENT + jbe memory_ok ;don't load above TC_BOOT_LOADER_SEGMENT (9000h) + mov ax, TC_BOOT_LOADER_SEGMENT + jmp memory_ok + +mem_toolow: + mov ax, TC_BOOT_LOADER_LOWMEM_SEGMENT memory_ok: - mov es, ax + mov es, ax ; Clear BSS section xor al, al @@ -138,7 +139,7 @@ checksum_ok: push dx ; Decompress boot loader - mov cx, word ptr [start + TC_BOOT_SECTOR_LOADER_LENGTH_OFFSET] + mov cx, word ptr cs:[start + TC_BOOT_SECTOR_LOADER_LENGTH_OFFSET] sub cx, TC_GZIP_HEADER_SIZE push cx ; Compressed data size push TC_BOOT_LOADER_COMPRESSED_BUFFER_OFFSET + TC_GZIP_HEADER_SIZE ; Compressed data diff --git a/src/Boot/Windows/IntFilter.cpp b/src/Boot/Windows/IntFilter.cpp index 9e5c8536..36837d58 100644 --- a/src/Boot/Windows/IntFilter.cpp +++ b/src/Boot/Windows/IntFilter.cpp @@ -38,7 +38,7 @@ bool Int13Filter () static int ReEntryCount = -1; ++ReEntryCount; - byte function = (byte) (regs.AX >> 8); + uint8 function = (uint8) (regs.AX >> 8); #ifdef TC_TRACE_INT13 DisableScreenOutput(); @@ -63,14 +63,14 @@ bool Int13Filter () case 0x2: // Read sectors case 0x3: // Write sectors { - byte drive = (byte) regs.DX; + uint8 drive = (uint8) regs.DX; ChsAddress chs; chs.Cylinder = ((regs.CX << 2) & 0x300) | (regs.CX >> 8); chs.Head = regs.DX >> 8; chs.Sector = regs.CX & 0x3f; - byte sectorCount = (byte) regs.AX; + uint8 sectorCount = (uint8) regs.AX; #ifdef TC_TRACE_INT13 PrintVal (": Drive", drive - TC_FIRST_BIOS_DRIVE, false); @@ -125,10 +125,10 @@ bool Int13Filter () case 0x42: // Read sectors LBA case 0x43: // Write sectors LBA { - byte drive = (byte) regs.DX; + uint8 drive = (uint8) regs.DX; BiosLbaPacket lba; - CopyMemory (regs.DS, regs.SI, (byte *) &lba, sizeof (lba)); + CopyMemory (regs.DS, regs.SI, (uint8 *) &lba, sizeof (lba)); #ifdef TC_TRACE_INT13 PrintVal (": Drive", drive - TC_FIRST_BIOS_DRIVE, false); @@ -337,7 +337,7 @@ bool Int15Filter () } else { - CopyMemory ((byte *) &BiosMemoryMap[IntRegisters.EBX], IntRegisters.ES, IntRegisters.DI, sizeof (BiosMemoryMap[0])); + CopyMemory ((uint8 *) &BiosMemoryMap[IntRegisters.EBX], IntRegisters.ES, IntRegisters.DI, sizeof (BiosMemoryMap[0])); IntRegisters.Flags &= ~TC_X86_CARRY_FLAG; IntRegisters.EAX = 0x534D4150UL; @@ -380,7 +380,7 @@ bool Int15Filter () #ifdef TC_TRACE_INT15 BiosMemoryMapEntry entry; - CopyMemory (IntRegisters.ES, IntRegisters.DI, (byte *) &entry, sizeof (entry)); + CopyMemory (IntRegisters.ES, IntRegisters.DI, (uint8 *) &entry, sizeof (entry)); PrintHex (entry.Type); PrintChar (' '); PrintHex (entry.BaseAddress); PrintChar (' '); PrintHex (entry.Length); PrintChar (' '); diff --git a/src/Boot/Windows/Makefile b/src/Boot/Windows/Makefile index 1966a3cb..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) @@ -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/Platform.cpp b/src/Boot/Windows/Platform.cpp index 046fa4a4..3b94d22c 100644 --- a/src/Boot/Windows/Platform.cpp +++ b/src/Boot/Windows/Platform.cpp @@ -84,7 +84,7 @@ uint64 operator>> (const uint64 &a, int shiftCount) { r.LowPart >>= 1; - if ((byte) r.HighPart & 1) + if ((uint8) r.HighPart & 1) r.LowPart |= 0x80000000UL; r.HighPart >>= 1; 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..9bf2133e --- /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..222aa5a1 --- /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..6aebbf06 --- /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..f090cdfb --- /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..edc5e25f --- /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..b9d83263 --- /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..2a9cac0b --- /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..19ab043c --- /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..885190f2 --- /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..0090b771 --- /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..181b2d35 --- /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..5114925b --- /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..52382753 --- /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..60d7d41a --- /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..f2a0fc22 --- /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..47e8283a --- /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..c248eb6b --- /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..e3e889e0 --- /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..6525bcaa --- /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..9837e671 --- /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 |