From 5fb01149ef1cecc36b261094b304ff0654bb7ae3 Mon Sep 17 00:00:00 2001
From: kavsrf <kavsrf@gmail.com>
Date: Sat, 17 Sep 2016 01:00:44 +0300
Subject: DcsRe select volume is added to boot from usb

Notes (7.2, 7.4)
---
 DcsInt/DcsInt.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'DcsInt')

diff --git a/DcsInt/DcsInt.c b/DcsInt/DcsInt.c
index ced318c..3fe90d6 100644
--- a/DcsInt/DcsInt.c
+++ b/DcsInt/DcsInt.c
@@ -262,7 +262,7 @@ IntBlockIO_Write(
 			writeCrypted = MEM_ALLOC(BufferSize);
 			if (writeCrypted == NULL) {
 				Status = EFI_BAD_BUFFER_SIZE;
-
+				return Status;
 			}
 			CopyMem(writeCrypted, Buffer, BufferSize);
 			//      Print(L"*");
@@ -354,18 +354,7 @@ IntBlockIo_Hook(
 		DcsIntBlockIo->Controller = DeviceHandle;
 		DcsIntBlockIo->BlockIo = BlockIo;
 		DcsIntBlockIo->IsReinstalled = 0;
-
-		if (EFI_ERROR(Status)) {
-			gBS->CloseProtocol(
-				DeviceHandle,
-				&gEfiBlockIoProtocolGuid,
-				This->DriverBindingHandle,
-				DeviceHandle
-				);
-			MEM_FREE(DcsIntBlockIo);
-			return EFI_UNSUPPORTED;
-		}
-		// Block
+// Block
 //		Tpl = gBS->RaiseTPL(TPL_NOTIFY);
 		// Install new routines
 		DcsIntBlockIo->CryptInfo = SecRegionCryptInfo;
@@ -579,24 +568,30 @@ SecRegionChangePwd() {
 
 	if (vcres != 0) {
 		ERR_PRINT(L"header create error(%x)\n", vcres);
-		return EFI_INVALID_PARAMETER;
+		Status = EFI_INVALID_PARAMETER;
+		goto ret;
 	}
 
 	// get BlockIo protocol
 	bio = EfiGetBlockIO(SecRegionHandle);
 	if (bio == NULL) {
 		ERR_PRINT(L"Block io not supported\n,");
-		return EFI_NOT_FOUND;
+		Status = EFI_NOT_FOUND;
+		goto ret;
 	}
 
 	Status = bio->WriteBlocks(bio, bio->Media->MediaId, SecRegionSector, 512, Header);
 	if (EFI_ERROR(Status)) {
 		ERR_PRINT(L"Write: %r\n", Status);
-		return Status;
+		goto ret;
 	}
 	CopyMem(&gAuthPassword, &newPassword, sizeof(gAuthPassword));
 	CopyMem(SecRegionData + SecRegionOffset, Header, 512);
 	ERR_PRINT(L"Update (%r)\n", Status);
+
+ret:
+	burn(&newPassword, sizeof(newPassword));
+	burn(&confirmPassword, sizeof(confirmPassword));
 	return Status;
 }
 
@@ -1017,6 +1012,10 @@ UefiMain(
 
 	DetectX86Features();
 	res = SecRegionTryDecrypt();
+
+	// Reset Console buffer
+	gST->ConIn->Reset(gST->ConIn, FALSE);
+
 	if (EFI_ERROR(res)) {
 		return OnExit(gOnExitFailed, OnExitAuthFaild, res);
 	}
-- 
cgit v1.2.3