tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SecurityPkg OpalPasswordDxe: gray out menu instead of suppress it. 

For current implementation, if the device is pyrite type, driver
will suppress the "keep user data" option. Base on the feedback
from user, they prefer to keep the menu but gray out it. Now base
on this feedback to update the driver.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
This commit is contained in:
Eric Dong 2016-05-25 08:28:46 +08:00 committed by Star Zeng
parent 9fb16e2143
commit 0efc3be0af
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c
View File

@ -329,13 +329,7 @@ HiiSelectDiskAction (
case HII_KEY_ID_GOTO_REVERT: case HII_KEY_ID_GOTO_REVERT:
gHiiConfiguration.AvailableFields |= HII_FIELD_PASSWORD; gHiiConfiguration.AvailableFields |= HII_FIELD_PASSWORD;
if (OpalDisk->SupportedAttributes.PyriteSsc != 1) { gHiiConfiguration.AvailableFields |= HII_FIELD_KEEP_USER_DATA;
//
// According to current Pyrite SSC Spec 1.00, there is no parameter for RevertSP method.
// So issue RevertSP method without any parameter by suppress KeepUserData option.
//
gHiiConfiguration.AvailableFields |= HII_FIELD_KEEP_USER_DATA;
}
if (AvailActions.RevertKeepDataForced) { if (AvailActions.RevertKeepDataForced) {
gHiiConfiguration.AvailableFields |= HII_FIELD_KEEP_USER_DATA_FORCED; gHiiConfiguration.AvailableFields |= HII_FIELD_KEEP_USER_DATA_FORCED;
} }
@ -573,14 +567,6 @@ HiiPopulateDiskInfoForm(
// Default initialize keep user Data to be true // Default initialize keep user Data to be true
// //
gHiiConfiguration.KeepUserData = 1; gHiiConfiguration.KeepUserData = 1;
if (OpalDisk->SupportedAttributes.PyriteSsc == 1) {
//
// According to current Pyrite SSC Spec 1.00, there is no parameter for RevertSP method.
// So issue RevertSP method without any parameter by set default value to FALSE.
//
gHiiConfiguration.KeepUserData = 0;
}
} }
} }
} }
@ -1073,8 +1059,15 @@ HiiPasswordEntered(
} else if (gHiiConfiguration.SelectedAction == HII_KEY_ID_GOTO_DISABLE_USER) { } else if (gHiiConfiguration.SelectedAction == HII_KEY_ID_GOTO_DISABLE_USER) {
Status = HiiDisableUser (OpalDisk, Password, PassLength); Status = HiiDisableUser (OpalDisk, Password, PassLength);
} else if (gHiiConfiguration.SelectedAction == HII_KEY_ID_GOTO_REVERT) { } else if (gHiiConfiguration.SelectedAction == HII_KEY_ID_GOTO_REVERT) {
DEBUG ((DEBUG_INFO, "gHiiConfiguration.KeepUserData %u\n", gHiiConfiguration.KeepUserData)); if (OpalDisk->SupportedAttributes.PyriteSsc == 1 && OpalDisk->LockingFeature.MediaEncryption == 0) {
Status = HiiRevert(OpalDisk, Password, PassLength, gHiiConfiguration.KeepUserData); //
// For pyrite type device which also not supports media encryption, it not accept "Keep User Data" parameter.
// So here hardcode a FALSE for this case.
//
Status = HiiRevert(OpalDisk, Password, PassLength, FALSE);
} else {
Status = HiiRevert(OpalDisk, Password, PassLength, gHiiConfiguration.KeepUserData);
}
} else { } else {
Status = HiiSetPassword(OpalDisk, Password, PassLength); Status = HiiSetPassword(OpalDisk, Password, PassLength);
} }