From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web12.29733.1658763919067830775 for ; Mon, 25 Jul 2022 08:45:19 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=V7sctMHS; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: paytonx.hsieh@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658763919; x=1690299919; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=Zwi2BhamkomK/2hHoYI+uFxg+x6en2XKFCBKwPsInq8=; b=V7sctMHSzvdZavAIL3btjcgyy6lgxxSKzAk6mgYpLRbx3DXcfqVk+6+r iy5Hfyt0BiabdfwBrTky2BeR1quBoqynhp+BsYi/f25pfOrUfuO5V5mns 4Lphq5IAXJDDgnlZVdvYPtLO6dcAxkEE4IS9Q9an3tAa0WZgEInqH9aFE QxQQea8YRyBoOI2j8L+ie5kTZuOsaR1wy/xXUn6QZjddVmYmCy4keVJhW e2YjZRfdElbMLue2G67NfOFfrzSiCYyVdOm4zYpdk/mPgvv66kFlOuOV+ FVVzPN6HwpreKftmJ5p3TH372ntYhW1zAEYClOH9eUUPHSPiAu884EbPw Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10419"; a="270763565" X-IronPort-AV: E=Sophos;i="5.93,193,1654585200"; d="scan'208";a="270763565" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2022 08:45:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,193,1654585200"; d="scan'208";a="627505170" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by orsmga008.jf.intel.com with ESMTP; 25 Jul 2022 08:45:18 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Mon, 25 Jul 2022 08:45:18 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx609.amr.corp.intel.com (10.22.229.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28 via Frontend Transport; Mon, 25 Jul 2022 08:45:18 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.100) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Mon, 25 Jul 2022 08:45:17 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ShhXVQ7vHvI4Kl2RDLSvcsGBr1i2OZy46Ifsc0qzCwKLwcmAtbDZF7rCJhYTkuJI9S4bu7pI4HXC+EpHy6uCNJDbgJmKPyq0ymjYdhPpK+yhaZEQhRTSwcKQho5fck22uKUsWkbupH5fwqY+moMQYZ0KNbq6+wNkKSR17FaIg0eV2ayEsBgCwIjyq8NjOAHjju1u2Q0LCULTYFsyFSwBam7ohW0+lKA/MZlLgRuDmVFl5KaUwvvOXxhFYJwbRFRgZXylwVzXL1qGChTSI+yxVceOiPGDQlT14Hngp2fabww8tKvre7hyDk0EXGfWxHDj97ki2U735hu0POKHr4JApg== 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=Ro9d+au1LauqfKtkUJp7RCV+e8oNA6uXV+ywRkBxIBs=; b=D56q3uDIHCvJH0/MOshuUgGTq8ofYp7h6xDUDzt6f8M7L7+Wbb9fZr5ikSww1FqjM3iuyL18gwBc/Rap8RyqWDo3qyYlw4yOZavBR14UD341fC56z9G7DFub0q6R4JNtYs5jXARj/TLG7J0DXiLYBYAvoqwomGeMWgSw0HAPwX2P62eei8xt5qS59NbCChmZ46TxSqGMEDnwFDczaavpQf3a63NYOUY3Y306F1TcSSz7sqk+DTHbBOMBugf5ybrMFmK4edNPH7JcvIu7napyGK1aAs5txzBstb/+lqppibDxMezMzzWzDl6mC/ZZ65hDlXhwl8QUt4DaAESgTAZ7qw== 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 Received: from DM6PR11MB3803.namprd11.prod.outlook.com (2603:10b6:5:141::30) by DM4PR11MB5533.namprd11.prod.outlook.com (2603:10b6:5:38a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Mon, 25 Jul 2022 15:45:16 +0000 Received: from DM6PR11MB3803.namprd11.prod.outlook.com ([fe80::4438:ae56:58bb:31d4]) by DM6PR11MB3803.namprd11.prod.outlook.com ([fe80::4438:ae56:58bb:31d4%6]) with mapi id 15.20.5458.024; Mon, 25 Jul 2022 15:45:16 +0000 From: "Hsieh, PaytonX" To: "Dong, Guo" , "devel@edk2.groups.io" CC: "Ni, Ray" , "Lu, James" , "Guo, Gua" Subject: Re: [PATCH] UefiPayloadPkg: Add macro to support selection of CryptoDxe driver Thread-Topic: [PATCH] UefiPayloadPkg: Add macro to support selection of CryptoDxe driver Thread-Index: AQHYnZjzHdpKsRuIkUWtRScxyjxyra2PO0KAgAAEcSA= Date: Mon, 25 Jul 2022 15:45:16 +0000 Message-ID: References: <02f3399465bbd4313bc78511f7a188cb6699b732.1658473167.git.paytonx.hsieh@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.6.500.17 dlp-product: dlpe-windows authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 23e990a2-3b1f-421e-0fa5-08da6e54ab8e x-ms-traffictypediagnostic: DM4PR11MB5533:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9KcPmzdbpTEAbCcaCNgDkkaHXTH2+YHmyCxAmEx7z1bCB402Vqnq/dTWGanvZf5jqAKpXfNHSKiHf+J+3j2Y2Vbe+ncp+crB9Iq/WY1Yq9sQ88rdakV833MPHVmrDos6dFo+/1JiCk9qYVnhTf22y/ioZ6+nWWowCkyc/mTYMhPG3FKdF3g0ot8t+6YeGi6WXvDCoIha+sXkUlNMCFA0KqZPeXDEAbOCSGtFLwd7qn3CJPOYUQzxNBdNd63wSj4bg1MdOldKidYrDnytZ5HpI7uVxnoKCtEoMtnybZDEY2QCIr6atmQv/5G6blHo96zz/QxehSg4HTYgvOMi/+r9JFwhvJu7y6NL3E4Kh7Ub6zxcSJiESKgNDrj3qN4I9CD3kuPXPaPI586UisefBYk8KGpHd5WbDaBWyGKfja0n+Hrvg9y90slw+e3xyVF+hAm8Z4DNyxcobbMMcFkyW2HBFzHUIuh56hJL81Pn3wTk/AON3p9g926XaT2QXMvmSH/VKx0YvPHRKb/iQDs7YvzMKXFmFg3efkiVfDjMjRpPzjW1HZSJhjwDXjOS4E0Dv1aF63/d64Hjpt3B0xewTYZEECrjgtTR9ZdAux5gyoqUz5dETE6qNGwqI36lQCXqTWb+coER13KN1y54TTUePafmAC++IfCOyXVKk31TTlGJCDyCqyq5n9zdAe+sw9vYWVKkbYDYIdombX1N7SBQSVpX3oMQMFaLBSpCgsAYDf6dpZcScdLFDqb+h9G8zvog6RkcsFVxQUOdo4mv9f7nrhFgsjA24mOfS2T5kd75wQNIPgfJwKPTa0W8lB6ekTM5kGzY5Ppai+8dMZ9na8rxVBsTHTko0cA+GVB4utUzw9DH7llm4+HzrJky8GIaXh/795sv x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB3803.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(136003)(39860400002)(376002)(346002)(396003)(366004)(966005)(478600001)(86362001)(7696005)(53546011)(54906003)(33656002)(82960400001)(38070700005)(6506007)(186003)(26005)(9686003)(41300700001)(107886003)(71200400001)(316002)(110136005)(83380400001)(66476007)(55016003)(66556008)(66446008)(8676002)(64756008)(5660300002)(52536014)(4326008)(76116006)(8936002)(38100700002)(122000001)(2906002)(66946007);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?0uUFfVHztCDc/XTA5ixtqY/eMlzXA2uvZuNLMwWyHk2h1lTVt96pREtV8TfG?= =?us-ascii?Q?UI73nzrcl4lW5RwKDnhP81RnDgExXtl9O6Uee2p3RS2I8TBCaWJr7BtBPswM?= =?us-ascii?Q?9dbkeEjyhcmHfFqdMm0M0BOBwQRqEUN7BD3TqZKI5lQrzyl6g8dd00d/fPZ0?= =?us-ascii?Q?6HHBlvh8GbUQZdRC5bkz4rCTXoN0dkLn+iwPPlkfBMgudR9DwU3pj0fyR4kw?= =?us-ascii?Q?JtsFDrfdUEH6L2uomocHwXj0lg+HZevnsWN8P4Kdt2XaUhePrVoMCcbtjINk?= =?us-ascii?Q?oiAbf2P2tFmVUUGlubSPkGluJjEwAS6X4OmhTQwvkxzOu/HFgYiGXNGsE2TZ?= =?us-ascii?Q?fIXdZD4sVEZ6FbBNrY15/eo2BlH34VMqpf0AG30Dp3MjmiE4+sOmZLcQBkD6?= =?us-ascii?Q?rwAjksF2UUaCO19diEVNIuAEhIccUMSZIIS9xENCI3CEZHEw6VJtygfWNHfW?= =?us-ascii?Q?Qr/wEteONCGIm3vK4IXPnmI8HPApO1UCTdgN4MOnHPxR/T1SV9AkZU6Zcw4n?= =?us-ascii?Q?cZ5nI5dqTCfR+9Svf070roayK2pGrxUie6rJbQvVbx3mw80JNZ+5OEmlfVMK?= =?us-ascii?Q?57HvlaOIlNn0enRI1nFmr2t8ccuY7vwhUat7M0epsz9jYWUeEaUCkLHbx7ZZ?= =?us-ascii?Q?GN1Jrc3dNhpKS2hZGlssb4cIIgvs6flKxcer6T8hGb+cfrziSY0skZMErI4g?= =?us-ascii?Q?jv0/J58e36CalQdfDrXHppgjBPsM2LFwNsjSeSoRhsPi5nIGYrDxLwvoezBL?= =?us-ascii?Q?ThAmUW0HJ0QLNT4eESxubJW3YToNaz1zIWduFjufvzOO8SdaU5R4h8VsOI/r?= =?us-ascii?Q?QrVZsQeyM9fOpKkqtHlncRKDL6uemKOQg0xc2Mz2D5+TPnciqGhZxLhPLc0v?= =?us-ascii?Q?rzQydIKonDurvNbppND5qbpUgbIXS6EgqpmkzibSls5QIQupjnmnAzO1x7XL?= =?us-ascii?Q?0U41yHb46g8RSQfNTyRrGat95d5jowW/8Eb+Yw18KYODYAq0HMOj2CIsumpM?= =?us-ascii?Q?5GLMa2VJbeWVqER+IsK4ukmgNpnuBQdUucvHenk2Zg2GYxu8BMIEqMASKc6j?= =?us-ascii?Q?s/Q4Hf+fgq2hn12ktiUbkJRKQ2Hss+uLhF75MTTyJ78kKkj/SHrnyYVFa69/?= =?us-ascii?Q?kvXzDrTM2CI1WR85aTd3wX8a2yuKhTNoWwH3kgBD2xeLiB0iXu43jR76mV/w?= =?us-ascii?Q?PK3pqPuZDDxwhU/01NPaC/Vc7MBwXz0WXmQ1Ipo2M1F0tImM1IcXJkf32C+X?= =?us-ascii?Q?NhZGHZm7tO79gEpPUpGLYCwUY7yqx4j3qG2BQR+G+RI3SgAYvWRj99J0DWUJ?= =?us-ascii?Q?F5duCCSPqVuA2toWiQp9avoQaP/EN88iMmyXNW2e9xOiX4L7enbWKA8+GFBD?= =?us-ascii?Q?KBw9uYiZuxvzpocHL/Y0FSMA0rLdNsvy1bsjm4JRrtnljU+loKWVUkr2elUD?= =?us-ascii?Q?590nn3TfuaCPZu7/zTiDwwN1wEmkG6gGX9HXNFuS4x/WHY330v86EKSRVtd7?= =?us-ascii?Q?U0c+TfLEF8aaprqxjknRpktj+khhLRYQ2lMxT+sFwjUSluXrhbYCWbCVmj4r?= =?us-ascii?Q?i+t2YpBffiv/hwW43Z/tOpf4Ve1xh11ZKgWzrkmZ?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB3803.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23e990a2-3b1f-421e-0fa5-08da6e54ab8e X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Jul 2022 15:45:16.0400 (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: KnXn3/pqmm6doIuWR9McUYHVL3HDZUfBgMCAuFU7eVIJ63kOGs1Dy2VY6EC5HOvxj9tMjyRm+83MJsGc26wb1A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB5533 Return-Path: paytonx.hsieh@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable PR create : https://github.com/tianocore/edk2/pull/3138 -----Original Message----- From: Dong, Guo =20 Sent: Monday, July 25, 2022 11:29 PM To: Hsieh, PaytonX ; devel@edk2.groups.io Cc: Ni, Ray ; Lu, James ; Guo, Gua Subject: RE: [PATCH] UefiPayloadPkg: Add macro to support selection of Cryp= toDxe driver Reviewed-by: Guo Dong -----Original Message----- From: Hsieh, PaytonX =20 Sent: Friday, July 22, 2022 12:02 AM To: devel@edk2.groups.io Cc: Hsieh, PaytonX ; Dong, Guo ; Ni, Ray ; Lu, James ; Guo, Gua Subject: [PATCH] UefiPayloadPkg: Add macro to support selection of CryptoDx= e driver From: PaytonX Hsieh REF : https://bugzilla.tianocore.org/show_bug.cgi?id=3D4006 Add CRYPTO_PROTOCOL_SUPPORT to decide CryptoDxe built into UPL.efi If CRYPT= O_PROTOCOL_SUPPORT is true, BIOS will use crypto protocol instead of buildi= ng OpensslLib into drivers. Cc: Guo Dong Cc: Ray Ni Cc: James Lu Cc: Gua Guo Signed-off-by: PaytonX Hsieh --- UefiPayloadPkg/UefiPayloadPkg.dsc | 10 ++++++++++ UefiPayloadPkg/UefiPayl= oadPkg.fdf | 2 ++ 2 files changed, 12 insertions(+) diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc index 5e947526b7..862d440b16 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -39,6 +39,7 @@ DEFINE ATA_ENABLE =3D TRUE DEFINE SD_ENABLE = =3D TRUE DEFINE PS2_MOUSE_ENABLE =3D TRUE+ DEFINE= CRYPTO_PROTOCOL_SUPPORT =3D FALSE DEFINE SD_MMC_TIMEOUT = =3D 1000000 #@@ -189,8 +190,13 @@ CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMain= tenanceLib.inf SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.in= f DxeHobListLib|UefiPayloadPkg/Library/DxeHobListLib/DxeHobListLib.inf+!i= f $(CRYPTO_PROTOCOL_SUPPORT) =3D=3D TRUE BaseCryptLib|CryptoPkg/Library/B= aseCryptLibOnProtocolPpi/DxeCryptLib.inf TlsLib|CryptoPkg/Library/BaseCry= ptLibOnProtocolPpi/DxeCryptLib.inf+!else+ BaseCryptLib|CryptoPkg/Library/B= aseCryptLib/BaseCryptLib.inf+ TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf+!= endif IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf Open= sslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf RngLib|MdePkg/Library/= BaseRngLib/BaseRngLib.inf@@ -421,6 +427,7 @@ gUefiPayloadPkgTokenSpaceGuid.PcdBootManagerEscape|$(BOOT_MANAGER_ESCAPE= ) gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1800000 +!if $(C= RYPTO_PROTOCOL_SUPPORT) =3D=3D TRUE gEfiCryptoPkgTokenSpaceGuid.PcdCrypto= ServiceFamilyEnable.HmacSha256.Family | PCD_CRYPTO_S= ERVICE_ENABLE_FAMILY gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEn= able.Md5.Family | PCD_CRYPTO_SERVICE_ENABLE_F= AMILY gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Famil= y | PCD_CRYPTO_SERVICE_ENABLE_FAMILY@@ -443,6 = +450,7 @@ gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tls.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY gEfiCryptoPk= gTokenSpaceGuid.PcdCryptoServiceFamilyEnable.TlsSet.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY gEfiCryptoPkgTokenSpaceGuid= .PcdCryptoServiceFamilyEnable.TlsGet.Family | PC= D_CRYPTO_SERVICE_ENABLE_FAMILY+!endif [PcdsPatchableInModule.X64] gPcAtC= hipsetPkgTokenSpaceGuid.PcdRtcIndexRegister|$(RTC_INDEX_REGISTER)@@ -764,11= +772,13 @@ # # Misc #+!if $(CRYPTO_PROTOCOL_SUPPORT) =3D=3D TRUE CryptoPkg/Dr= iver/CryptoDxe.inf { BaseCryptLib|CryptoPkg/Libr= ary/BaseCryptLib/BaseCryptLib.inf TlsLib|CryptoPkg/Library/TlsLib/Tls= Lib.inf }+!endif #------------------------------ # Build the shelld= iff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadP= kg.fdf index 5c055e61b3..afdd6447a7 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -99,7 +99,9 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusC= odeRouterRuntimeDxe.inf INF MdeModulePkg/Universal/StatusCodeHandler/Runtim= eDxe/StatusCodeHandlerRuntimeDxe.inf +!if $(CRYPTO_PROTOCOL_SUPPORT) =3D=3D= TRUE INF CryptoPkg/Driver/CryptoDxe.inf+!endif !if $(SECURITY_STUB_ENABLE)= =3D=3D TRUE INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf= !endif-- 2.28.0.windows.1