Peer review fixes and m33mu improvements

Author: dgarske

.github/workflows/fuzz.yml

@@ -69,7 +69,7 @@ jobs:
               tests/fuzz/corpus/ \
               -dict=tests/fuzz/tpm2.dict \
               -max_len=4096 \
-              -timeout=10 \
+              -timeout=30 \
               -rss_limit_mb=2048 \
               -print_final_stats=1 \
             || FUZZ_RC=$?

src/tpm2_crypto.c

@@ -181,6 +181,7 @@ int TPM2_KDFe_ex(
     int hashTypeInt;
     enum wc_HashType hashType;
     wc_HashAlg hash_ctx;
+    int hashInited = 0;
     word32 counter = 0;
     int hLen, copyLen, lLen = 0;
     byte uint32Buf[sizeof(UINT32)];
@@ -210,6 +211,7 @@ int TPM2_KDFe_ex(
     if (ret != 0) {
         return ret;
     }
+    hashInited = 1;
 
     for (pos = 0; pos < keySz; pos += hLen) {
         counter++;
@@ -219,10 +221,12 @@ int TPM2_KDFe_ex(
          * computed independently: H(counter || Z || label || partyU || partyV) */
         if (pos > 0) {
             wc_HashFree(&hash_ctx, hashType);
+            hashInited = 0;
             ret = wc_HashInit(&hash_ctx, hashType);
             if (ret != 0) {
                 break;
             }
+            hashInited = 1;
         }
 
         /* counter (big-endian) */
@@ -259,7 +263,9 @@ int TPM2_KDFe_ex(
         XMEMCPY(key + pos, hash, copyLen);
     }
 
-    wc_HashFree(&hash_ctx, hashType);
+    if (hashInited) {
+        wc_HashFree(&hash_ctx, hashType);
+    }
     TPM2_ForceZero(hash, sizeof(hash));
 
     if (ret == 0) {

src/tpm2_swtpm.c

@@ -58,8 +58,10 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #endif
-#ifdef WOLFTPM_SWTPM_UART
+#ifndef NO_GETENV
 #include <stdlib.h>
+#endif
+#ifdef WOLFTPM_SWTPM_UART
 #include <fcntl.h>
 #include <termios.h>
 #endif

tests/fuzz/fwtpm_fuzz.c

@@ -29,7 +29,7 @@
  *          CFLAGS="-fsanitize=fuzzer-no-link,address -g" \
  *          LDFLAGS="-fsanitize=fuzzer,address"
  *
- * Run:   ./tests/fuzz/fwtpm_fuzz corpus/ -max_len=4096 -timeout=10
+ * Run:   ./tests/fuzz/fwtpm_fuzz corpus/ -max_len=4096 -timeout=30
  */
 
 #ifdef HAVE_CONFIG_H

tests/fwtpm_check.sh

@@ -56,7 +56,7 @@ check_port_in_use() {
     elif netstat -tln 2>/dev/null | grep -q ":${port} "; then
         return 0
     fi
-    return 1  # no tool available, assume in use to be safe
+    return 1  # no tool available, skip this port
 }
 
 # Pick an available random port (returns port on stdout)