Edits for typos and minor bug fixes

Author: DavidWooten

CppProperties.json

@@ -0,0 +1,21 @@
+{
+  "configurations": [
+    {
+      "inheritEnvironments": [
+        "msvc_x86"
+      ],
+      "name": "x86-Debug",
+      "includePath": [
+        "${env.INCLUDE}",
+        "${workspaceRoot}\\**"
+      ],
+      "defines": [
+        "WIN32",
+        "_DEBUG",
+        "UNICODE",
+        "_UNICODE"
+      ],
+      "intelliSenseMode": "windows-msvc-x86"
+    }
+  ]
+}

TPMCmd/Platform/include/PlatformData.h

@@ -39,7 +39,7 @@
 #define _PLATFORM_DATA_H_
 
 // From Cancel.c
-// Cancel flag.  It is initialized as FALSE, which indicate the command is not
+// This flag is initialized as FALSE to indicate that the command is not
 // being canceled
 extern int     s_isCanceled;
 
@@ -75,9 +75,9 @@ extern BOOL              s_timerStopped;
 // CLOCK_NOMINAL is the number of hardware ticks per mS. A value of 300000 means 
 // that the nominal clock rate used to drive the hardware clock is 30 MHz. The
 // adjustment rates are used to determine the conversion of the hardware ticks to
-// internal hardware clock value. In practice, we would expect that there woudl be
-// a hardware register will accumulated mS. It would be incremented by the output
-// of a pre-scaler. The pre-scaler would divide the ticks from the clock by some
+// internal hardware clock value. In practice, we would expect that there would be
+// a hardware register with accumulated mS. It would be incremented by the output
+// of a prescaler. The prescaler would divide the ticks from the clock by some
 // value that would compensate for the difference between clock time and real time.
 // The code in Clock does the emulation of this function. 
 #define     CLOCK_NOMINAL           30000

TPMCmd/Platform/include/prototypes/DebugHelpers_fp.h

@@ -59,7 +59,7 @@ void
 DebugDumpBuffer(
     int             size,
     unsigned char   *buf,
-    unsigned char   *identifier
+    const char      *identifier
 );
 
 #endif  // _DEBUGHELPERS_FP_H_

TPMCmd/Platform/include/prototypes/Platform_fp.h

@@ -147,6 +147,8 @@ _plat__ClockAdjustRate(
 
 //** From DebugHelpers.c 
 
+#if CERTIFYX509_DEBUG
+
 //*** DebugFileOpen()
 // This function opens the file used to hold the debug data.
 //  Return Type: int
@@ -166,8 +168,9 @@ void
 DebugDumpBuffer(
     int             size,
     unsigned char   *buf,
-    unsigned char   *identifier
+    const char      *identifier
 );
+#endif // CERTIFYX509_DEBUG
 
 
 //** From Entropy.c 

TPMCmd/Platform/platform.vcxproj.filters

@@ -31,7 +31,9 @@
     <ClCompile Include="src\Unique.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DebugHelpers.c" />
+    <ClCompile Include="src\DebugHelpers.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">

TPMCmd/Platform/src/DebugHelpers.c

@@ -40,25 +40,28 @@
 //
 
 //** Includes and Local 
-#include    <stdio.h>
-#include    <time.h>
+#include <stdio.h>
+#include <time.h>
+#include "Platform.h"
 
-FILE        *fDebug = NULL;
-const char  *fn = "DebugFile.txt";
+#if CERTIFYX509_DEBUG
 
-static FILE*
+FILE            *fDebug = NULL;
+const char      *debugFileName = "DebugFile.txt";
+
+static FILE *
 fileOpen(
-    const char  *fname, 
-    const char  *mode
+    const char      *fn, 
+    const char      *mode
 )
 {
     FILE        *f;
-#if defined _MSC_VER
-    if(fopen_s(&f, fname, mode) != 0)
+#   if defined _MSC_VER
+    if(fopen_s(&f, fn, mode) != 0)
         f = NULL;
-#else
+#   else
     f = fopen(fn, "w");
-#endif
+#   endif
     return f;
 }
 
@@ -72,21 +75,18 @@ DebugFileOpen(
     void
 )
 {
-#if defined _MSC_VER
-    char    timeString[100];
-#else
-    char   *timeString;
-#endif
-    time_t  t = time(NULL);
+    time_t                  t = time(NULL);
 //
     // Get current date and time.
-#if defined _MSC_VER
-    ctime_s(timeString, sizeof(timeString), &t);
-#else
+#   if defined _MSC_VER
+    char                 timeString[100];
+    ctime_s(timeString, (size_t)sizeof(timeString), &t);
+#   else
+    char                *timeString;
     timeString = ctime(&t);
-#endif
+#   endif
     // Try to open the debug file
-    fDebug = fileOpen(fn, "w");
+    fDebug = fileOpen(debugFileName, "w");
     if(fDebug)
     {
         fprintf(fDebug, "%s\n", timeString);
@@ -96,6 +96,7 @@ DebugFileOpen(
     return -1;
 }
 
+//*** DebugFileClose()
 void
 DebugFileClose(
     void
@@ -105,16 +106,17 @@ DebugFileClose(
         fclose(fDebug);
 }
 
+//*** DebugDumpBuffer()
 void
 DebugDumpBuffer(
     int             size,
     unsigned char   *buf,
-    unsigned char   *identifier
+    const char      *identifier
 )
 {
     int             i;
 //
-    FILE *f = fileOpen(fn, "a");
+    FILE *f = fileOpen(debugFileName, "a");
     if(!f)
         return;
     if(identifier)
@@ -132,3 +134,5 @@ DebugDumpBuffer(
     }
     fclose(f);
 }
+
+#endif // CERTIFYX509_DEBUG

TPMCmd/Platform/src/Entropy.c

@@ -50,7 +50,7 @@
 // see that two consecutive 32-bit values are not the same because
 // (according to FIPS 140-2, annex C
 //
-// "If each call to a RNG produces blocks of n bits (where n > 15), the first
+// "If each call to an RNG produces blocks of n bits (where n > 15), the first
 // n-bit block generated after power-up, initialization, or reset shall not be
 // used, but shall be saved for comparison with the next n-bit block to be
 // generated. Each subsequent generation of an n-bit block shall be compared with

TPMCmd/Simulator/src/TcpServer.c

@@ -366,7 +366,7 @@ RegularCommandService(
         serverSocket = accept(listenSocket,
                               (struct sockaddr*) &HerAddress,
                               &length);
-        if(serverSocket == SOCKET_ERROR)
+        if(serverSocket == INVALID_SOCKET)
         {
             printf("Accept error.  Error is 0x%x\n", WSAGetLastError());
             return -1;

TPMCmd/tpm/Tpm.vcxproj.filters

@@ -589,7 +589,7 @@
     <ClCompile Include="src\X509\X509_ECC.c">
       <Filter>Source Files\X509</Filter>
     </ClCompile>
-    <ClCompile Include="src\X509\TpmASN1.c">
+    <ClCompile Include="src\X509\TpmAsn1.c">
       <Filter>Source Files\X509</Filter>
     </ClCompile>
   </ItemGroup>
@@ -1203,7 +1203,7 @@
     <ClInclude Include="include\X509_RSA.h">
       <Filter>Source Files\X509</Filter>
     </ClInclude>
-    <ClInclude Include="include\OIDS.h">
+    <ClInclude Include="include\OIDs.h">
       <Filter>Source Files\X509</Filter>
     </ClInclude>
     <ClInclude Include="include\CryptHash.h">
@@ -1317,6 +1317,9 @@
     <ClInclude Include="include\wolf\TpmToWolfSym.h">
       <Filter>Headers\Crypt\wolf</Filter>
     </ClInclude>
+    <ClInclude Include="$(SolutionDir)\wolfcrypt\include\user_settings.h">
+      <Filter>Headers\Crypt\wolf</Filter>
+    </ClInclude>
     <ClInclude Include="include\prototypes\TpmToWolfDesSupport_fp.h">
       <Filter>Headers\prototypes</Filter>
     </ClInclude>
@@ -1326,14 +1329,17 @@
     <ClInclude Include="include\prototypes\TpmToWolfMath_fp.h">
       <Filter>Headers\prototypes</Filter>
     </ClInclude>
-    <ClInclude Include="include\TpmProfile.h">
+    <ClInclude Include="include\MinMax.h">
       <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="include\TpmAlgorithmDefines.h">
       <Filter>Headers</Filter>
     </ClInclude>
-    <ClInclude Include="include\Wolf\user_settings.h">
-      <Filter>Headers\Crypt\wolf</Filter>
+    <ClInclude Include="include\TpmProfile.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\TpmAsn1.h">
+      <Filter>Headers</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>

TPMCmd/tpm/include/CryptHash.h

@@ -239,10 +239,10 @@ typedef const struct HASH_DEF
                          (HASH_STATE_EXPORT_METHOD *)&tpmHashStateExport_##HASH,    \
                          (HASH_STATE_IMPORT_METHOD *)&tpmHashStateImport_##HASH,    \
                         },                                                          \
-                        HASH##_BLOCK_SIZE,              /* block size */            \
-                        HASH##_DIGEST_SIZE,             /* data size */             \
-                        sizeof(tpmHashState##HASH##_t),                         \
-                        TPM_ALG_##HASH, OID_##HASH                              \
+                        HASH##_BLOCK_SIZE,     /*block size */                      \
+                        HASH##_DIGEST_SIZE,    /*data size */                       \
+                        sizeof(tpmHashState##HASH##_t),                             \
+                        TPM_ALG_##HASH, OID_##HASH                                  \
                         PKCS1_OID(HASH) ECDSA_OID(HASH)};
 
 // These definitions are for the types that can be in a hash state structure.
@@ -292,8 +292,7 @@ typedef struct hmacState
 } HMAC_STATE, *PHMAC_STATE;
 
 // This is for the external hash state. This implementation assumes that the size
-// of the exported hash state is no larger than the internal hash state. There
-// is a run time check that makes sure that this i.
+// of the exported hash state is no larger than the internal hash state.
 typedef struct
 {
     BYTE                     buffer[sizeof(HASH_STATE)];

TPMCmd/tpm/include/CryptSym.h

@@ -75,10 +75,10 @@ typedef union tpmCryptKeySchedule_t {
 // or decrypt with the algorithm chosen by setting a function pointer to select
 // the algorithm that is used.
 
-#   define ENCRYPT(keySchedule, in, out)                \
+#   define ENCRYPT(keySchedule, in, out)                                            \
       encrypt(SWIZZLE(keySchedule, in, out))
 
-#   define DECRYPT(keySchedule, in, out)                \
+#   define DECRYPT(keySchedule, in, out)                                            \
       decrypt(SWIZZLE(keySchedule, in, out))
 
 

TPMCmd/tpm/include/Global.h

@@ -63,7 +63,7 @@
 #define INITIALIZER(_value_)  = _value_
 #else
 #define EXTERN  extern
-#define INITIALIZER(_name_)
+#define INITIALIZER(_value_)
 #endif
 
 _REDUCE_WARNING_LEVEL_(2)
@@ -916,9 +916,9 @@ EXTERN ORDERLY_DATA     go;
 //*** STATE_CLEAR_DATA
 //*********************************************************************************
 //*********************************************************************************
-// This structure contains the data that is saved on Shutdown(STATE).
+// This structure contains the data that is saved on Shutdown(STATE)
 // and restored on Startup(STATE).  The values are set to their default
-// settings on any Startup(Clear). In other words the data is only persistent
+// settings on any Startup(Clear). In other words, the data is only persistent
 // across TPM Resume.
 //
 // If the comments associated with a parameter indicate a default reset value, the