From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web11.29481.1658762930160418150 for ; Mon, 25 Jul 2022 08:28:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=RZFX4+KB; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: guo.dong@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658762930; x=1690298930; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=xB8mI5C9e/mfXInGktIBG/DbzdZArIxIzjIlA2kVei0=; b=RZFX4+KBwkBNK5xN/VaGTiuiiHwMweTOnM3+tMbRtnoiEWGsLTOjiG0z JT4GA8rmi8qjMtOJrtNFiRcDE3NveF0tMqY1LDJicDH9qNvULrwMDfxMs 8/3Kzpb4Dh/ZrwKg2MCNfsIYHq2bmIILYzxWxfwqXd4h6u3LzCk/rSAOv /iZ+nkBLhnK5lqIjKxf+DlSs/KcihG5duTziy7PdjJYV27RpewUyGBW4i 3sbUCP+hYcuG1IqXi2YChfBWEjdi/fum9h2TkphMwYV5UYBx7nXjm59mY VVuRRqclhycPoUHK2EwSo2/SIdD089D+YZScIvSlWi3K29W97hx8TH8zi Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10419"; a="267497334" X-IronPort-AV: E=Sophos;i="5.93,193,1654585200"; d="scan'208";a="267497334" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2022 08:28:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,193,1654585200"; d="scan'208";a="599642133" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga002.jf.intel.com with ESMTP; 25 Jul 2022 08:28:48 -0700 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) 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.2375.28; Mon, 25 Jul 2022 08:28:48 -0700 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by fmsmsx607.amr.corp.intel.com (10.18.126.87) 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:28:47 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx601.amr.corp.intel.com (10.18.126.81) 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:28:47 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.100) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.28; Mon, 25 Jul 2022 08:28:47 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kXwpb0iB/2Db3CUZslGmHxh6sLdrDuvk+Ihj5MOIaH1z7Xgq7XeRIjOHNgcFRqkkPZHSYtAUhlm3b/ymsVr7HWnJ/rWVKeNCLvkzROPcEIbVWnO7Zqrrv73U2dFSQOBACyUUXc8Q08vZAhlH9wJu9cfQ3DM3t936EU8KYGj0rMh8SYs3O1Vl0TUzXedzsLOizNDVokwJ90Sne3kG6YyQQmun1Q295/k5cr56kGVIDba8YJaEXHcTC1+MXvlSsOn8hAL39EvcxIeTImZOqZdZnPjfVApyHO46JuUdzheDHmTE6yAiiC63gEXWN3saUwBud1DCusvS6D+N/cOAx2TI3g== 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=mrd17Ckr/nfd1cLQunDcuvQA+UTLaCbiYnnTke8krtM=; b=buJ2gRMdBI9LTSOg/gLm5PiGf5dwJTsdJ1Za+bbL+OfbWy7jz5q6cdXA1lJONjYsx+BJC+1LBaWA4ioOCPEiMFSGSev0MtWRWHYnm19LqKoODjTldyaGB1T5CXmwzA5RXFxcEy+tC3L7emawySHzlDgVvqsgrlQOYUwcIZNElAQkJFfLSglbLXFvjTRxM/00DMKSV3IK3Z+eBPIJzvOMT/35rZ3cBJr+lFYcXlqKNXp98KxXxdWdc+/M+hMPW3wNz1XC3T9r6YBOhR120vgbXrcZF7NwujD27GIbgfoLLMJkiYooGJrNeKmTzO68Q0h8IyfIP7WVTw5BvAY4mjRq5A== 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 CY5PR11MB6260.namprd11.prod.outlook.com (2603:10b6:930:23::16) by BY5PR11MB4039.namprd11.prod.outlook.com (2603:10b6:a03:18b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.19; Mon, 25 Jul 2022 15:28:45 +0000 Received: from CY5PR11MB6260.namprd11.prod.outlook.com ([fe80::c1dc:5921:cba3:75a0]) by CY5PR11MB6260.namprd11.prod.outlook.com ([fe80::c1dc:5921:cba3:75a0%8]) with mapi id 15.20.5458.024; Mon, 25 Jul 2022 15:28:45 +0000 From: "Guo Dong" To: "Hsieh, PaytonX" , "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: AQHYnZjzDrJH1GA4KEyZvkQbW2UvMq2POzwg Date: Mon, 25 Jul 2022 15:28:45 +0000 Message-ID: References: <02f3399465bbd4313bc78511f7a188cb6699b732.1658473167.git.paytonx.hsieh@intel.com> In-Reply-To: <02f3399465bbd4313bc78511f7a188cb6699b732.1658473167.git.paytonx.hsieh@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.6.500.17 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: 70de9c61-7e55-4b9c-986c-08da6e525ce4 x-ms-traffictypediagnostic: BY5PR11MB4039:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: i7SEbHGH/pMyYhA07ihZW8z82FWPM0ntr2zetm1tvr3NVt67XAIEGh+bMDRPlipCNRk7T4B6QI7hgkgNxtI7mPdUcO5o2JVXDXpZ0GY91QzN8CTxA1rLHDV4AAw2QYe0h0k4uPfGgZQx+o9q0Jv77Adcyisb5bXtdFPUXN5GdOScN0WYBR7ULJNMPcmzXC+7xA5Zu+rUwnvikwas5xw4sgHXu7XYOGf796tdpBhrLEB9/LTPm2t+B5hCKdjw7N834Iy7zP/vwXSmvEySLn0/jEFwt2AlG4RyY9RPWGv26QNrkVcJ/d1g4jfFUe5sgN8U/APDIYS6lsUlyr23FPu85smj09qbmi4sIU+Bz5pkNBF6WtgC27JZBEQ3+k02hhVIV/BR7Zbfvz/Q+4NkRvGXmm0OU6CqT/t6QSFtSPKQIySkx6CZMhab9b/c0dzqHvxcnqcsMSNFO+fv19A1O+IBd07YlSSfd4DVAqDfQ1V0j2m5hYwPLd8ZsleuJIqebGkpV/FDiY0iq0Jrb+RoMG1/oKIcR7XOpL8dQdvYUzH8SBiXmeBmEzOw2DIlVhnxuEprSm0RJl6RDRgIaiEP7H8mFNEx19rC94NLxL9AywPod1ocl6BMfaFHNk3jyA0PtHXmp9w2CjjX2ngyw0nImrCtU+e4yumor4bpTg2LRjblhvN+fFMv8nm/abLXOQzD3Z4lk+ViQ0yv7pqBgTFEWgZt8U4qhsoMmX/LwmZ5ft7P5Hw8/xiy1LADNoOdR0hL0qUpKXlUfPEXw63py50TJn/29STqULRPx8nZ1In2tDhJ7TjSVLAAtUVY6oGrncBOLCUnLYm/qAFoeiV/XJ/+G+E/vQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY5PR11MB6260.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(39860400002)(366004)(376002)(396003)(346002)(136003)(186003)(5660300002)(71200400001)(83380400001)(52536014)(66446008)(8936002)(33656002)(478600001)(76116006)(66556008)(966005)(110136005)(38100700002)(9686003)(6506007)(86362001)(41300700001)(38070700005)(4326008)(7696005)(82960400001)(107886003)(66476007)(55016003)(66946007)(8676002)(316002)(122000001)(2906002)(64756008)(53546011)(54906003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?+qSwS4g+mPU0Ie4e2Xvr5IfpkTUTp80Ir867Px/3uklty5Lo4zvtQQCvlm6b?= =?us-ascii?Q?n1xPQC7P8KmqCosvEeG8bZKbnolQ531LvcUrUccmpgv+fZPyO5Vi+sOGy7BC?= =?us-ascii?Q?x8acYgcch9/RMfx8ba8J92J0O6nCr8QWIjfssBgod01svpleWBsNFfvB9M9k?= =?us-ascii?Q?PYrRiZcJwm4WHAW2oDKFvbwYokWATOSPcqrYwld3RM5tRl5qVXq/dic3ktVs?= =?us-ascii?Q?NMN2pshLMDWhcHOqtWJ0aN8C7FgEbXopsi08vqGcVhnF/u533i6nJ7oTzgCE?= =?us-ascii?Q?NNUwtsYePqHCTWHXbJGFuFVNblHcPaplpOVW661VvS6STCScW2zE3VrKtinp?= =?us-ascii?Q?k5RiTrabvF74dlE0eM8IfNIgEkfK5TqPQpjoE4HoHIgu1NJi3Cd8ZUgS6F6d?= =?us-ascii?Q?dgb96NofcLAMoUUJO1tHc2Nyy69x6rPx3xL8uqhx+DnhzCiufrxShjGNz0IH?= =?us-ascii?Q?0ndU2C1MgiOlAUf8P295f+mUQH/29r9jQQMrhLPaSkemnUWcHPfDgqS+rycB?= =?us-ascii?Q?NkC/JL5bMUgWohmRw4tyceZwM5CjdBq8RMTnuS8oOM1nLhMccP8tKCmdZgjI?= =?us-ascii?Q?g103qq3M4Pzgtub//shHCk/44lPh68V9Ov7zg2AalS+W15E3q3534XQJ3O4/?= =?us-ascii?Q?GaaA2nAq7skAxd4CEgsYvCCm9FV12XJUXSoqgYXCzJnIZ1J4DGggO7F2+tRS?= =?us-ascii?Q?2maxV7rWRDH5YvKni257o5agV5KakLu8iOPAzLgVFlTdMSEgYXxCn1/gANbw?= =?us-ascii?Q?SmDgCossEBQjVAFuTpwkFsL1+c/QhUKZkW4HS4R3YG8wIAcQ+N8JXv2XFMLN?= =?us-ascii?Q?vYzrs63sD+o+h58/zuVEQNamMK2SNehHV2cAVXgpRwqbnX8zO6DCeDEMdjwb?= =?us-ascii?Q?WiHh8CO7iNWSBzkUxjDROrV24hmJdMT922eQ8tmhIW8VgDDCnqjOFtDi1wx3?= =?us-ascii?Q?LSz6jaYIH+85aErDRTVMJw7r+G0cgvcE2mRBM0bCg+jnJjY9+O83bK11Gxs9?= =?us-ascii?Q?I4aWySHVMitdO0bMbKaqSpvi9YONAiBiDZ85f/HHs5KLSdJfCO7N75aKcjfm?= =?us-ascii?Q?x/K2CzErrq3p6zCGiU+8pZxPGjCKU6E5mysYbNUbtGN1xu8522C6iSIEuVmg?= =?us-ascii?Q?RihCmnsf4DWJIHTft+HWpMgrE38XW+kEZR1b6GNcyot2hAWOwty2axOziLZc?= =?us-ascii?Q?ILiGLfSO0RF9P7LErRzoD+Ou+yT9Jlr6+XTNZ7wJI1KBWJZhUOjVIVjIGene?= =?us-ascii?Q?eihg15pnptqhAb6q6Fr3OresZmnKSmkbeSYZ9Y/W53OrgwwevZBI5+uHm4Dj?= =?us-ascii?Q?XMeiRSEF9yl/XoNbQV0gthiyaeTwLaa35PauWBZ7iKEarzAvee+xva6OfrpZ?= =?us-ascii?Q?r1PbZH6EoUFNV1zxXwTBigHz8WT+Xw/laX2kJmvqNA7CDsGAz5s9yB/Xlu+i?= =?us-ascii?Q?Wy3vQLGVWE+Xiv47liAvSNh8wIjShgFVbe5ilcFvmWYEab5Dq/HlZ7QFhbbH?= =?us-ascii?Q?IXVzpoKiE7dNRb0gQ6FJxwb2MzvvM2YeOBaCMtCDvGTcCBQdaM/4X6TJZzmx?= =?us-ascii?Q?sZB3+9DjDyz1VVhvdnXaMyqD0E6QCpc3svro4kmhBDAOI0uftp9WoAmGEc2I?= =?us-ascii?Q?im/qjP6kP+IBoThocHqhaxGGYYDBezYz9Z3NkJ+VQuiZ?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CY5PR11MB6260.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70de9c61-7e55-4b9c-986c-08da6e525ce4 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Jul 2022 15:28:45.0736 (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: xdmTibyWbwm1eLABhOmkNxwcMuPymFgCopmzpR3ad0VBwTH1emQM7vWWvNAsyEvRVXqB88+9ZKvFx3NEIgzORg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4039 Return-Path: guo.dong@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable 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