From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web10.1790.1657167027792838299 for ; Wed, 06 Jul 2022 21:10:28 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=CCuvjhVI; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: ray.ni@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657167027; x=1688703027; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=FsiKIl1FBbgOES9QgNLWQap56cHv4Twpqf/M2JGtzZ0=; b=CCuvjhVIYxL32our7lhLSJujFWl7wzDMZE0FBRTYtDcywXjgtGloDStk pTnzfhdH2wpDENWdYWhtYHToDsKb10XTInumy9lVo5SmDWoxM6bTV4ayX j1wply5NISNgLkhalwR6pDM/rZyLcSTAtYKabAlt4ifXSWgRzBcyQ1TZh MCyrK1BeqZQKZwBIAlMsKaoXXwWRaqnI9eP/B5595uqcBcLa//9cyA+uN rXAmWg72guPQi9EAeIgw3ulY5Wo48BaoO8SD9E9NWC9GtEAYMJyRjWgcL yxIBC6+vXPi/6Iv7REx/cd8CE/uumuLBO19lSMs14o4tzp1LobJ78o/47 A==; X-IronPort-AV: E=McAfee;i="6400,9594,10400"; a="282677365" X-IronPort-AV: E=Sophos;i="5.92,251,1650956400"; d="scan'208";a="282677365" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2022 21:10:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,251,1650956400"; d="scan'208";a="568347751" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by orsmga006.jf.intel.com with ESMTP; 06 Jul 2022 21:10:26 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) 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.2308.27; Wed, 6 Jul 2022 21:10:26 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Wed, 6 Jul 2022 21:10:26 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.41) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Wed, 6 Jul 2022 21:10:26 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aIQ7GSCdp9PRJG81v3Scas+CA5iKigWVqDQe1Sjpm1Up5Of2VcEsyFqLV84hYfhnt5puEmY36R49ttPA+O9f3Cvs0mQ5M4RlGo1wISul+c4sM3GzWndvpDqnvIp98WRIolUxtY1n5f4TyMeRChGm85LKu0zXCrltlH8zsxuSRvVO5pH7iCKnupg3jxGDdpU5+d89J1MScMlje0lWqI1ntxpBSg5FLJIIviPTs04caaS+E3WsgBBFhvyetYucS1eWs8jVOVVjVYpefX+wd/kBIeu8o0MRX4P1TEM/y+VtVpOeZtDmnAmfZbWN+3BzXz3+wT24qxSPIW9MU5LK84ZgZQ== 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=8E++717BV0H0MVmg2HRXV4glpYVwWmK1c7KcvLq6P9s=; b=P+s7t5ff93RN3bXtZ5I++9V9XvpfJkC415kAct4wLTYU/XRWaJFQKlrIolHL0iX9VSegEfISmJ+l7uTSa4rMXiE8ACgXkEJCmizh8f2GWeD5TA8G2rMcUduBaVRf/+2BM7kgr2Lg4jFC+rkUy+p/OmupPZYf1/ObTUmw1JvxsGUY3ebwzqFzWgUH9QsA9hjQs/ppp0UHnu7v/dOuBe641TrKuPTaa6vkQB54NRgbZLa+jw8JzyvyVRLr8qSZCOv7R7dSy5v99/gnUCoqIbwdsz2NxD86uFIvUJXle/H4c3KBP86rhqBxc8BdP88ceermuT70nEKJWPV7T9R3dPY1xg== 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 MWHPR11MB1631.namprd11.prod.outlook.com (2603:10b6:301:10::10) by SJ0PR11MB5677.namprd11.prod.outlook.com (2603:10b6:a03:37e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.16; Thu, 7 Jul 2022 04:10:24 +0000 Received: from MWHPR11MB1631.namprd11.prod.outlook.com ([fe80::991b:97a0:7836:5174]) by MWHPR11MB1631.namprd11.prod.outlook.com ([fe80::991b:97a0:7836:5174%10]) with mapi id 15.20.5417.016; Thu, 7 Jul 2022 04:10:24 +0000 From: "Ni, Ray" To: "Hsieh, PaytonX" , "devel@edk2.groups.io" CC: "Dong, Guo" , "Lu, James" , "Guo, Gua" Subject: Re: [PATCH] UefiPayloadPkg: Add CryptoDxe driver to UefiPayload Thread-Topic: [PATCH] UefiPayloadPkg: Add CryptoDxe driver to UefiPayload Thread-Index: AQHYkapWt2Cz7gocpkCZuSdf5pijrq1yS2+g Date: Thu, 7 Jul 2022 04:10:24 +0000 Message-ID: References: <1f79d8efdb7d4e0b8dfc923b259009e19ebc136e.1657161066.git.paytonx.hsieh@intel.com> In-Reply-To: <1f79d8efdb7d4e0b8dfc923b259009e19ebc136e.1657161066.git.paytonx.hsieh@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: 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: b0444df1-6b9c-4cc5-e136-08da5fce9dcd x-ms-traffictypediagnostic: SJ0PR11MB5677:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: t005L4t8ENxTs4j+UFnGCIkMPCwiYEEEEzG09dGto8GQIotASntNw+WJ58jfZoLBbaN2rAn/RnWWgDmbzKK807iQFQtwfCnio3YZbUUEC+fcgJTqEceYtZeLNgRWSfNA4i5tCwOGHRIGUqiLSSmSQr43k8gaiJ3jW21WHJhNM1oKMEBXMgBBJQiW7YwGQ+oPmrGgCS0zPcJHlucPRMCKysq09rj+VFvtyWZYfwRlbuVX3DeeWGzjPc29+5WwFfxbb0YPDbCWo1PWU4Y8DymehIQkXiK/jMsI1faWFsaE6bfsLzyjQMFgt8sXUWuu1yOZNoVRZpJEy0cUKP5e+N1IRvdJfteKppyb410VjAGf3qi62vEsBhlcj7a0myVu36fx5hEDvllRkMHAzibMhR2/HXtIIEOqtkEN2Drox4j6jxAGVmzgb+C0Eu7fILxtDXwh5/7w2iapxh+YueN/BAh4Zza64BH2EwQ6PTgwRd6IStftBnKzaCEzFlBJKadg4WdsW4oFBfyf+CqaNbk8JsmydHTun5XTSQi36xvESszIkpRueuLTSx5v41jUUjDfT2b9tZYrANk2PNt6gmdCOzb71X0m8U5BoskMC3lndAruoL7AISPc0NhQ+qAvBJkv9SPMCbL3z1u72NvUmKZw9lKgt7nOd5/wCQ69/K+cEMUMevW/Udmw4V4i7O6/3AXw2AnsEepWAnz/dFGFBXhlf1qxTjKoh0L92Vt25MHnctbncwAg2Rwn6nmet7qqeuyKoO9r4ekpvKPL1LfmT9qmQ3VL8URZmnBd0qqozS7hTlPk9atYBU4weV9ta7dfQpuZU8bPFCSsnEMoCYLkbv/bLYuUoe2R0wkrahITF/kwcRiFZrY= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1631.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(346002)(396003)(136003)(39860400002)(376002)(41300700001)(71200400001)(478600001)(52536014)(8936002)(5660300002)(86362001)(38100700002)(966005)(316002)(2906002)(66446008)(66946007)(8676002)(76116006)(66476007)(107886003)(186003)(66556008)(64756008)(82960400001)(33656002)(83380400001)(26005)(122000001)(38070700005)(4326008)(110136005)(9686003)(6506007)(53546011)(7696005)(54906003)(55016003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?FpiaIBkMMNbZl9WzN+eVHW6UnicZGAfjYdiS3Q3uQesoNTd8ggUMRuqUdpXK?= =?us-ascii?Q?EGG5h7Zxn4WIk9NJMlIjQkZsi9CSAnu2GRKq/w8g0AzIJc8HWaGE18EPOSE1?= =?us-ascii?Q?8fYPdsdZg6XUwY2wII7/cSNKCf8CLdosG4T0dQC5HcZfzVY0Vmjb9jyMdO6K?= =?us-ascii?Q?vPeO5SpSKmt4cxUjHHEGp4exHdNwLmni7JbakRLNB5uT7m9XHAdJJ7GYy+8n?= =?us-ascii?Q?zje4kc1r4U7sEh7cmU/q2mHMXq92gCO8NvsCesBYU2wpz8nE0w5oZgn2hHrF?= =?us-ascii?Q?6Urbja8VxWCfJ4eb7TDVc1pn20r90Q6sx/h1O0kXl93FKOrzbsQ6onxxTICd?= =?us-ascii?Q?VX4gQBcFhtFOIYscYjLu1JXAEW2q9n5PLiroyp+/6a3WBI4MpIDkdpzpeXVJ?= =?us-ascii?Q?1E5rTY6AMHrHWcuKh3Q0Bl5ZzZo+2t1X7RmW7TziXNe7a2oL8/62STb2L9M5?= =?us-ascii?Q?A9kCYneIsxC+dQZb+g1wHOQGQZ2R8Xa/s4hVannNMVWl8siSGT8iaEDiE48F?= =?us-ascii?Q?Fyg/l3JVdMOiUff5HyAQYvgWYNFsiH46BVoxNPPWU/dhusw7MisPMv7pWafR?= =?us-ascii?Q?ek6LsPn7xdjDWe+181Bbe/TOioybp9WO0SfAz7/PzoeNJjxFrNkhzTgqI5fg?= =?us-ascii?Q?CJnjDDQHmGcOeD7Gph3rVU3YbTVtswi5OWCZhXVj7YhFyqQc/bpxJsqNBXz2?= =?us-ascii?Q?mAkCYfPdZSCZiJelG0zppxUbuM2ghB/8+fUyqyA8QST9SWX0nk67ljxbwbKC?= =?us-ascii?Q?pZ7bTlMG3tEZ0GSWOzQ/GeY3biODJ7UOhL3GGuQC0Yen/nwVuaR6CeSWKfY6?= =?us-ascii?Q?aIE0XAwbxADACHo9KRv8tpjGRomDChmi/Pr+hZxasPyMeLc4GSgCE2TQVq3R?= =?us-ascii?Q?qgCnekfGiZd5GbgRijNiqBd2llLGC9VkvO8quKh3FMWroPvoCvOVYyFutkx/?= =?us-ascii?Q?rv9ekVxBgq5le9UgW8fPWRNVJszdyz/0L8rKHfF3JUDJzPLL1lsbOAfIJTzF?= =?us-ascii?Q?ebC4c4TqU6NbdWsuXPk0lW91Vncsei5yn5W0C1OCRQctIUiO37l/edbnnDSw?= =?us-ascii?Q?dE2AQl9UB5dew1MLaItT1q6g7l1i2b2d1FJB3bbLdhJnNTChSvn0Ik/tQdDe?= =?us-ascii?Q?qJ/HCNEK+x3GVyHBOlMTPXXTAKtW4vvmSa2F127CPbhnAxsU4oa5S5zR0TMJ?= =?us-ascii?Q?yit65sTEJMCb5u+IYnwuyVM6I75QgNwgpyKyvdCagh0OMn2nKSjy9tfrSXpC?= =?us-ascii?Q?XGWF+RViGu3+SmdVE93ClpuR8FPp+T7sT4PDECgJGnMM2o/5RuRIUNh6mkyk?= =?us-ascii?Q?EgvRwLo0uxo9D4RnzAiq3eyiuFYmVU9QW2XjZcHdeGXnq96u2y/MLTTjHHkj?= =?us-ascii?Q?a3gLz/rwXRqorZnDtv1m56F842RMd6i3ScA6iFfJaDaOtuwDJdnyTvKS5epu?= =?us-ascii?Q?HIqSOyukSHcTkW2diNPza15Zz/Mzc9qvWvOgk5hDkA5V4EbadkEBX17kgZgA?= =?us-ascii?Q?PINjjZJECAh3N1EcIu1hqGjWpomxcViOqjBHZcQlZ1tKP5MCPQf2fA+yP6Ac?= =?us-ascii?Q?VA2To+zvhvEktV+3r70=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR11MB1631.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0444df1-6b9c-4cc5-e136-08da5fce9dcd X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Jul 2022 04:10:24.1294 (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: pxVOKQ7jUY441wM0fDDcEBX2h7PCnClyIxO4TNvPhctu5CI9llkkfLQz2gUC9MmoVbd5GND6My6nyn0xEJBI2A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5677 Return-Path: ray.ni@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Can we always enable CRYPTO_ENABLE? If yes, can we remove the macro? > -----Original Message----- > From: Hsieh, PaytonX > Sent: Thursday, July 7, 2022 10:35 AM > To: devel@edk2.groups.io > Cc: Hsieh, PaytonX ; Dong, Guo ; Ni, Ray ; Lu, > James ; Guo, Gua > Subject: [PATCH] UefiPayloadPkg: Add CryptoDxe driver to UefiPayload >=20 > From: PaytonX Hsieh >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3979 >=20 > Add macro CRYPTO_ENABLE to decide to build CryptoDxe into UPL. > Drviers can locate protocol instead of building openssl lib into drivers. > This can reduce the binary size that UPL required. >=20 > Cc: Guo Dong > Cc: Ray Ni > Cc: James Lu > Cc: Gua Guo > Signed-off-by: PaytonX Hsieh > --- > UefiPayloadPkg/UefiPayloadPkg.dsc | 42 +++++++++++++++++++++++++++++++ > UefiPayloadPkg/UefiPayloadPkg.fdf | 3 +++ > 2 files changed, 45 insertions(+) >=20 > diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPaylo= adPkg.dsc > index cfcf38578d..782635431b 100644 > --- a/UefiPayloadPkg/UefiPayloadPkg.dsc > +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc > @@ -36,6 +36,7 @@ > DEFINE PLATFORM_BOOT_TIMEOUT =3D 3 >=20 > DEFINE ABOVE_4G_MEMORY =3D TRUE >=20 > DEFINE BOOT_MANAGER_ESCAPE =3D FALSE >=20 > + DEFINE CRYPTO_ENABLE =3D FALSE >=20 > DEFINE SD_MMC_TIMEOUT =3D 1000000 >=20 > # >=20 > # SBL: UEFI payload for Slim Bootloader >=20 > @@ -180,8 +181,13 @@ > CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMa= intenanceLib.inf >=20 > SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf >=20 > DxeHobListLib|UefiPayloadPkg/Library/DxeHobListLib/DxeHobListLib.inf >=20 > +!if $(CRYPTO_ENABLE) =3D=3D TRUE >=20 > + BaseCryptLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.i= nf >=20 > + TlsLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf >=20 > +!else >=20 > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf >=20 > TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf >=20 > +!endif >=20 > IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf >=20 > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf >=20 > RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf >=20 > @@ -412,6 +418,31 @@ > gUefiPayloadPkgTokenSpaceGuid.PcdBootManagerEscape|$(BOOT_MANAGER_ESCA= PE) >=20 > gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1800000 >=20 >=20 >=20 > +!if $(CRYPTO_ENABLE) =3D=3D TRUE >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha256.Fa= mily | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Md5.Family = | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Family = | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Dh.Family = | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Random.Family= | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Family = | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha1.Family = | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha256.Family= | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha384.Family= | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha512.Family= | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.X509.Family = | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tdes.Family = | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.= GetContextSize | TRUE >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.= Init | TRUE >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.= CbcEncrypt | TRUE >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.= CbcDecrypt | TRUE >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Arc4.Family = | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sm3.Family = | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family = | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tls.Family = | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.TlsSet.Family= | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.TlsGet.Family= | > PCD_CRYPTO_SERVICE_ENABLE_FAMILY >=20 > +!endif >=20 > + >=20 > [PcdsPatchableInModule.X64] >=20 > gPcAtChipsetPkgTokenSpaceGuid.PcdRtcIndexRegister|$(RTC_INDEX_REGISTER= ) >=20 > gPcAtChipsetPkgTokenSpaceGuid.PcdRtcTargetRegister|$(RTC_TARGET_REGIST= ER) >=20 > @@ -719,6 +750,17 @@ > MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf >=20 > !endif >=20 >=20 >=20 > + # >=20 > + # Misc >=20 > + # >=20 > +!if $(CRYPTO_ENABLE) =3D=3D TRUE >=20 > + CryptoPkg/Driver/CryptoDxe.inf { >=20 > + >=20 > + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf >=20 > + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf >=20 > + } >=20 > +!endif >=20 > + >=20 > #------------------------------ >=20 > # Build the shell >=20 > #------------------------------ >=20 > diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPaylo= adPkg.fdf > index c7b04978ad..f609813cc8 100644 > --- a/UefiPayloadPkg/UefiPayloadPkg.fdf > +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf > @@ -99,6 +99,9 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf > INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatu= sCodeRouterRuntimeDxe.inf >=20 > INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandle= rRuntimeDxe.inf >=20 >=20 >=20 > +!if $(CRYPTO_ENABLE) =3D=3D TRUE >=20 > +INF CryptoPkg/Driver/CryptoDxe.inf >=20 > +!endif >=20 > !if $(SECURITY_STUB_ENABLE) =3D=3D TRUE >=20 > INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf >=20 > !endif >=20 > -- > 2.28.0.windows.1