Minor fixes based on peer review

Signed-off-by: Dimitar Tomov <dimi@wolfssl.com>

Author: Dimitar Tomov

src/tpm2.c

@@ -284,10 +284,10 @@ TPM_RC TPM2_CountAuthSessions(TPM2_CTX *ctx, int *authSessionCount)
 {
     int sessionCount, sessionHandle;
 
-    if(ctx == NULL || ctx->authCmd == NULL || authSessionCount == NULL)
+    if (ctx == NULL || ctx->authCmd == NULL || authSessionCount == NULL)
         return TPM_RC_FAILURE;
 
-    for(sessionCount = 0; sessionCount < MAX_SESSION_NUM; sessionCount++) {
+    for (sessionCount = 0; sessionCount < MAX_SESSION_NUM; sessionCount++) {
         sessionHandle = ctx->authCmd[sessionCount].sessionHandle;
         /* According to the TCG Spec, Part 1, Chapter 15.4
          * Session Handles have most significant octet at
@@ -296,11 +296,11 @@ TPM_RC TPM2_CountAuthSessions(TPM2_CTX *ctx, int *authSessionCount)
          * Password sessions use predefined value of TPM_RS_PW
          * Trial sessions are not of interest
          */
-        if(sessionHandle != TPM_RS_PW) {
+        if (sessionHandle != TPM_RS_PW) {
             /* Not a password session, mask the most significant octet(MSO) */
             sessionHandle &= 0xFF000000;
             /* Check MSO for an HMAC or Policy session, otherwise invalid */
-            if(sessionHandle ^ 0x02000000 && sessionHandle ^ 0x03000000)
+            if ((sessionHandle ^ 0x02000000) && (sessionHandle ^ 0x03000000))
                 break;
         }
     }

src/tpm2_packet.c

@@ -315,21 +315,26 @@ void TPM2_Packet_PlaceU32(TPM2_Packet* packet, int markSz)
     }
 }
 
+/* TODO: We should add a return code here */
 void TPM2_Packet_AppendAuth(TPM2_Packet* packet, TPM2_CTX* ctx)
 {
     int tmpSz = 0;
     int i, authCount;
     TPMS_AUTH_COMMAND *auth;
 
-    if (ctx == NULL) {
+    if (ctx == NULL)
         return;
-    }
 
     auth = ctx->authCmd;
+    if (auth == NULL)
+        return;
 
     if (TPM2_CountAuthSessions(ctx, &authCount) != TPM_RC_SUCCESS)
         return;
 
+    if (authCount > MAX_SESSION_NUM)
+        return;
+
     TPM2_Packet_MarkU32(packet, &tmpSz);
     for (i=0; i<authCount; i++) {
         /* make sure continueSession is set for TPM_RS_PW */