diff options
| author | Andrey Pronin <apronin@chromium.org> | 2016-12-05 23:03:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-05 23:03:13 +0000 |
| commit | 2fe751e2554970ea86d60cb124e9d42198c310dc (patch) | |
| tree | b972f5365e96d0a5cfc4a502010931a737cb7973 | |
| parent | 7906c74bd6c1caa046b5c4f6e6ba6282d033f669 (diff) | |
| parent | d936fce9817f83351bd878207319626528e18f2f (diff) | |
| download | tpm2-2fe751e2554970ea86d60cb124e9d42198c310dc.tar.gz | |
tpm2: enable all SHA-xxx hashing algorithms am: f037a5c57c am: 3f545ad4e8 am: da73c11811
am: d936fce981
Change-Id: I22beb227166d3e90196b76f9ac42726cb96df520
| -rw-r--r-- | Implementation.h | 11 |
1 files changed, 5 insertions, 6 deletions
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 |