From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=eric.dong@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 051D221B02822 for ; Wed, 13 Feb 2019 21:43:43 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Feb 2019 21:43:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,367,1544515200"; d="scan'208";a="122331148" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga007.fm.intel.com with ESMTP; 13 Feb 2019 21:43:43 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 13 Feb 2019 21:43:42 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.207]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.109]) with mapi id 14.03.0415.000; Thu, 14 Feb 2019 13:43:41 +0800 From: "Dong, Eric" To: "Chu, Maggie" , "edk2-devel@lists.01.org" CC: "Zhang, Chao B" , "Yao, Jiewen" Thread-Topic: [PATCH] SecurityPkg/OpalPassword: Update strings on Opal Setup page Thread-Index: AQHUw2lIvJ7wMsn87UOyjugsARNSPKXeyVsw Date: Thu, 14 Feb 2019 05:43:40 +0000 Message-ID: References: <20190213065611.3008-1-maggie.chu@intel.com> In-Reply-To: <20190213065611.3008-1-maggie.chu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] SecurityPkg/OpalPassword: Update strings on Opal Setup page X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Feb 2019 05:43:44 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Maggie, Thanks for your contribution.=20 Reviewed-by: Eric Dong Pushed: SHA-1: 315873959ec3e0a44168efdf4c03fe6160121cdb Thanks, Eric > -----Original Message----- > From: Chu, Maggie > Sent: Wednesday, February 13, 2019 2:56 PM > To: edk2-devel@lists.01.org > Cc: Zhang, Chao B ; Yao, Jiewen > ; Dong, Eric > Subject: [PATCH] SecurityPkg/OpalPassword: Update strings on Opal Setup > page >=20 > https://bugzilla.tianocore.org/show_bug.cgi?id=3D1506 > 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. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Maggie Chu > Cc: Chao Zhang > Cc: Jiewen Yao > Cc: Eric Dong > --- > SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c | 10 ---------- > SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h | 11 ----------= - > SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiCallbacks.c | 16 +---------= ------ > SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormStrings.uni | 11 ++++++---- > - > SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordForm.vfr | 4 ++-- > 5 files changed, 9 insertions(+), 43 deletions(-) >=20 > diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c > b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c > index 4336604d0d..51aa93c2fd 100644 > --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c > +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c > @@ -393,7 +393,6 @@ OpalHiiAddPackages( > ) > { > EFI_HANDLE DriverHandle; > - CHAR16 *NewString; >=20 > DriverHandle =3D HiiGetDriverImageHandleCB(); >=20 > @@ -416,15 +415,6 @@ OpalHiiAddPackages( > return EFI_OUT_OF_RESOURCES; > } >=20 > - // > - // Update Version String in main window > - // > - NewString =3D HiiGetDriverNameCB (); > - if (HiiSetString(gHiiPackageListHandle, > STRING_TOKEN(STR_MAIN_OPAL_VERSION), NewString, NULL) =3D=3D 0) { > - DEBUG ((DEBUG_INFO, "OpalHiiAddPackages: HiiSetString( ) failed\n")= ); > - return EFI_OUT_OF_RESOURCES; > - } > - > return EFI_SUCCESS; > } >=20 > diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h > b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h > index 8b368fe995..e137a55810 100644 > --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h > +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h > @@ -285,17 +285,6 @@ OpalHiiAddPackages( > VOID > ); >=20 > -/** > - Returns the driver name. > - > - @retval Returns the driver name. > - > -**/ > -CHAR16* > -HiiGetDriverNameCB( > - VOID > - ); > - > /** > Returns the opaque pointer to a physical disk context. >=20 > diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiCallbacks.c > b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiCallbacks.c > index 31e1aa2240..1b6f067076 100644 > --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiCallbacks.c > +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiCallbacks.c > @@ -115,18 +115,4 @@ HiiDiskGetNameCB( > return Ctx->NameZ; > } > return NULL; > -} > - > -/** > - Returns the driver name. > - > - @retval Returns the driver name. > - > -**/ > -CHAR16* > -HiiGetDriverNameCB( > - VOID > - ) > -{ > - return (CHAR16*)EFI_DRIVER_NAME_UNICODE; -} > +} > \ No newline at end of file > diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormStrings.uni > b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormStrings.uni > index 5f753dfa8c..44cfc80626 100644 > --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormStrings.uni > +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormStrings.uni > @@ -20,14 +20,14 @@ > #string STR_NULL #language en-US " " >=20 > ///////////////////////////////// FORM SET > ///////////////////////////////// > -#string STR_FORM_SET_HELP #language en-US "Manage= Opal > disks" > +#string STR_FORM_SET_HELP #language en-US "Select= to > manage" >=20 > ///////////////////////////////// MULTIPLE FORMS > ///////////////////////////////// > -#string STR_OPAL #language en-US "Opal" > -#string STR_MAIN_OPAL_VERSION #language en-US "Versio= n > 00.0.0.0000" > +#string STR_OPAL #language en-US "TCG Dr= ive > Management" >=20 > ///////////////////////////////// MAIN MENU FORM > ///////////////////////////////// > #string STR_MAIN_PHY_DISKS_LBL #language en-US "Physic= al > Disks:" > +#string STR_MAIN_OPAL_TITLE_LBL #language en-US "Allows= user > to choose drive to configure drive security. User can also set storage ac= tion > policy for use of the TCG Block SID authentication feature." >=20 > #string STR_MAIN_GOTO_DISK_INFO_0 #language en-US " " > #string STR_MAIN_GOTO_DISK_INFO_1 #language en-US " " > @@ -36,13 +36,14 @@ > #string STR_MAIN_GOTO_DISK_INFO_4 #language en-US " " > #string STR_MAIN_GOTO_DISK_INFO_5 #language en-US " " >=20 > -#string STR_MAIN_GOTO_DISK_INFO_HELP #language en-US "Select > to see Opal disk actions" > +#string STR_MAIN_GOTO_DISK_INFO_HELP #language en-US "Select > disk to see actions" >=20 > #string STR_MAIN_NO_DISKS_PRESENT_LBL #language en-US "No > disks connected to system" > #string STR_MAIN_NO_DISKS_PRESENT_LBL_HELP #language en-US "The > storage needs to be connected before EndOfDxe" >=20 > ///////////////////////////////// DISK INFO MENU FORM > ///////////////////////////////// > #string STR_DISK_INFO_SELECTED_DISK_NAME #language en-US " " > +#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." >=20 > #string STR_DISK_INFO_LOCK #language en-US "Lock" > #string STR_DISK_INFO_UNLOCK #language en-US "Unlock= " > @@ -69,7 +70,7 @@ > #string STR_BLOCKSID_STATUS2 #language en-US "" > #string STR_BLOCKSID_STATUS3 #language en-US "" >=20 > -#string STR_OPAL_REQUESTS_LBL #language en-US "Opal > Password Requests:" > +#string STR_OPAL_REQUESTS_LBL #language en-US "Option= s:" > #string STR_DISK_INFO_LOCK_HELP #language en-US "Lock t= he > disk" > #string STR_DISK_INFO_UNLOCK_HELP #language en-US "Unlock= the > disk" > #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" > diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordForm.vfr > b/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordForm.vfr > index d802ef305d..773d349c2b 100644 > --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordForm.vfr > +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordForm.vfr > @@ -45,7 +45,7 @@ form formid =3D FORMID_VALUE_MAIN_MENU, > endnumeric; > endif; >=20 > - subtitle text =3D STRING_TOKEN(STR_MAIN_OPAL_VERSION); > + subtitle text =3D STRING_TOKEN(STR_MAIN_OPAL_TITLE_LBL); >=20 > subtitle text =3D STRING_TOKEN(STR_NULL); >=20 > @@ -174,7 +174,7 @@ form formid =3D > FORMID_VALUE_DISK_INFO_FORM_MAIN, > endcheckbox; > endif; >=20 > - subtitle text =3D STRING_TOKEN(STR_MAIN_OPAL_VERSION); > + subtitle text =3D STRING_TOKEN(STR_DISK_INFO_TITLE_LBL); >=20 > subtitle text =3D STRING_TOKEN(STR_NULL); >=20 > -- > 2.16.2.windows.1