MdePkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / MdePkg / Include / IndustryStandard / Tpm20.h

diff --git a/MdePkg/Include/IndustryStandard/Tpm20.h b/MdePkg/Include/IndustryStandard/Tpm20.h
index 5074d899d06e98f7fb6bdfa7f6505a9e68efc979..8a431bcd9f92f67764c77685b7eb13e8c871c5b7 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Tpm20.h
+++ b/MdePkg/Include/IndustryStandard/Tpm20.h
@@ -5,14 +5,8 @@
 \r
   Check http://trustedcomputinggroup.org for latest specification updates.\r
 \r
-Copyright (c) 2013, Intel Corporation. All rights reserved. <BR>\r
-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved. <BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -147,7 +141,6 @@ typedef UINT64                        CONTEXT_COUNTER;
 \r
 // Table 3 - Definition of Base Types\r
 typedef UINT8 BYTE;\r
-typedef UINT8 BOOL;\r
 \r
 // Table 4 - Definition of Types for Documentation Clarity\r
 //\r
@@ -676,7 +669,10 @@ typedef UINT32 TPM_RH;
 #define TPM_RH_LOCKOUT     (TPM_RH)(0x4000000A)\r
 #define TPM_RH_ENDORSEMENT (TPM_RH)(0x4000000B)\r
 #define TPM_RH_PLATFORM    (TPM_RH)(0x4000000C)\r
-#define TPM_RH_LAST        (TPM_RH)(0x4000000C)\r
+#define TPM_RH_PLATFORM_NV (TPM_RH)(0x4000000D)\r
+#define TPM_RH_AUTH_00     (TPM_RH)(0x40000010)\r
+#define TPM_RH_AUTH_FF     (TPM_RH)(0x4000010F)\r
+#define TPM_RH_LAST        (TPM_RH)(0x4000010F)\r
 \r
 // Table 28 - TPM_HC Constants\r
 typedef TPM_HANDLE TPM_HC;\r
@@ -1806,4 +1802,13 @@ typedef struct {
 \r
 #pragma pack ()\r
 \r
+//\r
+// TCG Algorithm Registry\r
+//\r
+#define HASH_ALG_SHA1    0x00000001\r
+#define HASH_ALG_SHA256  0x00000002\r
+#define HASH_ALG_SHA384  0x00000004\r
+#define HASH_ALG_SHA512  0x00000008\r
+#define HASH_ALG_SM3_256 0x00000010\r
+\r
 #endif\r