SecurityPkg/OpalPassword: Update strings on Opal Setup page

https://bugzilla.tianocore.org/show_bug.cgi?id=1506
Updated some descriptions on SETUP page to avoid user confusion.
Currently it shows "1.0 UEFI Opal Driver", however it may be mislead user to think
it is only for Opal drive but not for Pyrite drive.

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Maggie Chu <maggie.chu@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
index 4336604d0d1e2aa02ddd205d5ca2ac52da24a197..e4930bede1188a0c478302b2473a042dc08b5db0 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of the HII for the Opal UEFI Driver.\r
 \r
-Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -393,7 +393,6 @@ OpalHiiAddPackages(
   )\r
 {\r
   EFI_HANDLE                   DriverHandle;\r
-  CHAR16                       *NewString;\r
 \r
   DriverHandle = HiiGetDriverImageHandleCB();\r
 \r
@@ -416,15 +415,6 @@ OpalHiiAddPackages(
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  //\r
-  // Update Version String in main window\r
-  //\r
-  NewString = HiiGetDriverNameCB ();\r
-  if (HiiSetString(gHiiPackageListHandle, STRING_TOKEN(STR_MAIN_OPAL_VERSION), NewString, NULL) == 0) {\r
-    DEBUG ((DEBUG_INFO,  "OpalHiiAddPackages: HiiSetString( ) failed\n"));\r
-    return EFI_OUT_OF_RESOURCES;\r
-  }\r
-\r
   return EFI_SUCCESS;\r
 }\r
 \r

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
index 8b368fe995ce0473747e7c56f1cf6fdfffa7cd00..4656ac58fc599de6c22aa5b0bcef6c34ef32f055 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
@@ -2,7 +2,7 @@
   Public Header file of HII library used by Opal UEFI Driver.\r
   Defines required callbacks of Opal HII library.\r
 \r
-Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -285,17 +285,6 @@ OpalHiiAddPackages(
   VOID\r
   );\r
 \r
-/**\r
-  Returns the driver name.\r
-\r
-  @retval Returns the driver name.\r
-\r
-**/\r
-CHAR16*\r
-HiiGetDriverNameCB(\r
-  VOID\r
-  );\r
-\r
 /**\r
   Returns the opaque pointer to a physical disk context.\r
 \r

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiCallbacks.c b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiCallbacks.c
index 31e1aa2240bbe8ceae2289416e9067ccb2741344..6d1a3a9b25ca7e969a49d79436016534e7479918 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiCallbacks.c
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiCallbacks.c
@@ -2,7 +2,7 @@
   Callbacks required by the HII of the Opal UEFI Driver to help display\r
   Opal device information.\r
 \r
-Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -115,18 +115,4 @@ HiiDiskGetNameCB(
     return Ctx->NameZ;\r
   }\r
   return NULL;\r
-}\r
-\r
-/**\r
-  Returns the driver name.\r
-\r
-  @retval Returns the driver name.\r
-\r
-**/\r
-CHAR16*\r
-HiiGetDriverNameCB(\r
-  VOID\r
-  )\r
-{\r
-  return (CHAR16*)EFI_DRIVER_NAME_UNICODE;\r
-}\r
+}\r
\ No newline at end of file

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormStrings.uni b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormStrings.uni
index 5f753dfa8c9eb944613805c36d566f01f11565c3..550592258a6270c2c408fcb23b6848afa04ccf5f 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormStrings.uni
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormStrings.uni
@@ -2,7 +2,7 @@
 //\r
 //   String definitions for Setup formset.\r
 //\r
-// Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
@@ -20,14 +20,14 @@
 #string STR_NULL                                #language en-US " "\r
 \r
 /////////////////////////////////   FORM SET   /////////////////////////////////\r
-#string STR_FORM_SET_HELP                        #language en-US "Manage Opal disks"\r
+#string STR_FORM_SET_HELP                        #language en-US "Select to manage"\r
 \r
 /////////////////////////////////   MULTIPLE FORMS   /////////////////////////////////\r
-#string STR_OPAL                                 #language en-US "Opal"\r
-#string STR_MAIN_OPAL_VERSION                    #language en-US "Version 00.0.0.0000"\r
+#string STR_OPAL                                 #language en-US "TCG Drive Management"\r
 \r
 /////////////////////////////////   MAIN MENU FORM   /////////////////////////////////\r
 #string STR_MAIN_PHY_DISKS_LBL                   #language en-US "Physical Disks:"\r
+#string STR_MAIN_OPAL_TITLE_LBL                  #language en-US "Allows user to choose drive to configure drive security. User can also set storage action policy for use of the TCG Block SID authentication feature."\r
 \r
 #string STR_MAIN_GOTO_DISK_INFO_0                #language en-US " "\r
 #string STR_MAIN_GOTO_DISK_INFO_1                #language en-US " "\r
@@ -36,13 +36,14 @@
 #string STR_MAIN_GOTO_DISK_INFO_4                #language en-US " "\r
 #string STR_MAIN_GOTO_DISK_INFO_5                #language en-US " "\r
 \r
-#string STR_MAIN_GOTO_DISK_INFO_HELP             #language en-US "Select to see Opal disk actions"\r
+#string STR_MAIN_GOTO_DISK_INFO_HELP             #language en-US "Select disk to see actions"\r
 \r
 #string STR_MAIN_NO_DISKS_PRESENT_LBL            #language en-US "No disks connected to system"\r
 #string STR_MAIN_NO_DISKS_PRESENT_LBL_HELP       #language en-US "The storage needs to be connected before EndOfDxe"\r
 \r
 /////////////////////////////////   DISK INFO MENU FORM   /////////////////////////////////\r
 #string STR_DISK_INFO_SELECTED_DISK_NAME         #language en-US " "\r
+#string STR_DISK_INFO_TITLE_LBL                  #language en-US "Allows user to set and modify password; perform secure erase; and perform revert functions on drive."\r
 \r
 #string STR_DISK_INFO_LOCK                       #language en-US "Lock"\r
 #string STR_DISK_INFO_UNLOCK                     #language en-US "Unlock"\r
@@ -69,7 +70,7 @@
 #string STR_BLOCKSID_STATUS2                     #language en-US ""\r
 #string STR_BLOCKSID_STATUS3                     #language en-US ""\r
 \r
-#string STR_OPAL_REQUESTS_LBL                    #language en-US "Opal Password Requests:"\r
+#string STR_OPAL_REQUESTS_LBL                    #language en-US "Options:"\r
 #string STR_DISK_INFO_LOCK_HELP                  #language en-US "Lock the disk"\r
 #string STR_DISK_INFO_UNLOCK_HELP                #language en-US "Unlock the disk"\r
 #string STR_DISK_INFO_SET_ADMIN_PSWD_HELP        #language en-US "Set password for the administrator, reset is required for the request to be processed in next boot"\r

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordForm.vfr b/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordForm.vfr
index d802ef305dad5f6526f217ffe38ca5096eb00e49..79f86b19b14a82bd097df5b2feae2e30e2a196e9 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordForm.vfr
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordForm.vfr
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -45,7 +45,7 @@ form formid = FORMID_VALUE_MAIN_MENU,
         endnumeric;\r
     endif;\r
 \r
-    subtitle text = STRING_TOKEN(STR_MAIN_OPAL_VERSION);\r
+    subtitle text = STRING_TOKEN(STR_MAIN_OPAL_TITLE_LBL);\r
 \r
     subtitle text = STRING_TOKEN(STR_NULL);\r
 \r
@@ -174,7 +174,7 @@ form formid = FORMID_VALUE_DISK_INFO_FORM_MAIN,
         endcheckbox;\r
     endif;\r
 \r
-    subtitle text = STRING_TOKEN(STR_MAIN_OPAL_VERSION);\r
+    subtitle text = STRING_TOKEN(STR_DISK_INFO_TITLE_LBL);\r
 \r
     subtitle text = STRING_TOKEN(STR_NULL);\r
 \r