Modify vendor and version strings
The information copied from the published spec needs to be tweaked to
reflect the actual situation.
Namely, the vendor string is being set to CROS (shortened Chromium
OS), firmware revision to 0.1 and spec revision to 116.
BUG=chrome-os-partner:43025
TEST=verified that proper values are reported in response to the
appropriate TPM capabilities requests.
Change-Id: If6b34904e239dda6cd35e67235beac7dc8b931a1
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/309896
Commit-Ready: Vadim Bendebury <vbendeb@google.com>
Tested-by: Vadim Bendebury <vbendeb@google.com>
Reviewed-by: Utkarsh Sanghi <usanghi@chromium.org>
diff --git a/VendorString.h b/VendorString.h
index 3c7387e..baf5164 100644
--- a/VendorString.h
+++ b/VendorString.h
@@ -8,17 +8,18 @@
#ifndef _VENDOR_STRING_H
#define _VENDOR_STRING_H
//
-// Define up to 4-byte values for MANUFACTURER. This value defines the response for
-// TPM_PT_MANUFACTURER in TPM2_GetCapability(). The following line should be un-commented and a
-// vendor specific string should be provided here.
+// Define up to 4-byte values for MANUFACTURER. This value defines the
+// response for TPM_PT_MANUFACTURER in TPM2_GetCapability(). The
+// definition should be replaced as appropriate when this code is used for
+// actual implementations.
//
-#define MANUFACTURER "MSFT"
+#define MANUFACTURER "CROS"
//
// The following #if macro may be deleted after a proper MANUFACTURER is provided.
//
#ifndef MANUFACTURER
#error MANUFACTURER is not provided. \
-Please modify include\VendorString.h to provide a specific \
+Please modify VendorString.h to provide a specific \
manufacturer name.
#endif
//
@@ -41,15 +42,17 @@
//
#endif
//
-// the more significant 32-bits of a vendor-specific value indicating the version of the firmware The following
-// line should be un-commented and a vendor specific firmware V1 should be provided here. The
-// FIRMWARE_V2 may also be defined as appropriate.
+// the more significant 32-bits of a vendor-specific value indicating the
+// version of the firmware. Some instrumentation could be added to replace
+// the following definition(s) with some release tag, SHA1, build date,
+// etc.
//
-#define FIRMWARE_V1 (0x20140504)
+#define FIRMWARE_V1 (0)
//
-// the less significant 32-bits of a vendor-specific value indicating the version of the firmware
+// the optional less significant 32-bits of a vendor-specific value
+// indicating the version of the firmware.
//
-#define FIRMWARE_V2 (0x00200136)
+#define FIRMWARE_V2 (1)
//
// The following #if macro may be deleted after a proper FIRMWARE_V1 is provided.
//