Changeset 51978 in vbox for trunk/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp

Timestamp:

Jul 11, 2014 2:57:40 AM (10 years ago)

Author:

vboxsync

Message:

Need to initialize the SUPR3HardenedVerify* bits in the extension pack manager too, so split it (the init code) out into a separate API.

File:

• trunk/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp

@@ -80 +80 @@
 #endif
 
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+static bool g_fHardenedVerifyInited = false;
+
+
+int suplibOsHardenedVerifyInit(void)
+{
+    if (!g_fHardenedVerifyInited)
+    {
+#if defined(VBOX_WITH_HARDENING) && !defined(IN_SUP_HARDENED_R3) && !defined(IN_SUP_R3_STATIC)
+        supR3HardenedWinInitVersion();
+        int rc = supHardenedWinInitImageVerifier(NULL);
+        if (RT_FAILURE(rc))
+            return rc;
+        supR3HardenedWinResolveVerifyTrustApiAndHookThreadCreation();
+#endif
+        g_fHardenedVerifyInited = true;
+    }
+    return VINF_SUCCESS;
+}
+
+
+int suplibOsHardenedVerifyTerm(void)
+{
+    /** @todo free resources...  */
+    return VINF_SUCCESS;
+}
+
 
 int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited, bool fUnrestricted)
@@ -86 +115 @@
      * Make sure the image verifier is fully initialized.
      */
-#if defined(VBOX_WITH_HARDENING) && !defined(IN_SUP_HARDENED_R3) && !defined(IN_SUP_R3_STATIC)
-    supR3HardenedWinInitVersion();
-    int rc = supHardenedWinInitImageVerifier(NULL);
+    int rc = suplibOsHardenedVerifyInit();
     if (RT_FAILURE(rc))
         return rc;
-    supR3HardenedWinResolveVerifyTrustApiAndHookThreadCreation();
-#endif
 
     /*
@@ -199 +224 @@
 }
 
+
 #ifndef IN_SUP_HARDENED_R3