From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web10.34422.1650240016423357250 for ; Sun, 17 Apr 2022 17:00:34 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=ZY4Reqk4; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: min.m.xu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1650240034; x=1681776034; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EjBeXowm/KUs2msp7eyLuxqgT4lgF/yqg2ehBu+kxS0=; b=ZY4Reqk4cn1JvfiglSS03ch6U7xLWfr8EYdR1TIc05eC5pkfM+AkJeMA SSpei0Xd3qI4wqEuohafmoRpa8zCtutlnkJiUzY/qF0nww+h6Vwimf+3B gVC5Jj96a3i9HqUEpEcgvRZq9D3XSmhWGjj190dRmsxA2PByXiTaDvw13 8rz7rbftQweTciK5jwFXsER2Qr5fuIFB24TSbHI92cpT82cGtzC+EEHJ7 0taSXXkNlX01LPZ3C4wrmCW8nop07weDNjseeRsWmSPDSNTb1ewxyKwHn nYbt6Cjvw5JoM+r01Xy6twYzzDMNrtfkDOGTTRQ/gchjSXYERw96jGiTE g==; X-IronPort-AV: E=McAfee;i="6400,9594,10320"; a="349872567" X-IronPort-AV: E=Sophos;i="5.90,267,1643702400"; d="scan'208";a="349872567" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Apr 2022 17:00:33 -0700 X-IronPort-AV: E=Sophos;i="5.90,267,1643702400"; d="scan'208";a="575329537" Received: from cuixin-mobl.ccr.corp.intel.com (HELO mxu9-mobl1.ccr.corp.intel.com) ([10.249.170.67]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Apr 2022 17:00:31 -0700 From: "Min Xu" To: devel@edk2.groups.io Cc: Min Xu , Brijesh Singh , Erdem Aktas , James Bottomley , Jiewen Yao , Tom Lendacky , Ken Lu , Sami Mujawar , Gerd Hoffmann Subject: [PATCH V3 9/9] OvmfPkg/IntelTdx: Enable RTMR based measurement and measure boot Date: Mon, 18 Apr 2022 08:00:00 +0800 Message-Id: <996803d55b1802e301c8cdb50784daade755283e.1650239544.git.min.m.xu@intel.com> X-Mailer: git-send-email 2.29.2.windows.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit RFC: https://bugzilla.tianocore.org/show_bug.cgi?id=3853 Enable RTMR based measurement and measure boot for Td guest. Cc: Brijesh Singh Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Tom Lendacky Cc: Ken Lu Cc: Sami Mujawar Cc: Gerd Hoffmann Signed-off-by: Min Xu --- OvmfPkg/IntelTdx/IntelTdxX64.dsc | 12 +++++++++++- OvmfPkg/IntelTdx/IntelTdxX64.fdf | 5 +++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc index e6cd10a120a8..1d99de366d6c 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc @@ -192,7 +192,7 @@ OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.inf - TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf + TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -549,6 +549,7 @@ !if $(SECURE_BOOT_ENABLE) == TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf !endif + NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf } MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -723,3 +724,12 @@ NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf } + + # + # Cc Measurement Protocol for Td guest + # + OvmfPkg/IntelTdx/TdTcg2Dxe/TdTcg2Dxe.inf { + + HashLib|SecurityPkg/Library/HashLibTdx/HashLibTdx.inf + NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf + } diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.fdf b/OvmfPkg/IntelTdx/IntelTdxX64.fdf index 9e290ea78f61..b7eb217847b8 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.fdf +++ b/OvmfPkg/IntelTdx/IntelTdxX64.fdf @@ -292,6 +292,11 @@ INF OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf +# +# EFI_CC_MEASUREMENT_PROTOCOL +# +INF OvmfPkg/IntelTdx/TdTcg2Dxe/TdTcg2Dxe.inf + ################################################################################ [FV.FVMAIN_COMPACT] -- 2.29.2.windows.2