From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.120; helo=mga04.intel.com; envelope-from=chao.b.zhang@intel.com; receiver=edk2-devel@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 20455211B7397 for ; Fri, 25 Jan 2019 07:31:03 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jan 2019 07:31:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,521,1539673200"; d="scan'208";a="313496215" Received: from shwde9099.ccr.corp.intel.com ([10.239.9.119]) by fmsmga006.fm.intel.com with ESMTP; 25 Jan 2019 07:31:01 -0800 From: "Zhang, Chao B" To: edk2-devel@lists.01.org Cc: Yao Jiewen Date: Fri, 25 Jan 2019 23:30:52 +0800 Message-Id: <20190125153053.6056-2-chao.b.zhang@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20190125153053.6056-1-chao.b.zhang@intel.com> References: <20190125153053.6056-1-chao.b.zhang@intel.com> Subject: [Patch 1/2] SecurityPkg/TCG: Upgrade UEFI supporting TCG spec info X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jan 2019 15:31:03 -0000 Update "TCG ACPI Specification Level 00 Revision 00.37" to "TCG ACPI Specification 1.2 Revision 8" https://trustedcomputinggroup.org/wp-content/uploads/TCG_ACPIGeneralSpecification_v1.20_r8.pdf Upgrade TCG PC Client Platform Physical Presence Interface Specification Version 1.3 Revision 0.52" to Errata Version 0.4 https://trustedcomputinggroup.org/wp-content/uploads/Errata-Version-0.4-for-TCG-PC-Client-Platform-Physical-Presence-Interface-Version-1.30-Revision-0.52.pdf Upgrade "TCG EFI Protocol Specification for Family 2.0 Level 00" to Errata 0.5 https://trustedcomputinggroup.org/wp-content/uploads/EFI-Protocol-Specification-Errata-v.5.pdf Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yao Jiewen Signed-off-by: Zhang, Chao B --- SecurityPkg/SecurityPkg.dec | 2 +- SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf | 4 +++- SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec index 2708e7953c..7ae42ea150 100644 --- a/SecurityPkg/SecurityPkg.dec +++ b/SecurityPkg/SecurityPkg.dec @@ -403,11 +403,11 @@ # When it is configured to Dynamic or DynamicEx, it can be set through detection using # a platform-specific method (e.g. Button pressed) in a actual platform in early boot phase.

# @Prompt A physical presence user status gEfiSecurityPkgTokenSpaceGuid.PcdUserPhysicalPresence|FALSE|BOOLEAN|0x00010019 - ## Indicate the TPM2 ACPI table revision. Rev 4 is defined in TCG ACPI Specification Rev 00.37.

+ ## Indicate the TPM2 ACPI table revision. Rev 4 has been defined since TCG ACPI Specification Rev 00.37.

# To support configuring from setup page, this PCD can be DynamicHii type and map to a setup option.
# For example, map to TCG2_VERSION.Tpm2AcpiTableRev to be configured by Tcg2ConfigDxe driver.
# gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS
# @Prompt Revision of TPM2 ACPI table. gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|3|UINT8|0x0001001A diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf index 87f0492750..49402d902c 100644 --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf @@ -4,19 +4,21 @@ # Spec Compliance Info: # "TCG PC Client Platform Firmware Profile Specification for TPM Family 2.0 Level 00 Revision 1.03 v51" # along with # "Errata for PC Client Specific Platform Firmware Profile Specification Version 1.0 Revision 1.03" # "TCG EFI Protocol Specification" "Family 2.0" "Level 00 Revision 00.13" +# along with +# "Errata Version 0.5 for TCG EFI Protocol Specification" # # This module will produce Tcg2 protocol and measure boot environment. # # Caution: This module requires additional review when modified. # This driver will have external input - PE/COFF image. # This external input must be validated carefully to avoid security issue like # buffer overflow, integer overflow. # -# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf index 97cec443e4..cc5768294d 100644 --- a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf +++ b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf @@ -1,11 +1,13 @@ ## @file # Provides ACPI methods for TPM 2.0 support # # Spec Compliance Info: -# "TCG ACPI Specification Level 00 Revision 00.37" +# "TCG ACPI Specification Version 1.2 Revision 8" # "Physical Presence Interface Specification Version 1.30 Revision 00.52" +# along with +# "Errata Version 0.4 for TCG PC Client Platform Physical Presence Interface Specification" # "Platform Reset Attack Mitigation Specification Version 1.00" # TPM2.0 ACPI device object # "TCG PC Client Platform Firmware Profile Specification for TPM Family 2.0 Level 00 Revision 1.03 v51" # along with # "Errata for PC Client Specific Platform Firmware Profile Specification Version 1.0 Revision 1.03" @@ -16,11 +18,11 @@ # # Caution: This module requires additional review when modified. # This driver will have external input - variable and ACPINvs data in SMM mode. # This external input must be validated carefully to avoid security issue. # -# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -- 2.16.2.windows.1