From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web11.5137.1658473316299690997 for ; Fri, 22 Jul 2022 00:01:56 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=EfBrFZ99; spf=pass (domain: intel.com, ip: 134.134.136.65, 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=1658473316; x=1690009316; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=PVBYgYFH37CasH9jq6X5GRsR99M4KQ+W/uxtNrG+90Y=; b=EfBrFZ99xAuSNIimTUEqmI2Ur+rMEA8yFvVVhyETLGI+ZZJwlwgfPOKz ISVdmb4KRrH9qXqO4EgLqvY0O41DumVesYnH9KqXSKQX8nwPqkvfKvlqO pOJmtFRSvc46CaOSm03PnGm2DEfP4NF4pgH6c6N4SwuFRkI98xxSMHc57 lRpvskcrkLeJNTi+H2jywVmn7dJPt+U1Ghy0Y2cm6TFty1fM+m0zwHnDD WiftUFtDPBtJ0RJTK6VO5iPRxi7/RSZ16GO4gZ/bZamsDfYzbrJX5jFDG ZqbXWExEBj7sU4WWrTH9uwBT6cbHpsD6UsgwjmjmHitIa4Sq+mQIgLFVi g==; X-IronPort-AV: E=McAfee;i="6400,9594,10415"; a="288423302" X-IronPort-AV: E=Sophos;i="5.93,184,1654585200"; d="scan'208";a="288423302" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jul 2022 00:01:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,184,1654585200"; d="scan'208";a="595877519" Received: from peijenhx-win10.gar.corp.intel.com ([10.227.107.8]) by orsmga007.jf.intel.com with ESMTP; 22 Jul 2022 00:01:54 -0700 From: paytonx.hsieh@intel.com To: devel@edk2.groups.io Cc: PaytonX Hsieh , Guo Dong , Ray Ni , James Lu , Gua Guo Subject: [PATCH] UefiPayloadPkg: Add macro to support selection of CryptoDxe driver Date: Fri, 22 Jul 2022 15:01:41 +0800 Message-Id: <02f3399465bbd4313bc78511f7a188cb6699b732.1658473167.git.paytonx.hsieh@intel.com> X-Mailer: git-send-email 2.28.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 CRYPTO_PROTOCOL_SUPPORT is true, BIOS will use crypto protocol instead of building 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/UefiPayloadPkg.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=0D DEFINE SD_ENABLE =3D TRUE=0D DEFINE PS2_MOUSE_ENABLE =3D TRUE=0D + DEFINE CRYPTO_PROTOCOL_SUPPORT =3D FALSE=0D DEFINE SD_MMC_TIMEOUT =3D 1000000=0D =0D #=0D @@ -189,8 +190,13 @@ CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMain= tenanceLib.inf=0D SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf=0D DxeHobListLib|UefiPayloadPkg/Library/DxeHobListLib/DxeHobListLib.inf=0D +!if $(CRYPTO_PROTOCOL_SUPPORT) =3D=3D TRUE=0D BaseCryptLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf= =0D TlsLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf=0D +!else=0D + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf=0D + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf=0D +!endif=0D IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf=0D OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf=0D RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf=0D @@ -421,6 +427,7 @@ gUefiPayloadPkgTokenSpaceGuid.PcdBootManagerEscape|$(BOOT_MANAGER_ESCAPE= )=0D gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1800000=0D =0D +!if $(CRYPTO_PROTOCOL_SUPPORT) =3D=3D TRUE=0D gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha256.Fami= ly | PCD_CRYPTO_SERVICE_ENABLE_FAMILY=0D gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Md5.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY=0D gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY=0D @@ -443,6 +450,7 @@ gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tls.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY=0D gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.TlsSet.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY=0D gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.TlsGet.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY=0D +!endif=0D =0D [PcdsPatchableInModule.X64]=0D gPcAtChipsetPkgTokenSpaceGuid.PcdRtcIndexRegister|$(RTC_INDEX_REGISTER)= =0D @@ -764,11 +772,13 @@ #=0D # Misc=0D #=0D +!if $(CRYPTO_PROTOCOL_SUPPORT) =3D=3D TRUE=0D CryptoPkg/Driver/CryptoDxe.inf {=0D =0D BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf=0D TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf=0D }=0D +!endif=0D =0D #------------------------------=0D # Build the shell=0D diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayload= Pkg.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=0D INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerR= untimeDxe.inf=0D =0D +!if $(CRYPTO_PROTOCOL_SUPPORT) =3D=3D TRUE=0D INF CryptoPkg/Driver/CryptoDxe.inf=0D +!endif=0D !if $(SECURITY_STUB_ENABLE) =3D=3D TRUE=0D INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf=0D !endif=0D --=20 2.28.0.windows.1