commit 3f545ad4e8c506b5545738bda5ab99d096d47fc0
author Andrey Pronin <apronin@chromium.org> Mon Dec 05 22:51:13 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Dec 05 22:51:13 2016 +0000
tree b972f5365e96d0a5cfc4a502010931a737cb7973
parent 06c8e853bbab19061d7363f74cc9c4115fd86e17
parent f037a5c57c02fce358df0a78ad30632bb6fea355

tpm2: enable all SHA-xxx hashing algorithms
am: f037a5c57c

Change-Id: Ib1700fc14aaa486b3740877aa0598496e6ed01ed

Implementation.h

diff --git a/Implementation.h b/Implementation.h
index 92d9ecf..755945e 100644
--- a/Implementation.h
+++ b/Implementation.h
@@ -45,12 +45,8 @@
 #define    ALG_XOR                     ALG_YES
 #define    ALG_KEYEDHASH               ALG_YES
 #define    ALG_SHA256                  ALG_YES
-#ifdef EMBEDDED_MODE
-#define    ALG_SHA384                  ALG_NO
-#else
 #define    ALG_SHA384                  ALG_YES
-#endif
-#define    ALG_SHA512                  ALG_NO
+#define    ALG_SHA512                  ALG_YES
 #define    ALG_SM3_256                 ALG_NO
 #define    ALG_SM4                     ALG_NO
 #define    ALG_RSASSA                  (ALG_YES*ALG_RSA)
@@ -265,7 +261,10 @@
 // This must be matched by the package using this library!
 #define NV_MEMORY_SIZE                    16076
 // Versioning NV storage format will allow to smoothly migrate NVRAM contents.
-#define NV_FORMAT_VERSION                 1
+// Versions:
+// 1 - full non-serialized objects in NVRAM, max SHA digest is SHA-256
+// 2 - full non-serialized objects in NVRAM, max SHA digest is SHA-512
+#define NV_FORMAT_VERSION                 2
 #else
 #define NV_MEMORY_SIZE                    16384
 #endif