VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkavsrf <kavsrf@gmail.com>2017-01-28 20:24:00 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2017-06-05 15:36:53 (GMT)
commit8051ac7985a2cef1e561fdf1f4258ae640d3735b (patch)
treee310d34e634de82d9601d0cfb114e512a19ab4b0
parent0d88d54f987fa0e464177febbc04c93257a17b40 (diff)
downloadVeraCrypt-DCS-8051ac7985a2cef1e561fdf1f4258ae640d3735b.zip
VeraCrypt-DCS-8051ac7985a2cef1e561fdf1f4258ae640d3735b.tar.gz
DcsDriver config key supported (install/remove dirver)
-rw-r--r--DcsBoot/DcsBoot.c50
-rw-r--r--DcsBoot/DcsBoot.inf1
-rw-r--r--Library/CommonLib/EfiVar.c6
3 files changed, 56 insertions, 1 deletions
diff --git a/DcsBoot/DcsBoot.c b/DcsBoot/DcsBoot.c
index 108da0c..30bc4a9 100644
--- a/DcsBoot/DcsBoot.c
+++ b/DcsBoot/DcsBoot.c
@@ -19,11 +19,15 @@ https://opensource.org/licenses/LGPL-3.0
#include <Library/BaseMemoryLib.h>
#include "DcsConfig.h"
#include <Guid/Gpt.h>
+#include <Guid/GlobalVariable.h>
EFI_GUID ImagePartGuid;
EFI_GUID *gEfiExecPartGuid = &ImagePartGuid;
CHAR16 *gEfiExecCmdDefault = L"\\EFI\\Microsoft\\Boot\\Bootmgfw.efi";
CHAR16 *gEfiExecCmd = NULL;
+
+CHAR16* sDcsBootEfi = L"EFI\\VeraCrypt\\DcsBoot.efi";
+CHAR16* sDcsDriverEfiDesc = L"VeraCrypt(DCS) driver";
/**
The actual entry point for the application.
@@ -46,18 +50,64 @@ DcsBootMain(
UINT32 attr;
int drvInst;
BOOLEAN searchOnESP = FALSE;
+ EFI_INPUT_KEY key;
+
InitBio();
res = InitFS();
if (EFI_ERROR(res)) {
ERR_PRINT(L"InitFS %r\n", res);
}
+ // Check multiple execution
+ res = EfiGetVar(L"DcsExecPartGuid", NULL, &gEfiExecPartGuid, &len, &attr);
+ if (!EFI_ERROR(res)) {
+ // DcsBoot executed already.
+ ERR_PRINT(L"Multiple execution of DcsBoot\n");
+ MEM_FREE(gEfiExecPartGuid);
+ return EFI_INVALID_PARAMETER;
+ }
+ // Driver load selected?
drvInst = ConfigReadInt("DcsDriver", 0);
+ if (drvInst) {
+ CHAR16* tmp = NULL;
+ // Driver installed?
+ res = EfiGetVar(L"DriverDC5B", &gEfiGlobalVariableGuid, &tmp, &len, &attr);
+ if (EFI_ERROR(res)) {
+ // No - install and reboot.
+ res = BootMenuItemCreate(L"DriverDC5B", sDcsDriverEfiDesc, gFileRootHandle, sDcsBootEfi, FALSE);
+ if (!EFI_ERROR(res)) {
+ len = 0;
+ res = EfiGetVar(L"DriverOrder", &gEfiGlobalVariableGuid, &tmp, &len, &attr);
+ if (!EFI_ERROR(res)) len = len / 2;
+ res = BootOrderInsert(L"DriverOrder", len, 0x0DC5B);
+ OUT_PRINT(L"DcsBoot driver installed, %r\n", res);
+ key = KeyWait(L"%2d \r", 10, 0, 0);
+ gST->RuntimeServices->ResetSystem(EfiResetCold, EFI_SUCCESS, 0, NULL);
+ return res;
+ }
+ ERR_PRINT(L"Failed to install DcsBoot driver. %r\n", res);
+ key = KeyWait(L"%2d \r", 10, 0, 0);
+ }
+ MEM_FREE(tmp);
+ } else {
+ CHAR16* tmp = NULL;
+ // Try uninstall driver
+ res = EfiGetVar(L"DriverDC5B", &gEfiGlobalVariableGuid, &tmp, &len, &attr);
+ if (!EFI_ERROR(res)) {
+ BootMenuItemRemove(L"DriverDC5B");
+ BootOrderRemove(L"DriverOrder", 0x0DC5B);
+ OUT_PRINT(L"DcsBoot driver uninstalled\n");
+ key = KeyWait(L"%2d \r", 10, 0, 0);
+ gST->RuntimeServices->ResetSystem(EfiResetCold, EFI_SUCCESS, 0, NULL);
+ }
+ }
+ // Try platform info
if (EFI_ERROR(FileExist(NULL, L"\\EFI\\VeraCrypt\\PlatformInfo")) &&
!EFI_ERROR(FileExist(NULL, L"\\EFI\\VeraCrypt\\DcsInfo.dcs"))) {
res = EfiExec(NULL, L"\\EFI\\VeraCrypt\\DcsInfo.dcs");
}
+
// Load all drivers
res = EfiExec(NULL, L"\\EFI\\VeraCrypt\\LegacySpeaker.dcs");
diff --git a/DcsBoot/DcsBoot.inf b/DcsBoot/DcsBoot.inf
index 34c78f3..745f985 100644
--- a/DcsBoot/DcsBoot.inf
+++ b/DcsBoot/DcsBoot.inf
@@ -48,6 +48,7 @@
gEfiDcsVariableGuid
gEfiFileInfoGuid
gEfiPartTypeSystemPartGuid
+ gEfiGlobalVariableGuid
[Protocols]
gEfiBlockIoProtocolGuid
diff --git a/Library/CommonLib/EfiVar.c b/Library/CommonLib/EfiVar.c
index 2a6e59e..fad6eb5 100644
--- a/Library/CommonLib/EfiVar.c
+++ b/Library/CommonLib/EfiVar.c
@@ -80,7 +80,11 @@ BootOrderInsert(
UINTN i;
UINTN j;
res = EfiGetVar(OrderVarName, &gEfiGlobalVariableGuid, &varBootOrder, &varBootOrderSize, &varBootOrderAttr);
- if (EFI_ERROR(res)) return res;
+ if (EFI_ERROR(res)) {
+ res = EfiSetVar(OrderVarName, &gEfiGlobalVariableGuid, &value, 2,
+ EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS);
+ return res;
+ }
BootOrderCount = varBootOrderSize / sizeof(UINT16);
varBootOrderNew = MEM_ALLOC((BootOrderCount + 1) * sizeof(UINT16));
if (BootOrderCount < index) index = BootOrderCount - 1;