Made shutdown get called by reset so we preserve og functionality

Author: aidangarske

src/tpm2_wrap.c

@@ -5673,48 +5673,6 @@ int wolfTPM2_HmacFinish(WOLFTPM2_DEV* dev, WOLFTPM2_HMAC* hmac,
     return rc;
 }
 
-/* performs a reset sequence */
-int wolfTPM2_Shutdown(WOLFTPM2_DEV* dev, int doStartup)
-{
-    int rc;
-    Shutdown_In shutdownIn;
-    Startup_In startupIn;
-
-    if (dev == NULL) {
-        return BAD_FUNC_ARG;
-    }
-
-    /* shutdown */
-    XMEMSET(&shutdownIn, 0, sizeof(shutdownIn));
-    shutdownIn.shutdownType = TPM_SU_CLEAR;
-    rc = TPM2_Shutdown(&shutdownIn);
-    if (rc != TPM_RC_SUCCESS) {
-    #ifdef DEBUG_WOLFTPM
-        printf("TPM2_Shutdown failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
-    #endif
-    }
-
-    /* startup */
-    if (doStartup) {
-        XMEMSET(&startupIn, 0, sizeof(startupIn));
-        startupIn.startupType = TPM_SU_CLEAR;
-        rc = TPM2_Startup(&startupIn);
-        if (rc != TPM_RC_SUCCESS) {
-        #ifdef DEBUG_WOLFTPM
-            printf("TPM2_Startup failed %d: %s\n",
-                rc, wolfTPM2_GetRCString(rc));
-        #endif
-            return rc;
-        }
-    }
-
-#ifdef DEBUG_WOLFTPM
-    printf("wolfTPM2_Shutdown complete\n");
-#endif
-
-    return rc;
-}
-
 /* performs a reset, shutdown, or startup sequence */
 int wolfTPM2_Reset(WOLFTPM2_DEV* dev, int doShutdown, int doStartup)
 {
@@ -5759,6 +5717,12 @@ int wolfTPM2_Reset(WOLFTPM2_DEV* dev, int doShutdown, int doStartup)
     return rc;
 }
 
+/* performs a shutdown or reset sequence */
+int wolfTPM2_Shutdown(WOLFTPM2_DEV* dev, int doStartup)
+{
+    return wolfTPM2_Reset(dev, 1, doStartup);
+}
+
 int wolfTPM2_UnloadHandles(WOLFTPM2_DEV* dev, word32 handleStart,
     word32 handleCount)
 {

wolftpm/tpm2_wrap.h

@@ -2540,39 +2540,39 @@ WOLFTPM_API int wolfTPM2_SetCommand(WOLFTPM2_DEV* dev, TPM_CC commandCode,
 
 /*!
     \ingroup wolfTPM2_Wrappers
-    \brief Helper function to shutdown or reset the TPM
-    \note If doStartup is set, then TPM2_Startup is performed right after TPM2_Shutdown
+    \brief Helper function to shutdown, startup or reset the TPM
+    \note The behavior depends on the doStartup and doShutdown flags:
+    \note - Both flags set to 1: Performs a full TPM restart (shutdown then startup)
+    \note - Only doStartup=1: Just starts up the TPM
+    \note - Only doShutdown=1: Just shuts down the TPM
 
     \return TPM_RC_SUCCESS: successful
     \return TPM_RC_FAILURE: generic failure (check TPM IO and TPM return code)
     \return BAD_FUNC_ARG: check the provided arguments
 
     \param dev pointer to a TPM2_DEV struct
     \param doStartup integer value, non-zero values represent "perform Startup after Shutdown"
+    \param doShutdown integer value, non-zero values represent "perform Shutdown"
 
     \sa wolfTPM2_Init
 */
-WOLFTPM_API int wolfTPM2_Shutdown(WOLFTPM2_DEV* dev, int doStartup);
+WOLFTPM_API int wolfTPM2_Reset(WOLFTPM2_DEV* dev, int doShutdown, int doStartup);
 
 /*!
     \ingroup wolfTPM2_Wrappers
-    \brief Helper function to shutdown, startup or reset the TPM
-    \note The behavior depends on the doStartup and doShutdown flags:
-    \note - Both flags set to 1: Performs a full TPM restart (shutdown then startup)
-    \note - Only doStartup=1: Just starts up the TPM
-    \note - Only doShutdown=1: Just shuts down the TPM
+    \brief Helper function to shutdown or reset the TPM
+    \note If doStartup is set, then TPM2_Startup is performed right after TPM2_Shutdown
 
     \return TPM_RC_SUCCESS: successful
     \return TPM_RC_FAILURE: generic failure (check TPM IO and TPM return code)
     \return BAD_FUNC_ARG: check the provided arguments
 
     \param dev pointer to a TPM2_DEV struct
     \param doStartup integer value, non-zero values represent "perform Startup after Shutdown"
-    \param doShutdown integer value, non-zero values represent "perform Shutdown"
 
     \sa wolfTPM2_Init
 */
-WOLFTPM_API int wolfTPM2_Reset(WOLFTPM2_DEV* dev, int doShutdown, int doStartup);
+WOLFTPM_API int wolfTPM2_Shutdown(WOLFTPM2_DEV* dev, int doStartup);
 
 /*!
     \ingroup wolfTPM2_Wrappers