Changeset 11725 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

Aug 27, 2008 10:21:47 PM (16 years ago)

Author:

vboxsync

Message:

#3076: Merged in the branch with the alternate driver authentication method. (34468:HEAD)

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxBFE.cpp (modified) (3 diffs)
• VBoxBFEHardened.cpp (added)

trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk

@@ -28 +28 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-PROGRAMS += VBoxBFE
+#
+# Targets.
+#
+ifdef VBOX_WITH_HARDENING
+ ifneq ($(KBUILD_TARGET),darwin) # No hardened VBoxBFE on darwin (.m).
+  PROGRAMS += VBoxBFEHardened
+  DLLS += VBoxBFE
+ endif
+else
+ PROGRAMS += VBoxBFE
+endif
+
+#
+# Hardened VBoxBFE.
+#
+VBoxBFEHardened_TEMPLATE = VBOXR3HARDENEDEXE
+VBoxBFEHardened_SOURCES = VBoxBFEHardened.cpp
+VBoxBFEHardened_NAME = VBoxBFE
+
 
 #
 # VBoxBFE
 #
-VBoxBFE_TEMPLATE = VBOXR3NPEXE
+VBoxBFE_TEMPLATE =
+VBoxBFE_TEMPLATE  := $(if $(VBOX_WITH_HARDENING),VBOXR3NP,VBOXR3NPEXE)
 #ifdef VBOX_WITH_SECURELABEL
 #VBoxBFE_DEFS += VBOX_SECURELABEL

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -415 +415 @@
 
 /** entry point */
-int main(int argc, char **argv)
+extern "C" DECLEXPORT(int) TrustedMain (int argc, char **argv, char **envp)
 {
-#ifdef RT_OS_L4
-#ifndef L4API_l4v2onv4
-    /* clear Fiasco kernel trace buffer */
-    fiasco_tbuf_clear();
-#endif
-    /* set the environment.  Must be done before the runtime is
-       initialised.  Yes, it really must. */
-    for (int i = 0; i < argc; i++)
-        if (strcmp(argv[i], "-env") == 0)
-        {
-            if (++i >= argc)
-                return SyntaxError("missing argument to -env (format: var=value)!\n");
-            /* add it to the environment */
-            if (putenv(argv[i]) != 0)
-                return SyntaxError("Error setting environment string %s.\n", argv[i]);
-        }
-#endif /* RT_OS_L4 */
-
-    /*
-     * Before we do *anything*, we initialize the runtime.
-     */
-    int rc = RTR3Init();
-    if (VBOX_FAILURE(rc))
-        return FatalError("RTR3Init failed rc=%Vrc\n", rc);
-
-
     bool fFullscreen = false;
 #ifdef VBOX_VRDP
@@ -455 +429 @@
     uint32_t u32MaxVRAM;
 #endif
+    int rc = VINF_SUCCESS;
 
     RTPrintf("VirtualBox Simple SDL GUI built %s %s\n", __DATE__, __TIME__);
@@ -1011 +986 @@
 
 
+#ifndef VBOX_WITH_HARDENING
+/**
+ * Main entry point.
+ */
+int main(int argc, char **argv)
+{
+# ifdef RT_OS_L4
+# ifndef L4API_l4v2onv4
+    /* clear Fiasco kernel trace buffer */
+    fiasco_tbuf_clear();
+# endif
+    /* set the environment.  Must be done before the runtime is
+       initialised.  Yes, it really must. */
+    for (int i = 0; i < argc; i++)
+        if (strcmp(argv[i], "-env") == 0)
+        {
+            if (++i >= argc)
+                return SyntaxError("missing argument to -env (format: var=value)!\n");
+            /* add it to the environment */
+            if (putenv(argv[i]) != 0)
+                return SyntaxError("Error setting environment string %s.\n", argv[i]);
+        }
+# endif /* RT_OS_L4 */
+
+    /*
+     * Before we do *anything*, we initialize the runtime.
+     */
+    int rc = RTR3Init();
+    if (VBOX_FAILURE(rc))
+        return FatalError("RTR3Init failed rc=%Vrc\n", rc);
+
+    return TrustedMain(argc, argv, NULL);
+}
+#endif /* !VBOX_WITH_HARDENING */
+
 
 /**