From nobody Sun May 5 00:26:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91748+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91748+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1658529434; cv=none; d=zohomail.com; s=zohoarc; b=UqKbsmPPFA12ZF6s4053R415W9cy0Uw9+6aoTepNQT2tcDWS9U+Yay8Qk62vkGB4Iovpwx6kKliVZq1hTmJjn1LrRBNXCg7uL1YVL8qXLfX6VHVAvU9p8uA3n8E2Xrt/SlNXlA2yVdq8ZEt0GrwXffSmzNswTgonKZ/k/5kRwMY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658529434; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=Vf5FuOhkkvblbOM8Oy4Qex5f5pLIJPXSQRYXy87looY=; b=i7or2msNNUcoXIDEtSs8lajugk96Xf5Jd32UBQ51LD4TzsyKz3ULgQpgDQoIahIxHJpAFQDaJru/zYPPIgk9AhnTMVj3ivXNq96Gsn5pdFkALt84I/+4dYWtQyBsCaqQT6fbYfwCze1x6Kiu5t7xR6PUXYgrPASH7RErbl7h3SI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91748+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 165852943425635.6418214980298; Fri, 22 Jul 2022 15:37:14 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id rNgtYY1788612xGRHN90jRr7; Fri, 22 Jul 2022 15:37:13 -0700 X-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 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" X-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" X-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: [edk2-devel] [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> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,paytonx.hsieh@intel.com X-Gm-Message-State: I2PrTCAoviqJ06BK2T9DMsxNx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1658529433; bh=LM9eDFU22U8lHiVLy+anwqmSV2M6kNPLv8HjWygxhsI=; h=Cc:Date:From:Reply-To:Subject:To; b=oUXqoSDYEdUWHk59J++08fSd5yTpyy+70VeXavhiKL2XeAaCW1HGKyXhHZppikNP4Ks PmBfg9XZwVp1kaWR8kpuUrU9EV4Y/+BnBzzrb8m1bTc5bTbxQOx/QsNvtdkE/o5FFzzEo Gtgv+EcFaqLUaPFEgdwJsNsk+6X3AscdEeE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1658529435632100002 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Guo Dong --- 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 DEFINE SD_ENABLE =3D TRUE DEFINE PS2_MOUSE_ENABLE =3D TRUE + DEFINE CRYPTO_PROTOCOL_SUPPORT =3D FALSE DEFINE SD_MMC_TIMEOUT =3D 1000000 =20 # @@ -189,8 +190,13 @@ CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMain= tenanceLib.inf SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf DxeHobListLib|UefiPayloadPkg/Library/DxeHobListLib/DxeHobListLib.inf +!if $(CRYPTO_PROTOCOL_SUPPORT) =3D=3D TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf TlsLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf +!else + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf +!endif IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf @@ -421,6 +427,7 @@ gUefiPayloadPkgTokenSpaceGuid.PcdBootManagerEscape|$(BOOT_MANAGER_ESCAPE) gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1800000 =20 +!if $(CRYPTO_PROTOCOL_SUPPORT) =3D=3D TRUE gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha256.Fami= ly | PCD_CRYPTO_SERVICE_ENABLE_FAMILY gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Md5.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY @@ -443,6 +450,7 @@ gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tls.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.TlsSet.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.TlsGet.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY +!endif =20 [PcdsPatchableInModule.X64] gPcAtChipsetPkgTokenSpaceGuid.PcdRtcIndexRegister|$(RTC_INDEX_REGISTER) @@ -764,11 +772,13 @@ # # Misc # +!if $(CRYPTO_PROTOCOL_SUPPORT) =3D=3D TRUE CryptoPkg/Driver/CryptoDxe.inf { BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf } +!endif =20 #------------------------------ # Build the shell 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 INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerR= untimeDxe.inf =20 +!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 --=20 2.28.0.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 (#91748): https://edk2.groups.io/g/devel/message/91748 Mute This Topic: https://groups.io/mt/92558123/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-