Skip to content

Commit f56d37e

Browse files
authored
Merge pull request #459 from aidangarske/pr-455-coverity
Fix coverity DEADCODE CID 900621 from pr 455
2 parents 438c63e + 16a28c2 commit f56d37e

1 file changed

Lines changed: 15 additions & 7 deletions

File tree

examples/endorsement/get_ek_certs.c

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,10 @@ int TPM2_EndorsementCert_Example(void* userCtx, int argc, char *argv[])
325325
rc = wolfTPM2_NVReadPublic(&dev, nvIndex, &nvPublic);
326326
if (rc == 0) {
327327
const char* hashName = TPM2_GetAlgName(nvPublic.nameAlg);
328-
int isPolicyDigest = 0;
329328
int showData = 0;
329+
#ifdef DEBUG_WOLFTPM
330+
int isPolicyDigest = 0;
331+
#endif
330332

331333
#ifdef DEBUG_WOLFTPM
332334
printf(" NV Size: %u bytes, Attributes: 0x%08x, Name Alg: %s\n",
@@ -344,7 +346,9 @@ int TPM2_EndorsementCert_Example(void* userCtx, int argc, char *argv[])
344346
(nvPublic.dataSize == 64 && nvPublic.nameAlg == TPM_ALG_SHA512) ||
345347
(nvPublic.dataSize == 32 && nvPublic.nameAlg == TPM_ALG_SM3_256)) {
346348
printf(" Type: Policy digest (%s hash)\n", hashName);
349+
#ifdef DEBUG_WOLFTPM
347350
isPolicyDigest = 1;
351+
#endif
348352
showData = 1; /* Always show policy digests */
349353
}
350354
else if (nvPublic.dataSize > 100) {
@@ -369,13 +373,17 @@ int TPM2_EndorsementCert_Example(void* userCtx, int argc, char *argv[])
369373

370374
rc = wolfTPM2_NVReadAuth(&dev, &nv, nvIndex, certBuf, &certSz, 0);
371375
if (rc == 0) {
372-
if (nvPublic.dataSize <= 32 || isPolicyDigest) {
373-
printf(" Data (%u bytes):\n", certSz);
374-
dump_hex_bytes(certBuf, certSz);
375-
}
376-
else {
376+
printf(" Data (%u bytes):\n", certSz);
377+
#ifdef DEBUG_WOLFTPM
378+
/* In debug mode, show partial data for large buffers */
379+
if (certSz > 32 && !isPolicyDigest) {
377380
printf(" First 32 bytes:\n");
378-
dump_hex_bytes(certBuf, (certSz > 32) ? 32 : certSz);
381+
dump_hex_bytes(certBuf, 32);
382+
}
383+
else
384+
#endif
385+
{
386+
dump_hex_bytes(certBuf, certSz);
379387
}
380388
}
381389
}

0 commit comments

Comments
 (0)