From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 235BB740035 for ; Wed, 28 Feb 2024 05:56:03 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=r9P6KjZb1DArCE6YmLWS4ncsVtkI93e0Xz5WDId+E9w=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1709099762; v=1; b=JN4JyY6ZtrvTa2TA0AlmDuDLTKwmSUxl+h14pEHgicDIJSPwSHHv2rLygtwGJdObXjB+o+1E JWfeg56wLhJCwROwLXuAM6o+mBdJEZ9V+M3RXa7bmpV1eUmQIiVwwEZ7jG/GoPm/A5wDZ5/8PBh h1SJCcGlvkGmwHS6+d6IjIi0= X-Received: by 127.0.0.2 with SMTP id Vk8RYY7687511xcap0VUGx8I; Tue, 27 Feb 2024 21:56:02 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by mx.groups.io with SMTP id smtpd.web11.7179.1709099761899537030 for ; Tue, 27 Feb 2024 21:56:02 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10996"; a="3604172" X-IronPort-AV: E=Sophos;i="6.06,190,1705392000"; d="scan'208";a="3604172" X-Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2024 21:56:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,190,1705392000"; d="scan'208";a="7743962" X-Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orviesa006.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 27 Feb 2024 21:56:02 -0800 X-Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Tue, 27 Feb 2024 21:56:00 -0800 X-Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Tue, 27 Feb 2024 21:56:00 -0800 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.169) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Tue, 27 Feb 2024 21:56:00 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B3U8eO3QvHlesNFEMvta2GYwetZWwYVQSZaNoubt2qW7UsA02QixwsoWCCv6XrM9CopRLbHD80BnmtFry1cubSg/MirTAXu7T2XhmbGC6ss+lFP96VjWH5wEbIk4vX9nMsrkEPH28rxM/8C+gJYgaGYhC0flLLAPRzPUw87BiXOi4Hc78miPdiGEfD1SZliM2V2jMGWf4CXdraMIQ7R/O1qhkpmxMaqM37cNiU9X3arlsGEY/yo40OYFoMtF7JtYsL/cEKMPUIAFsz7RyvWO55irqGJHAH47I/8Kcx/kdi0GHSoF1Z3G+Zs8QruW/j42LMzIOPYCuLYQhpae6v/irA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1XvTZBrARHR0TI0cCD4B+P1GSyYoaEEINEUaQK1FvYc=; b=ncuQiwQW56SYjBXIbU1rqXes50yJuKVHNcxbZiw3Q7Y/CABW8y+kR9keU0bHw4IM1KacIit+FfuSTRSoKK7ZOpvF8ohsMlUh55FBue6rfMKQ4rQQueuo4HB/rVKaNFT8hM+nAY7Iq/BBXvKLGpMt/E6nyiFM/UAwPhPC0vIz3dTcC0y7JZSOg4veb8N7ZnMOHIsO5d0+KHOLHuFXZC+6z47kXFAOViOcjuGTdFbBNo4N35VCZjJPNmXKQf4rThkaOGiaeZ4m9R9pBGcpQXZr5WxghYmVVAvDlwGettSX50xqzpeHQ48zEvv+83coSir0+weMKkQpxcxpxFxBYklCYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none X-Received: from MW4PR11MB5872.namprd11.prod.outlook.com (2603:10b6:303:169::14) by BL1PR11MB5288.namprd11.prod.outlook.com (2603:10b6:208:316::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.25; Wed, 28 Feb 2024 05:55:57 +0000 X-Received: from MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::92a7:f6a2:9262:d150]) by MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::92a7:f6a2:9262:d150%3]) with mapi id 15.20.7339.024; Wed, 28 Feb 2024 05:55:57 +0000 From: "Yao, Jiewen" To: "Tan, Ming" , "devel@edk2.groups.io" CC: "Xu, Min M" Subject: Re: [edk2-devel] [PATCH v2] SecurityPkg/SecureBootConfigDxe: Update UI according to UEFI spec Thread-Topic: [PATCH v2] SecurityPkg/SecureBootConfigDxe: Update UI according to UEFI spec Thread-Index: AQHaaSj6ZO+NRhaLkkS3S1Tg1Th80bEfQoYg Date: Wed, 28 Feb 2024 05:55:57 +0000 Message-ID: References: <20240227025909.10259-1-ming.tan@intel.com> In-Reply-To: <20240227025909.10259-1-ming.tan@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MW4PR11MB5872:EE_|BL1PR11MB5288:EE_ x-ms-office365-filtering-correlation-id: 0d070e69-e91f-48f9-e3f6-08dc3821eefb x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: VgrMkLtan7WGEBd3QtOFUejmxg3wey6y75/AVWD+AW/Za0mwFSaW0SblYYDpQTlk8lXmi/CSY/dQEgIZ8g68MFCPMcFSLXBfIMx9IsWYTHWr3uCQFZ41YI1ieBBYIhIY5HzYVm1PkjiNpso3eQpuAsyxwXxx96CHZ0r6fEemJyhJn6ACHaFMbknPLa1WroRmWg5xsp5PC+VT0Yej5HChUSBThzU9zb4VT/ppIrI8Bs/sezA9wIomzUJ9jO6DJH30kEEPiwtbURbHHNtiDFctreDerQIyQMab573juYyIO9EHsg5HRyqPHu3AvsjcN+gqy5bCHHQ5QSzN1TNE+UVWXO0/5BuPcamWXOXchBS/IwuLon79SAY2UnI30pxfz+mXBcciYS1yI0qPLKCbTyj61uTHn89pCsNLmlGXfzxTBXFsCMhaoeakK7AxnA72nH0iDAGl819liP+oESUdUxGhS5pA0tVZWvcDhLRZzca0sbiThmMkEamgYrwDfeBVkIqDEEg9Mw+i/ibEGv8x6IlClTwaLSoPe8gmFiLfZR1DJ1DYwg+MEAzPlozgMXsBzoscc5W0oxNPSo+8zmDwtzLtrqforJhy7Nm0Sk7qrxbquJqBN2R7Inkr4UVQbwETULb+Uk4P7zp3wDoam2+10eewfDyQ3p0nzuF8wXK8nbXfp5sFj8lfO4RAycWC/Q+iIUIBS7hY9853w4IRvJGPmZt1qQ== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?AcgX9glrlNKBN7qsfnO2WmwnalZ+tXmLQMD+0lUxPVpe4/jX9V+9+YlQkqxZ?= =?us-ascii?Q?sttNNeOaM746ZkvKt3AKdsdbF4IlmwzbTgcfP6UzPEvxDNmcCtL4OMhtJvqG?= =?us-ascii?Q?6d1uB6++SUs2BEOKPSqtzNk6K4ogFgfNCeou8Nauh77OUtcuSGR1wDNIU+Xz?= =?us-ascii?Q?Hw+u17F7bVPsxkPNJrT3seW8k9zsXhM+bGrebMOizgC0M1lU1f8cJlux/JSN?= =?us-ascii?Q?dnWrqnlkKP6ypzQPxcVyO+EtE3rucNeb2xvVjMpIpxp/AaaIktWOtVdcnvIV?= =?us-ascii?Q?T5pqx8c6xK0oQ/q+ReEAveZa8LPaQMtEPZZU9CStIkoouI9GaY9HBzw/t+jN?= =?us-ascii?Q?owDJ4RhPCOHpwW62QuH60ZdZDc/bdg1m0as3/+Rq4SVCot0MFfSKDlXM6bU+?= =?us-ascii?Q?vVjP7qfeLCbQwh/DuVno75aR5uhtq83CL04a4sXUlT0f4BS/u/rOl+oQXY4K?= =?us-ascii?Q?ZIvEtGyKILQry/9JwdxS2Q4R9OkN857hbJnupeo74DFi3W95rQXAHN6AOgPU?= =?us-ascii?Q?PthT7AJhsNXaasC+KF00jzN39+zXVgqk9NfhrvsCt7KcinwDgnO+QLmSBJI2?= =?us-ascii?Q?Zpyavj5I3F7BvkP97jKiRMZJ6ev9H8FwcZY5G0j+WhDDmppbx9A3ZLVegx5w?= =?us-ascii?Q?Pgae44FjNhz0E7njJtAbxidZythlSnTSTKoL58ikZjrEKdWFUC/mhDPfIlyY?= =?us-ascii?Q?k4t9Z7IB0rHnDzUK6cqQAFNnbkPtktMaelaWkcSR5okZWmXtQmY7G/Ar6WiC?= =?us-ascii?Q?PnwhHC4y8MXhZY3NM3WkIs9tb5yjscrhpIhnvdM+QdnozNLtKEj5VM1uFgLj?= =?us-ascii?Q?vEQOh7zZWfwhkkgXQfpaCh4D5zP1mphWJdw8ZJGHV4naimUeVvi6Spd5D3nQ?= =?us-ascii?Q?3pEe5heElvDtd3fMh6dLJ7hEBIoX6WdfLkHvG4v+si9Fu3pSSqKxyE1M4UcN?= =?us-ascii?Q?01izmgEqXzOthDKZmqDjof4CeeqAnvcMjQnq+uREIaTDHNdti4IggsBdrx9o?= =?us-ascii?Q?zTvUVquUUR8k5xlEAAoQ82XYaTWE4vGb592NONd5TjpppRzUpdeMXsoDukHi?= =?us-ascii?Q?hd+clOXTxCmPZd2fx3U6GZEe2hVvIKm8IGI3FLUSUcr3SUAC2TSSYsRFkGIN?= =?us-ascii?Q?AwsDyXS50ThXyxAwmCIgoL/3uHquG9f9FsNTOQ325reVXHwsMj9n1fT+SAsq?= =?us-ascii?Q?+07Y/ByDI+n0J/Y2TmmO2ag+QDsyyxdtKNLsvS2iGKIsGU5FyKBMPu7czEz4?= =?us-ascii?Q?4hbqMQqblB5yso57iTeVrW3Xk/HPClpUBSUbzPePAgyNULfStnTrhYlT9UoC?= =?us-ascii?Q?F47X5XTp2cEivWN045V5VqPnuyk58oZgCvBWwpLzNWCUxt8NhpNQoSitvLIh?= =?us-ascii?Q?bGvQJ8wuPots5to/sPvAPhKGzFBp2XJZzzw1p+NEOh4s23B33GF5s6h/zcFY?= =?us-ascii?Q?wzpDa+sDgl2Dr5WuBTBW5vvM3IE4+/P3jMHUeCCh2N0JS9r9/FuiFJ9TCnkR?= =?us-ascii?Q?DJpyJsglKQfJvt1MfUVU8B8m8yYCCO0D/qaH3avAxizMfXUDNDXnQqJpXNn4?= =?us-ascii?Q?k2vZwCc3XJ+wDdhddQ39ggL58vXgNQC3P5N2vSfm?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5872.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d070e69-e91f-48f9-e3f6-08dc3821eefb X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Feb 2024 05:55:57.4073 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: yAVzWYdX1vrUJnPK2wVHcjgttoBrSpAAtXgCFa0hZJjTpp0uirqlExO4awgk5P8GX5umrlTTD3gMUs+rZ3d5Bw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR11MB5288 X-OriginatorOrg: intel.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,jiewen.yao@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: xiCmDLWY7X2jmvF3L0kzWecKx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=JN4JyY6Z; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}") Thanks for the update. First, would you please clarify which test you have done for this patch set= . Have you tested all previous function to ensure it still works? Second, would you please clarify if there is any compatibility issue to fol= low the new UEFI 2.10? For example, what if the core HII is still UEFI 2.9? would that still work? Third, because I am not HII expert, I would like to have HII expert to comm= ent the HII/Browser related change. Thank you Yao, Jiewen > -----Original Message----- > From: Tan, Ming > Sent: Tuesday, February 27, 2024 10:59 AM > To: devel@edk2.groups.io > Cc: Xu, Min M ; Yao, Jiewen > Subject: [PATCH v2] SecurityPkg/SecureBootConfigDxe: Update UI according = to > UEFI spec >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4713 >=20 > In UEFI_Spec_2_10_Aug29.pdf page 1694 section 35.5.4 for > EFI_BROWSER_ACTION_FORM_OPEN: > NOTE: EFI_FORM_BROWSER2_PROTOCOL.BrowserCallback() cannot be used > with > this browser action because question values have not been retrieved yet. >=20 > So should not call HiiGetBrowserData() and HiiSetBrowserData() in FORM_OP= EN > call back function. >=20 > Now call SecureBootExtractConfigFromVariable() to save the change to EFI > variable, then HII use EFI variable to control the UI. >=20 > Cc: Min Xu > Cc: Jiewen Yao > Signed-off-by: Ming Tan > --- > V2: Change code style to pass uncrustify check. >=20 > .../SecureBootConfigImpl.c | 37 ++++++++++--------- > 1 file changed, 20 insertions(+), 17 deletions(-) >=20 > diff --git > a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigI= m > pl.c > b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigI= m > pl.c > index 2c11129526..e2e61d1e07 100644 > --- > a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigI= m > pl.c > +++ > b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigI= m > pl.c > @@ -3366,6 +3366,8 @@ SecureBootExtractConfigFromVariable ( > ConfigData->FileEnrollType =3D UNKNOWN_FILE_TYPE; >=20 > } >=20 >=20 >=20 > + ConfigData->ListCount =3D Private->ListCount; >=20 > + >=20 > // >=20 > // If it is Physical Presence User, set the PhysicalPresent to true. >=20 > // >=20 > @@ -4541,12 +4543,13 @@ SecureBootCallback ( > EFI_HII_POPUP_PROTOCOL *HiiPopup; >=20 > EFI_HII_POPUP_SELECTION UserSelection; >=20 >=20 >=20 > - Status =3D EFI_SUCCESS; >=20 > - SecureBootEnable =3D NULL; >=20 > - SecureBootMode =3D NULL; >=20 > - SetupMode =3D NULL; >=20 > - File =3D NULL; >=20 > - EnrollKeyErrorCode =3D None_Error; >=20 > + Status =3D EFI_SUCCESS; >=20 > + SecureBootEnable =3D NULL; >=20 > + SecureBootMode =3D NULL; >=20 > + SetupMode =3D NULL; >=20 > + File =3D NULL; >=20 > + EnrollKeyErrorCode =3D None_Error; >=20 > + GetBrowserDataResult =3D FALSE; >=20 >=20 >=20 > if ((This =3D=3D NULL) || (Value =3D=3D NULL) || (ActionRequest =3D=3D= NULL)) { >=20 > return EFI_INVALID_PARAMETER; >=20 > @@ -4565,15 +4568,12 @@ SecureBootCallback ( > return EFI_OUT_OF_RESOURCES; >=20 > } >=20 >=20 >=20 > - GetBrowserDataResult =3D HiiGetBrowserData > (&gSecureBootConfigFormSetGuid, mSecureBootStorageName, BufferSize, > (UINT8 *)IfrNvData); >=20 > - >=20 > if (Action =3D=3D EFI_BROWSER_ACTION_FORM_OPEN) { >=20 > if (QuestionId =3D=3D KEY_SECURE_BOOT_MODE) { >=20 > // >=20 > // Update secure boot strings when opening this form >=20 > // >=20 > - Status =3D UpdateSecureBootString (Private); >=20 > - SecureBootExtractConfigFromVariable (Private, IfrNvData); >=20 > + Status =3D UpdateSecureBootString (Private); >=20 > mIsEnterSecureBootForm =3D TRUE; >=20 > } else { >=20 > // >=20 > @@ -4587,23 +4587,22 @@ SecureBootCallback ( > (QuestionId =3D=3D KEY_SECURE_BOOT_DBT_OPTION)) >=20 > { >=20 > CloseEnrolledFile (Private->FileContext); >=20 > - } else if (QuestionId =3D=3D KEY_SECURE_BOOT_DELETE_ALL_LIST) { >=20 > - // >=20 > - // Update ListCount field in varstore >=20 > - // Button "Delete All Signature List" is >=20 > - // enable when ListCount is greater than 0. >=20 > - // >=20 > - IfrNvData->ListCount =3D Private->ListCount; >=20 > } >=20 > } >=20 >=20 >=20 > goto EXIT; >=20 > } >=20 >=20 >=20 > + GetBrowserDataResult =3D HiiGetBrowserData > (&gSecureBootConfigFormSetGuid, mSecureBootStorageName, BufferSize, > (UINT8 *)IfrNvData); >=20 > + >=20 > if (Action =3D=3D EFI_BROWSER_ACTION_RETRIEVE) { >=20 > Status =3D EFI_UNSUPPORTED; >=20 > if (QuestionId =3D=3D KEY_SECURE_BOOT_MODE) { >=20 > if (mIsEnterSecureBootForm) { >=20 > + if (GetBrowserDataResult) { >=20 > + SecureBootExtractConfigFromVariable (Private, IfrNvData); >=20 > + } >=20 > + >=20 > Value->u8 =3D SECURE_BOOT_MODE_STANDARD; >=20 > Status =3D EFI_SUCCESS; >=20 > } >=20 > @@ -5179,6 +5178,10 @@ SecureBootCallback ( > } >=20 > } >=20 >=20 >=20 > + if (GetBrowserDataResult) { >=20 > + SecureBootExtractConfigFromVariable (Private, IfrNvData); >=20 > + } >=20 > + >=20 > EXIT: >=20 >=20 >=20 > if (!EFI_ERROR (Status) && GetBrowserDataResult) { >=20 > -- > 2.31.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116090): https://edk2.groups.io/g/devel/message/116090 Mute This Topic: https://groups.io/mt/104596915/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-