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

Timestamp:

Nov 16, 2012 9:53:32 AM (12 years ago)

Author:

vboxsync

Message:

BUGZ:6508 Enable Stub installer silent cert installation only in case if binaries signing is enabled on build time.

Location:

trunk/src/VBox/Installer/win/Stub

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxStub.cpp (modified) (6 diffs)

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

@@ -29 +29 @@
 VBoxStub_TEMPLATE= VBOXSTUB
 VBoxStub_DEFS    = _WIN32_WINNT=0x0501 IN_RT_R3
+
 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 += \
@@ -41 +38 @@
 VBoxStub_LIBS = \
         $(VBOX_LIB_RUNTIME_STATIC) \
-        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib \
-        crypt32.lib
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
 
 VBoxStub.cpp_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)
-VBoxStub.cpp_DEPS  = \
-        $(VBOX_SVN_REV_KMK) \
-        $(VBoxStub_0_OUTDIR)/VBoxStubPublicCert.h
+VBoxStub.cpp_DEPS  = $(VBOX_SVN_REV_KMK)
+
+# If signing mode is enabled, then add the possibility to
+# install public certificate automatically in /silent mode
+ifdef VBOX_SIGNING_MODE
+
+VBoxStub_SOURCES  += VBoxStubCertUtil.cpp
+VBoxStub_LIBS     += crypt32.lib
+VBoxStub.cpp_DEPS += $(VBoxStub_0_OUTDIR)/VBoxStubPublicCert.h
 VBoxStub.cpp_INCS += $(VBoxStub_0_OUTDIR)
+VBoxStub.cpp_DEFS += VBOX_SIGNING_MODE
+
+$$(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 $@
+
+endif
 
 # The icon location is configurable.

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

@@ -49 +49 @@
 #include "resource.h"
 
+#ifdef VBOX_SIGNING_MODE
 #include "VBoxStubCertUtil.h"
 #include "VBoxStubPublicCert.h"
+#endif
 
 #ifndef  _UNICODE
@@ -367 +369 @@
     bool fExtractOnly              = false;
     bool fEnableLogging            = false;
+#ifdef VBOX_SIGNING_MODE
     bool fEnableSilentCert         = true;
+#endif
     char szExtractPath[RTPATH_MAX] = {0};
     char szMSIArgs[4096]           = {0};
@@ -380 +384 @@
         { "-silent",            's', RTGETOPT_REQ_NOTHING },
         { "/silent",            's', RTGETOPT_REQ_NOTHING },
+#ifdef VBOX_SIGNING_MODE
         { "--no-silent-cert",   'c', RTGETOPT_REQ_NOTHING },
         { "-no-silent-cert",    'c', RTGETOPT_REQ_NOTHING },
         { "/no-silent-cert",    'c', RTGETOPT_REQ_NOTHING },
+#endif
         { "--logging",          'l', RTGETOPT_REQ_NOTHING },
         { "-logging",           'l', RTGETOPT_REQ_NOTHING },
@@ -418 +424 @@
                 break;
 
+#ifdef VBOX_SIGNING_MODE
             case 'c':
                 fEnableSilentCert = false;
                 break;
+#endif
 
             case 'l':
@@ -558 +566 @@
             }
 
+#ifdef VBOX_SIGNING_MODE
             /*
              * If --silent command line option is specified, do force public
@@ -575 +584 @@
                 }
             }
-
+#endif
             /* Do actions on files. */
             for (BYTE k = 0; k < pHeader->byCntPkgs; k++)