From f648e29d050cab362cc660c1a5c5109182028768 Mon Sep 17 00:00:00 2001
From: kavsrf <kavsrf@gmail.com>
Date: Mon, 23 Jan 2017 15:30:22 +0300
Subject: DcsInfo added

DcsBoot is driver now (to support DriverOrder list)
---
 DcsCfg/DcsCfgCrypt.c | 102 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 56 insertions(+), 46 deletions(-)

(limited to 'DcsCfg')

diff --git a/DcsCfg/DcsCfgCrypt.c b/DcsCfg/DcsCfgCrypt.c
index 7259e78..0e892dd 100644
--- a/DcsCfg/DcsCfgCrypt.c
+++ b/DcsCfg/DcsCfgCrypt.c
@@ -143,6 +143,7 @@ ChangePassword(
 	EFI_STATUS              res;
 	PCRYPTO_INFO            cryptoInfo, ci;
 	int                     vcres;
+	BOOL                    modified = FALSE;
 
 	res = RndPreapare();
 	if (EFI_ERROR(res)) {
@@ -157,57 +158,66 @@ ChangePassword(
 	res = TryHeaderDecrypt(header, &cryptoInfo, NULL);
 	if (EFI_ERROR(res)) return res;
 
-	if (AskConfirm("Change pwd[N]?", 1)) {
-		return EFI_INVALID_PARAMETER;
-	}
+	if (AskConfirm("Change password[N]?", 1)) {
+		modified = TRUE;
+		do {
+			ZeroMem(&newPassword, sizeof(newPassword));
+			ZeroMem(&confirmPassword, sizeof(newPassword));
+			VCAskPwd(AskPwdNew, &newPassword);
+			if (gAuthPwdCode == AskPwdRetCancel) {
+				return EFI_NOT_READY;
+			}
+			VCAskPwd(AskPwdConfirm, &confirmPassword);
+			if (gAuthPwdCode == AskPwdRetCancel) {
+				MEM_BURN(&newPassword, sizeof(newPassword));
+				return EFI_NOT_READY;
+			}
+			if (newPassword.Length == confirmPassword.Length) {
+				if (CompareMem(newPassword.Text, confirmPassword.Text, confirmPassword.Length) == 0) {
+					gAuthPassword = newPassword;
+					break;
+				}
+			}
 
-	do {
-		ZeroMem(&newPassword, sizeof(newPassword));
-		ZeroMem(&confirmPassword, sizeof(newPassword));
-		VCAskPwd(AskPwdNew, &newPassword);
-		if (gAuthPwdCode == AskPwdRetCancel) {
-			return EFI_NOT_READY;
-		}
-		VCAskPwd(AskPwdConfirm, &confirmPassword);
-		if (gAuthPwdCode == AskPwdRetCancel) {
-			MEM_BURN(&newPassword, sizeof(newPassword));
-			return EFI_NOT_READY;
-		}
-		if (newPassword.Length == confirmPassword.Length) {
-			if (CompareMem(newPassword.Text, confirmPassword.Text, confirmPassword.Length) == 0) {
+			if (AskConfirm("Password mismatch, retry[N]?", 1)) {
 				break;
 			}
-		}
-		if (AskConfirm("Password mismatch, retry?", 1)) {
+		} while (TRUE);
+	}
+
+	if (AskConfirm("Change range of encrypted sectors[N]?", 1)) {
+		modified = TRUE;
+		cryptoInfo->VolumeSize.Value = AskUINT64("Volume size", cryptoInfo->VolumeSize.Value >> 9) << 9;
+		cryptoInfo->EncryptedAreaStart.Value = AskUINT64("Encrypted area start", cryptoInfo->EncryptedAreaStart.Value >> 9) << 9;
+		cryptoInfo->EncryptedAreaLength.Value = AskUINT64("Encrypted area length", cryptoInfo->EncryptedAreaLength.Value >> 9) << 9;
+	}
+
+	if (modified) {
+		vcres = CreateVolumeHeaderInMemory(
+			gAuthBoot, header,
+			cryptoInfo->ea,
+			cryptoInfo->mode,
+			&gAuthPassword,
+			cryptoInfo->pkcs5,
+			gAuthPim,
+			cryptoInfo->master_keydata,
+			&ci,
+			cryptoInfo->VolumeSize.Value,
+			cryptoInfo->hiddenVolumeSize,
+			cryptoInfo->EncryptedAreaStart.Value,
+			cryptoInfo->EncryptedAreaLength.Value,
+			gAuthTc ? 0 : cryptoInfo->RequiredProgramVersion,
+			cryptoInfo->HeaderFlags,
+			cryptoInfo->SectorSize,
+			FALSE);
+
+		MEM_BURN(&newPassword, sizeof(newPassword));
+		MEM_BURN(&confirmPassword, sizeof(confirmPassword));
+
+		if (vcres != 0) {
+			ERR_PRINT(L"header create error(%x)\n", vcres);
 			return EFI_INVALID_PARAMETER;
 		}
-	} while (TRUE);
-
-	vcres = CreateVolumeHeaderInMemory(
-		gAuthBoot, header,
-		cryptoInfo->ea,
-		cryptoInfo->mode,
-		&newPassword,
-		cryptoInfo->pkcs5,
-		gAuthPim,
-		cryptoInfo->master_keydata,
-		&ci,
-		cryptoInfo->VolumeSize.Value,
-		cryptoInfo->hiddenVolumeSize,
-		cryptoInfo->EncryptedAreaStart.Value,
-		cryptoInfo->EncryptedAreaLength.Value,
-		gAuthTc ? 0 : cryptoInfo->RequiredProgramVersion,
-		cryptoInfo->HeaderFlags,
-		cryptoInfo->SectorSize,
-		FALSE);
-		
-		
-	MEM_BURN(&newPassword, sizeof(newPassword));
-	MEM_BURN(&confirmPassword, sizeof(confirmPassword));
-
-	if (vcres != 0) {
-		ERR_PRINT(L"header create error(%x)\n", vcres);
-		return EFI_INVALID_PARAMETER;
 	}
 	return EFI_SUCCESS;
 }
-- 
cgit v1.2.3