Fixes for scan-build and g++ warnings.

Author: dgarske

examples/pcr/quote.c

@@ -213,6 +213,8 @@ int TPM2_Quote_Test(void* userCtx, int argc, char *argv[])
 #else
     printf("Quote Blob %d\n", dataSz);
     TPM2_PrintBin(data, dataSz);
+    (void)data;
+    (void)dataSz;
 #endif
 
     printf("TPM with signature attests (type 0x%x):\n", attestedData.type);

examples/timestamp/signed_timestamp.c

@@ -230,10 +230,10 @@ int TPM2_Timestamp_TestArgs(void* userCtx, int argc, char *argv[])
 
     printf("TPM with signature attests (type 0x%x):\n", attestedData.type);
     /* time value in milliseconds that advances while the TPM is powered */
-    printf("\tTPM uptime since last power-up(in ms): %lu\n",
+    printf("\tTPM uptime since last power-up (in ms): %lu\n",
         (unsigned long)attestedData.attested.time.time.time);
     /* time value in milliseconds that advances while the TPM is powered */
-    printf("\tTPM clock, total time the TPM has been on(in ms): %lu\n",
+    printf("\tTPM clock, total time the TPM has been on (in ms): %lu\n",
         (unsigned long)attestedData.attested.time.time.clockInfo.clock);
     /* number of occurrences of TPM Reset since the last TPM2_Clear() */
     printf("\tReset Count: %u\n",
@@ -245,7 +245,7 @@ int TPM2_Timestamp_TestArgs(void* userCtx, int argc, char *argv[])
     printf("\tClock Safe: %u\n",
         attestedData.attested.time.time.clockInfo.safe);
     /* a TPM vendor-specific value indicating the version number of the firmware */
-    printf("\tFirmware Version(vendor specific): 0x%lX\n",
+    printf("\tFirmware Version (vendor specific): 0x%lX\n",
         (unsigned long)attestedData.attested.time.firmwareVersion);
 
 exit:

examples/wrap/wrap_test.c

@@ -117,9 +117,11 @@ int TPM2_Wrapper_TestArgs(void* userCtx, int argc, char *argv[])
     ecc_key wolfEccPubKey;
     ecc_key wolfEccPrivKey;
 #endif
+#endif /* !WOLFTPM2_NO_WOLFCRYPT */
     TPM_ALG_ID paramEncAlg = TPM_ALG_NULL;
     WOLFTPM2_SESSION tpmSession;
 
+#ifndef WOLFTPM2_NO_WOLFCRYPT
 #ifndef NO_RSA
     XMEMSET(&wolfRsaPubKey, 0, sizeof(wolfRsaPubKey));
     XMEMSET(&wolfRsaPrivKey, 0, sizeof(wolfRsaPrivKey));
@@ -128,8 +130,8 @@ int TPM2_Wrapper_TestArgs(void* userCtx, int argc, char *argv[])
     XMEMSET(&wolfEccPubKey, 0, sizeof(wolfEccPubKey));
     XMEMSET(&wolfEccPrivKey, 0, sizeof(wolfEccPrivKey));
 #endif
-    XMEMSET(&tpmSession, 0, sizeof(tpmSession));
 #endif /* !WOLFTPM2_NO_WOLFCRYPT */
+    XMEMSET(&tpmSession, 0, sizeof(tpmSession));
 
     if (argc >= 2) {
         if (XSTRNCMP(argv[1], "-?", 2) == 0 ||

src/tpm2.c

@@ -139,6 +139,8 @@ static int TPM2_CommandProcess(TPM2_CTX* ctx, TPM2_Packet* packet,
 #ifdef WOLFTPM_DEBUG_VERBOSE
     printf("CommandProcess: Handles (Auth %d, In %d), CmdSz %d, AuthSz %d, ParamSz %d, EncSz %d\n", 
         info->authCnt, info->inHandleCnt, cmdSz, authSz, paramSz, encParamSz);
+#else
+    (void)paramSz;
 #endif
 
     for (i=0; i<info->authCnt; i++) {

src/tpm2_wrap.c

@@ -1138,6 +1138,9 @@ int wolfTPM2_SensitiveToPrivate(TPM2B_SENSITIVE* sens, TPM2B_PRIVATE* priv,
                 rc = wc_AesCfbEncrypt(&enc, &packet.buf[innerSz], &packet.buf[innerSz], sensSz);
             wc_AesFree(&enc);
         }
+    #else
+        (void)innerAlg;
+        (void)sensSz;
     #endif
     }
 
@@ -1712,6 +1715,7 @@ int wolfTPM2_EccKey_WolfToTpm_ex(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* parentKey,
     if (dev == NULL || tpmKey == NULL || wolfKey == NULL)
         return BAD_FUNC_ARG;
 
+    XMEMSET(tpmKey, 0, sizeof(*tpmKey));
     XMEMSET(qx, 0, sizeof(qx));
     XMEMSET(qy, 0, sizeof(qy));
 
@@ -4099,6 +4103,7 @@ int wolfTPM2_CryptoDevCb(int devId, wc_CryptoInfo* info, void* ctx)
             byte sigRS[MAX_ECC_BYTES*2];
             byte *r = sigRS, *s = &sigRS[MAX_ECC_BYTES];
             word32 rLen = MAX_ECC_BYTES, sLen = MAX_ECC_BYTES;
+            XMEMSET(&eccPub, 0, sizeof(eccPub));
 
             /* Decode ECDSA Header */
             rc = wc_ecc_sig_to_rs(info->pk.eccverify.sig,

wolftpm/tpm2_wrap.h

@@ -38,7 +38,7 @@ typedef struct WOLFTPM2_HANDLE {
 #define TPM_SES_PWD 0xFF /* Session type for Password that fits in one byte */
 
 typedef struct WOLFTPM2_SESSION {
-    TPM_ST_T        type;         /* Trial, Policy or HMAC; or TPM_SES_PWD */
+    TPM_ST          type;         /* Trial, Policy or HMAC; or TPM_SES_PWD */
     WOLFTPM2_HANDLE handle;       /* Session handle from StartAuthSession */
     TPM2B_NONCE     nonceTPM;     /* Value from StartAuthSession */
     TPM2B_NONCE     nonceCaller;  /* Fresh nonce at each command */