Changeset 51819 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Jul 2, 2014 6:20:33 PM (11 years ago)

Author:

vboxsync

Message:

timestamp tweak.

File:

• trunk/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyImage-win.cpp (modified) (2 diffs)

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

@@ -148 +148 @@
  *  SUP_MAKE_NT_VER_SIMPLE. */
 uint32_t                    g_uNtVerCombined;
+#endif
+
+#ifdef IN_RING3
+/** Timestamp hack working around issues with old DLLs that we ship. */
+static uint64_t             g_uBuildTimestampHack = 0;
 #endif
 
@@ -852 +857 @@
              * certificate validation date.  We must query that first to avoid
              * potential issues re-entering the loader code from the callback.
+             *
+             * Update: Save the first timestamp we validate with build cert and
+             *         use this as a minimum timestamp for further build cert
+             *         validations.  This works around issues with old DLLs that
+             *         we sign against with our certificate (crt, sdl, qt).
              */
             rc = RTLdrQueryProp(hLdrMod, RTLDRPROP_TIMESTAMP_SECONDS, &pNtViRdr->uTimestamp, sizeof(pNtViRdr->uTimestamp));
             if (RT_SUCCESS(rc))
             {
+#ifdef IN_RING3
+                if ((fFlags & SUPHNTVI_F_REQUIRE_BUILD_CERT) && pNtViRdr->uTimestamp < g_uBuildTimestampHack)
+                    pNtViRdr->uTimestamp = g_uBuildTimestampHack;
+#endif
+
                 rc = RTLdrVerifySignature(hLdrMod, supHardNtViCallback, pNtViRdr, pErrInfo);
+
+#ifdef IN_RING3
+                if ((fFlags & SUPHNTVI_F_REQUIRE_BUILD_CERT) && g_uBuildTimestampHack == 0 && RT_SUCCESS(rc))
+                    g_uBuildTimestampHack = pNtViRdr->uTimestamp;
+#endif
+
 
                 /*