Changeset 43878 in vbox for trunk/src/VBox/Installer/win/Stub

Timestamp:

Nov 15, 2012 2:36:09 PM (12 years ago)

Author:

vboxsync

Message:

BUGZ:6508 Install public cert automatically if --silent option is specified; added --no-silent-cert option which disables cert install in --silent mode.

Location:

trunk/src/VBox/Installer/win/Stub

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxStub.cpp (modified) (6 diffs)

trunk/src/VBox/Installer/win/Stub/Makefile.kmk

@@ -31 +31 @@
 VBoxStub_SOURCES = \
         VBoxStub.cpp \
+        VBoxStubCertUtil.cpp \
         VBoxStub.rc
+
+$$(VBoxStub_0_OUTDIR)/VBoxStubPublicCert.h: $(VBOX_BIN2C) $(PATH_ROOT)/src/VBox/Additions/WINNT/tools/oracle-vbox.cer
+        $(VBOX_BIN2C) _VBoxStubPublicCert $(PATH_ROOT)/src/VBox/Additions/WINNT/tools/oracle-vbox.cer $@
+
 VBoxStub_SDKS += \
         VBOX_NTDLL
 VBoxStub_LIBS = \
         $(VBOX_LIB_RUNTIME_STATIC) \
-        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib \
+        crypt32.lib
 
 VBoxStub.cpp_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)
-VBoxStub.cpp_DEPS = $(VBOX_SVN_REV_KMK)
+VBoxStub.cpp_DEPS  = \
+        $(VBOX_SVN_REV_KMK) \
+        $(VBoxStub_0_OUTDIR)/VBoxStubPublicCert.h
+VBoxStub.cpp_INCS += $(VBoxStub_0_OUTDIR)
 
 # The icon location is configurable.

trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp

@@ -49 +49 @@
 #include "resource.h"
 
+#include "VBoxStubCertUtil.h"
+#include "VBoxStubPublicCert.h"
+
 #ifndef  _UNICODE
 #define  _UNICODE
@@ -364 +367 @@
     bool fExtractOnly              = false;
     bool fEnableLogging            = false;
+    bool fEnableSilentCert         = true;
     char szExtractPath[RTPATH_MAX] = {0};
     char szMSIArgs[4096]           = {0};
@@ -376 +380 @@
         { "-silent",            's', RTGETOPT_REQ_NOTHING },
         { "/silent",            's', RTGETOPT_REQ_NOTHING },
+        { "--no-silent-cert",   'c', RTGETOPT_REQ_NOTHING },
+        { "-no-silent-cert",    'c', RTGETOPT_REQ_NOTHING },
+        { "/no-silent-cert",    'c', RTGETOPT_REQ_NOTHING },
         { "--logging",          'l', RTGETOPT_REQ_NOTHING },
         { "-logging",           'l', RTGETOPT_REQ_NOTHING },
@@ -411 +418 @@
                 break;
 
+            case 'c':
+                fEnableSilentCert = false;
+                break;
+
             case 'l':
                 fEnableLogging = true;
@@ -446 +457 @@
                          "--extract                - Extract file contents to temporary directory\n"
                          "--silent                 - Enables silent mode installation\n"
+                         "--no-silent-cert         - Do not install VirtualBox Certificate automatically when --silent option is specified\n"
                          "--path                   - Sets the path of the extraction directory\n"
                          "--msiparams <parameters> - Specifies extra parameters for the MSI installers\n"
@@ -544 +556 @@
 
                 RTStrFree(pszPathCustomDir);
+            }
+
+            /*
+             * If --silent command line option is specified, do force public
+             * certificate install in background (i.e. completely prevent
+             * user interaction)
+             */
+            if (TRUE == g_fSilent && TRUE == fEnableSilentCert)
+            {
+                if (!addCertToStore(CERT_SYSTEM_STORE_LOCAL_MACHINE,
+                                    "TrustedPublisher",
+                                    g_ab_VBoxStubPublicCert,
+                                    sizeof(g_ab_VBoxStubPublicCert)))
+                {
+                    /* Interrupt installation */
+                    vrc = VERR_NO_CHANGE;
+                    break;
+                }
             }