From 730f8071412349f6f018a300298d4fe3ab9267f9 Mon Sep 17 00:00:00 2001 From: Samer El-Haj-Mahmoud Date: Fri, 29 Apr 2016 04:41:28 +0800 Subject: SecurityPkg: Update servers TCG ACPI Table template to TCG 1.2 Update the TCG Spec in the the EFI_TCG_SERVER_ACPI_TABLE from TCG 1.0 to TCG 1.2 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Samer El-Haj-Mahmoud Signed-off-by: Derek Lin Reviewed-by: Chao Zhang Reviewed-by: Yao Jiewen --- SecurityPkg/Tcg/TcgDxe/TcgDxe.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'SecurityPkg') diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c index 690f356bbb..0d7e32ae3f 100644 --- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c +++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c @@ -9,6 +9,7 @@ buffer overflow, integer overflow. TcgDxePassThroughToTpm() will receive untrusted input and do basic validation. Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.
+(C) Copyright 2016 Hewlett Packard Enterprise Development LP
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 @@ -102,8 +103,8 @@ EFI_TCG_SERVER_ACPI_TABLE mTcgServerAcpiTemplate = { 0, // Reserved 0, // Log Area Max Length (EFI_PHYSICAL_ADDRESS) (SIZE_4GB - 1), // Log Area Start Address - 0x0100, // TCG Specification revision 1.0 - 2, // Device Flags + 0x0120, // TCG Specification revision 1.2 + 0, // Device Flags 0, // Interrupt Flags 0, // GPE {0}, // Reserved 3 bytes @@ -353,9 +354,9 @@ TcgDxeHashAll ( } *HashedDataLen = sizeof (TPM_DIGEST); - if (*HashedDataResult == NULL) { - *HashedDataResult = AllocatePool ((UINTN) *HashedDataLen); - } + if (*HashedDataResult == NULL) { + *HashedDataResult = AllocatePool ((UINTN) *HashedDataLen); + } return TpmCommHashAll ( HashData, -- cgit v1.2.3