diff options
| author | Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@hpe.com> | 2016-04-29 04:41:28 +0800 |
|---|---|---|
| committer | Zhang, Chao B <chao.b.zhang@intel.com> | 2016-05-03 10:11:12 +0800 |
| commit | 730f8071412349f6f018a300298d4fe3ab9267f9 (patch) | |
| tree | 31092f2e2c14e59cff79ed284643a6e3cd95c158 /SecurityPkg/Tcg/TcgDxe | |
| parent | 336dbfd1ca8a1e6bca9789873fc29bc891650384 (diff) | |
| download | edk2-730f8071412349f6f018a300298d4fe3ab9267f9.tar.gz edk2-730f8071412349f6f018a300298d4fe3ab9267f9.tar.bz2 edk2-730f8071412349f6f018a300298d4fe3ab9267f9.zip | |
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 <elhaj@hpe.com>
Signed-off-by: Derek Lin <derek.lin2@hpe.com>
Reviewed-by: Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by: Yao Jiewen <jiewen.yao@intel.com>
Diffstat (limited to 'SecurityPkg/Tcg/TcgDxe')
| -rw-r--r-- | SecurityPkg/Tcg/TcgDxe/TcgDxe.c | 11 |
1 files changed, 6 insertions, 5 deletions
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.<BR>
+(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
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,
|