F-9211 - Report v1.85 revision and errata semantics in GetCapability

Author: aidangarske

src/fwtpm/fwtpm_command.c

@@ -1349,8 +1349,15 @@ static TPM_RC FwCmd_GetCapability(FWTPM_CTX* ctx, TPM2_Packet* cmd,
                 { TPM_PT_FAMILY_INDICATOR,  0x322E3000 },
                 { TPM_PT_LEVEL,             0 },
                 { TPM_PT_REVISION,          FWTPM_REVISION },
+#ifdef WOLFTPM_V185
+                /* v1.85 Part 2 renames PT_FIXED+3 to TPM_PT_ERRATA (base value
+                 * 0) and no longer reports a build date at PT_FIXED+3/+4. */
+                { TPM_PT_DAY_OF_YEAR,       0 },
+                { TPM_PT_YEAR,              0 },
+#else
                 { TPM_PT_DAY_OF_YEAR,       FWTPM_BUILD_DAY_OF_YEAR },
                 { TPM_PT_YEAR,              FWTPM_BUILD_YEAR },
+#endif
                 { TPM_PT_MANUFACTURER,
                   ((UINT32)'W' << 24) | ((UINT32)'O' << 16) |
                   ((UINT32)'L' << 8)  | (UINT32)'F' },

wolftpm/fwtpm/fwtpm.h

@@ -295,8 +295,12 @@
 
 /* fwTPM firmware revision (TPM_PT_REVISION hundredths) */
 #ifndef FWTPM_REVISION
+#ifdef WOLFTPM_V185
+#define FWTPM_REVISION 185
+#else
 #define FWTPM_REVISION 159
 #endif
+#endif
 
 /* Compile-time build date parsed from __DATE__ ("Mmm DD YYYY") */
 #define FWTPM_BUILD_YEAR \