Skip to content

Commit 2069ed7

Browse files
committed
Fixes for scan-build and g++ warnings.
1 parent 5bd553a commit 2069ed7

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

examples/nvram/extend.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,10 @@ int TPM2_NVRAM_Extend_Example(void* userCtx, int argc, char *argv[])
187187
XMEMSET(policyOr, 0, sizeof(policyOr));
188188
rc = wolfTPM2_PolicyHash(hashAlg, policyOr, &nvSize,
189189
TPM_CC_PolicyOR, policyDigest, policyDigestSz);
190+
if (rc != TPM_RC_SUCCESS) {
191+
printf("wolfTPM2_PolicyHash failed!\n");
192+
goto exit;
193+
}
190194
printf("PolicyOR A/B/C: %d\n", nvSize);
191195
TPM2_PrintBin(policyOr, nvSize);
192196

@@ -247,6 +251,10 @@ int TPM2_NVRAM_Extend_Example(void* userCtx, int argc, char *argv[])
247251
policyOr, nvSize
248252
);
249253
}
254+
if (rc != 0) {
255+
printf("NV Create failed!\n");
256+
goto exit;
257+
}
250258

251259
/* Close session and unload endorsement */
252260
wolfTPM2_UnsetAuth(&dev, 0);

examples/tls/tls_client.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ int TPM2_TLS_ClientArgs(void* userCtx, int argc, char *argv[])
439439
#else
440440
void* pkey = NULL;
441441
#endif
442-
rc = wolfTPM2_ExportPublicKeyBuffer(&dev, pkey,
442+
rc = wolfTPM2_ExportPublicKeyBuffer(&dev, (WOLFTPM2_KEY*)pkey,
443443
ENCODING_TYPE_ASN1, der, &derSz);
444444
if (rc < 0) {
445445
printf("Failed to export TPM public key!\n");

examples/tls/tls_server.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ int TPM2_TLS_ServerArgs(void* userCtx, int argc, char *argv[])
432432
#else
433433
void* pkey = NULL;
434434
#endif
435-
rc = wolfTPM2_ExportPublicKeyBuffer(&dev, pkey,
435+
rc = wolfTPM2_ExportPublicKeyBuffer(&dev, (WOLFTPM2_KEY*)pkey,
436436
ENCODING_TYPE_ASN1, der, &derSz);
437437
if (rc < 0) {
438438
printf("Failed to export TPM public key!\n");

src/tpm2_wrap.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7891,7 +7891,6 @@ static int tpm2_ifx_firmware_data(WOLFTPM2_DEV* dev,
78917891
rc = cb(&cmd[2], IFX_FW_MAX_CHUNK_SZ, offset, cb_ctx);
78927892
if (rc > 0 && rc <= IFX_FW_MAX_CHUNK_SZ) {
78937893
chunk_sz = rc;
7894-
rc = 0;
78957894
}
78967895
else if (rc == 0) {
78977896
#ifdef DEBUG_WOLFTPM

0 commit comments

Comments
 (0)