Address review feedback

Author: aidangarske

src/tpm2_packet.c

@@ -433,17 +433,18 @@ void TPM2_Packet_ParseAuth(TPM2_Packet* packet, TPMS_AUTH_RESPONSE* authRsp)
 void TPM2_Packet_AppendPCR(TPM2_Packet* packet, TPML_PCR_SELECTION* pcr)
 {
     int i;
-    if (pcr->count > HASH_COUNT)
-        pcr->count = HASH_COUNT;
-    TPM2_Packet_AppendU32(packet, pcr->count);
-    for (i=0; i<(int)pcr->count; i++) {
-        if (pcr->pcrSelections[i].sizeofSelect > PCR_SELECT_MIN)
-            pcr->pcrSelections[i].sizeofSelect = PCR_SELECT_MIN;
+    UINT32 count = pcr->count;
+    if (count > HASH_COUNT)
+        count = HASH_COUNT;
+    TPM2_Packet_AppendU32(packet, count);
+    for (i=0; i<(int)count; i++) {
+        UINT8 selectSz = pcr->pcrSelections[i].sizeofSelect;
+        if (selectSz > PCR_SELECT_MIN)
+            selectSz = PCR_SELECT_MIN;
         TPM2_Packet_AppendU16(packet, pcr->pcrSelections[i].hash);
-        TPM2_Packet_AppendU8(packet, pcr->pcrSelections[i].sizeofSelect);
+        TPM2_Packet_AppendU8(packet, selectSz);
         TPM2_Packet_AppendBytes(packet,
-            pcr->pcrSelections[i].pcrSelect,
-            pcr->pcrSelections[i].sizeofSelect);
+            pcr->pcrSelections[i].pcrSelect, selectSz);
     }
 }
 void TPM2_Packet_ParsePCR(TPM2_Packet* packet, TPML_PCR_SELECTION* pcr)

src/tpm2_wrap.c

@@ -1695,17 +1695,17 @@ int wolfTPM2_SetAuth(WOLFTPM2_DEV* dev, int index,
     session->sessionHandle = sessionHandle;
     session->sessionAttributes = sessionAttributes;
     if (auth) {
-        session->auth.size = auth->size;
-        if (session->auth.size > sizeof(session->auth.buffer)) {
+        if (auth->size > sizeof(session->auth.buffer)) {
             return BUFFER_E;
         }
+        session->auth.size = auth->size;
         XMEMCPY(session->auth.buffer, auth->buffer, session->auth.size);
     }
     if (name) {
-        session->name.size = name->size;
-        if (session->name.size > sizeof(session->name.name)) {
+        if (name->size > sizeof(session->name.name)) {
             return BUFFER_E;
         }
+        session->name.size = name->size;
         XMEMCPY(session->name.name, name->name, session->name.size);
     }
 
@@ -1785,20 +1785,20 @@ int wolfTPM2_SetAuthHandleName(WOLFTPM2_DEV* dev, int index,
     if (handle->auth.size > 0) {
         if (session->sessionHandle == TPM_RS_PW) {
             /* password based authentication */
-            session->auth.size = handle->auth.size;
-            if (session->auth.size > sizeof(session->auth.buffer)) {
+            if (handle->auth.size > sizeof(session->auth.buffer)) {
                 return BUFFER_E;
             }
+            session->auth.size = handle->auth.size;
             XMEMCPY(session->auth.buffer, handle->auth.buffer,
                 session->auth.size);
         }
         else {
             if (handle->policyPass) {
                 /* use policy password directly */
-                session->auth.size = handle->auth.size;
-                if (session->auth.size > sizeof(session->auth.buffer)) {
+                if (handle->auth.size > sizeof(session->auth.buffer)) {
                     return BUFFER_E;
                 }
+                session->auth.size = handle->auth.size;
                 XMEMCPY(session->auth.buffer, handle->auth.buffer,
                     session->auth.size);
                 session->policyPass = handle->policyPass;

tests/unit_tests.c

@@ -596,8 +596,9 @@ static void test_wolfTPM2_PolicyHash(void)
         AssertIntNE(XMEMCMP(digestFirst, digest, digestSz), 0);
     }
 
-    printf("Test TPM Wrapper:\tPolicyHash:\t%s\n",
-        rc == 0 ? "Passed" : "Failed");
+    printf("Test TPM Wrapper:\tPolicyHash:\tPassed\n");
+#else
+    printf("Test TPM Wrapper:\tPolicyHash:\tSkipped\n");
 #endif
 }
 
@@ -667,8 +668,9 @@ static void test_wolfTPM2_SensitiveToPrivate(void)
         AssertIntEQ(XMEMCMP(priv.buffer, expected, sizeof(expected)), 0);
     }
 
-    printf("Test TPM Wrapper:\tSensitiveToPrivate:\t%s\n",
-        rc == 0 ? "Passed" : "Failed");
+    printf("Test TPM Wrapper:\tSensitiveToPrivate:\tPassed\n");
+#else
+    printf("Test TPM Wrapper:\tSensitiveToPrivate:\tSkipped\n");
 #endif
 }
 
@@ -736,8 +738,10 @@ static void test_TPM2_KDFa_SessionLabels(void)
         AssertIntEQ(XMEMCMP(key, expDUPLICATE, sizeof(expDUPLICATE)), 0);
     }
 
-#endif
     printf("Test TPM Wrapper:\tKDFa Session Labels:\tPassed\n");
+#else
+    printf("Test TPM Wrapper:\tKDFa Session Labels:\tSkipped\n");
+#endif
 }
 
 static void test_wolfTPM2_EncryptSecret(void)