More peer review fixes

Author: dgarske

examples/run_examples.sh

@@ -43,7 +43,9 @@ wait_for_ready() {
 wait_for_port() {
     local port="$1" timeout="${2:-500}" elapsed=0
     while [ $elapsed -lt $timeout ]; do
-        if ss -tln 2>/dev/null | grep -q ":${port} "; then
+        if command -v ss >/dev/null 2>&1; then
+            ss -tln 2>/dev/null | grep -q ":${port} " && return 0
+        elif netstat -tln 2>/dev/null | grep -q ":${port} "; then
             return 0
         fi
         sleep 0.01

src/fwtpm/fwtpm_tis.c

@@ -78,10 +78,8 @@ static void TisHandleRegAccess(FWTPM_CTX* ctx, FWTPM_TIS_REGS* regs)
         UINT32 val = 0;
         if (len >= 1) val = regs->reg_data[0];
         if (len >= 2) val |= (UINT32)regs->reg_data[1] << 8;
-        if (len >= 4) {
-            val |= (UINT32)regs->reg_data[2] << 16;
-            val |= (UINT32)regs->reg_data[3] << 24;
-        }
+        if (len >= 3) val |= (UINT32)regs->reg_data[2] << 16;
+        if (len >= 4) val |= (UINT32)regs->reg_data[3] << 24;
 
         switch (offset) {
             case FWTPM_TIS_ACCESS:

src/tpm2_swtpm.c

@@ -194,9 +194,15 @@ static TPM_RC SwTpmConnect(TPM2_CTX* ctx, const char* host, const char* port)
         case 38400:  baud = B38400; break;
         case 57600:  baud = B57600; break;
         case 115200: baud = B115200; break;
+    #ifdef B230400
         case 230400: baud = B230400; break;
+    #endif
+    #ifdef B460800
         case 460800: baud = B460800; break;
+    #endif
+    #ifdef B921600
         case 921600: baud = B921600; break;
+    #endif
         default:     baud = B115200; break;
     }
     cfsetospeed(&tty, baud);