VirtualBox

Changeset 96692 in vbox


Ignore:
Timestamp:
Sep 12, 2022 12:39:59 AM (2 years ago)
Author:
vboxsync
Message:

Add/Nt/Installer,/Config.kmk,SupDrv/Certs: Check for and install missing root certificates. This is a real problem with vista and older. bugref:10261

Location:
trunk
Files:
3 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r96684 r96692  
    179179
    180180
     181#
     182# Some source paths of global interest.
     183#
     184VBOX_PATH_SRC_CERTIFICATES = $(PATH_ROOT)/src/VBox/HostDrivers/Support/Certificates
     185
     186
     187#
    181188# Delete targets on failure.
     189#
    182190.DELETE_ON_ERROR:
    183191
     192#
    184193# Notify about important kBuild updates.
     194#
    185195if  $(KBUILD_VERSION_MAJOR) == 0 \
    186196 && (   $(KBUILD_VERSION_MINOR) >= 2 \
    … …  
    330340endif
    331341
     342
    332343#
    333344# The VirtualBox Configuration Defaults.
    … …  
    409420# (Used by the additions build server, don't invert it.)
    410421#VBOX_WITHOUT_ADDITIONS_ISO = 1
     422# Include root certs in the windows GAs installer and on the ISO (ignore when
     423# signing is disabled).  Since we don't have any runtime detection of which
     424# roots are actually being used, we expect shipping of the non-default root
     425# with the signing setup in LocalConfig.kmk.  Following root cert selectors
     426# are available (more details in GA tools & installer):
     427#       - VBOX_WITH_GA_ROOT_VERISIGN_G5
     428#       - VBOX_WITH_GA_ROOT_DIGICERT_ASSURED_ID
     429#       - VBOX_WITH_GA_ROOT_DIGICERT_HIGH_ASSURANCE_EV
     430VBOX_WITH_GA_ROOT_CERTS_INCLUDED := 1
     431if (!defined(VBOX_CERTIFICATE_SUBJECT_NAME) || !defined(VBOX_CERTIFICATE_SHA2_SUBJECT_NAME)) && "$(VBOX_SIGNING_MODE)" == "release"
     432 VBOX_WITH_GA_ROOT_DIGICERT_ASSURED_ID := 1
     433endif
    411434## @}
     435
    412436# Set build options right for building the Additions as an RPM package.
    413437# VBOX_ONLY_RPM_ADDITIONS = 1
    … …  
    42714295   VBOX_SIGN_IMAGE_CMDS_ORDERDEPS ?= $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_SIGN_IMAGE_ORDERDEPS))
    42724296  endif
    4273   ## Enable signing of the additions.
     4297  ## Enable signing of the additions drivers, i.e. create CAT files.
     4298  ## @todo r=bird: This bugger is entirely misplaced, as it belongs in the additions config section so it can be properly overriden.
    42744299  VBOX_SIGN_ADDITIONS   ?= 1
    42754300  ## Set if we should include the legacy timestamp CA.
    … …  
    42794304   endif
    42804305  endif
    4281   VBOX_LEGACY_TS_CA_FILE = $(PATH_ROOT)/src/VBox/HostDrivers/Support/Certificates/Timestamp-VBoxLegacyWinCA.crt
     4306  VBOX_LEGACY_TS_CA_FILE = $(VBOX_PATH_SRC_CERTIFICATES)/Timestamp-VBoxLegacyWinCA.crt
    42824307
    42834308 else ifeq ($(KBUILD_HOST),darwin)

  • trunk/src/VBox/Additions/Makefile.kmk

    r96407 r96692  
    306306  GUESTADDITIONS_FILESPEC.win += cert/vbox-legacy-timestamp-ca.cer=$(VBOX_PATH_ADDITIONS.win)/vbox-legacy-timestamp-ca.cer
    307307 endif
     308 ifdef VBOX_WITH_GA_ROOT_CERTS_INCLUDED
     309  ifdef VBOX_WITH_GA_ROOT_VERISIGN_G5
     310   GUESTADDITIONS_FILESPEC.win += cert/root-versign-pca3-g5.cer=$(VBOX_PATH_ADDITIONS.win)/root-versign-pca3-g5.cer
     311  endif
     312  ifdef VBOX_WITH_GA_ROOT_DIGICERT_ASSURED_ID
     313   GUESTADDITIONS_FILESPEC.win += cert/root-digicert-assured-id.cer=$(VBOX_PATH_ADDITIONS.win)/root-digicert-assured-id.cer
     314  endif
     315  ifdef VBOX_WITH_GA_ROOT_DIGICERT_HIGH_ASSURANCE_EV
     316   GUESTADDITIONS_FILESPEC.win += cert/root-digicert-high-assurance-ev.cer=$(VBOX_PATH_ADDITIONS.win)/root-digicert-high-assurance-ev.cer
     317  endif
     318 endif
    308319 GUESTADDITIONS_FILESPEC.win += windows11-bypass.reg=$(VBOX_PATH_ADDITIONS_SRC)/WINNT/tools/windows11-bypass.reg
    309320endif

  • trunk/src/VBox/Additions/WINNT/Installer/Languages/English.nsh

    r96407 r96692  
    3333LangString VBOX_NOTICE_ARCH_AMD64 ${LANG_ENGLISH}                   "This application only runs on 64-bit Windows systems. Please install the 32-bit version of $(^Name)!"
    3434LangString VBOX_NT4_NO_SP6 ${LANG_ENGLISH}                          "You do not seem to have Service Pack 6 for Windows NT4 installed.$\r$\nWe recommend that you install it first. Do you wish to continue anyway?"
     35
     36LangString VBOX_CA_CHECK_VERISIGN_G5 ${LANG_ENGLISH}                "A root certificate needed for driver signature verification during installation is missing:$\r$\n$\t'VeriSign Trust Network; OU=(c) 2006 VeriSign, Inc. - For authorized use only'$\r$\nThis can be downloaded from https://www.digicert.com/kb/digicert-root-certificates.htm and installed using $\"$INSTDIR$\".$\r$\nThe installation is likely to fail without the certificate.  Do you wish to continue anyway?"
     37LangString VBOX_CA_CHECK_DIGICERT_ASSURED_ID ${LANG_ENGLISH}        "A root certificate needed for driver signature verification during installation is missing:$\r$\n$\t'DigiCert Assured ID Root CA'$\r$\nThis can be downloaded from https://www.digicert.com/kb/digicert-root-certificates.htm and installed using $\"$INSTDIR$\".$\r$\nThe installation is likely to fail without the certificate.  Do you wish to continue anyway?"
     38LangString VBOX_CA_CHECK_DIGICERT_HIGH_ASSURANCE_EV ${LANG_ENGLISH} "A root certificate needed for driver signature verification during installation is missing:$\r$\n$\t'DigiCert High Assurance EV Root CA'$\r$\nThis can be downloaded from https://www.digicert.com/kb/digicert-root-certificates.htm and installed using $\"$INSTDIR$\".$\r$\nThe installation is likely to fail without the certificate.  Do you wish to continue anyway?"
    3539
    3640LangString VBOX_PLATFORM_UNSUPPORTED ${LANG_ENGLISH}                "The VirtualBox Guest Additions cannot be installed on this version of Windows"

  • trunk/src/VBox/Additions/WINNT/Installer/Languages/French.nsh

    r96407 r96692  
    3333LangString VBOX_NOTICE_ARCH_AMD64 ${LANG_FRENCH}                    "Cette application peut seulement être executée sur des systèmes Windows 64-bit. Veuillez installer la version 32-bit de $(^Name)!"
    3434LangString VBOX_NT4_NO_SP6 ${LANG_FRENCH}                           "Le programme d'installation a détécté que vous utilisez Windows NT4 sans Service Pack 6.$\r$\nNous vous conseillons d'installer ce Service Pack avant de continuer. Désirez vous cependant continuer?"
     35
     36;; @todo translate:
     37LangString VBOX_CA_CHECK_VERISIGN_G5 ${LANG_FRENCH}                 "A root certificate needed for driver signature verification during installation is missing:$\r$\n$\t'VeriSign Trust Network; OU=(c) 2006 VeriSign, Inc. - For authorized use only'$\r$\nThis can be downloaded from https://www.digicert.com/kb/digicert-root-certificates.htm and installed using $\"$INSTDIR$\".$\r$\nThe installation is likely to fail without the certificate.  Do you wish to continue anyway?"
     38LangString VBOX_CA_CHECK_DIGICERT_ASSURED_ID ${LANG_FRENCH}         "A root certificate needed for driver signature verification during installation is missing:$\r$\n$\t'DigiCert Assured ID Root CA'$\r$\nThis can be downloaded from https://www.digicert.com/kb/digicert-root-certificates.htm and installed using $\"$INSTDIR$\".$\r$\nThe installation is likely to fail without the certificate.  Do you wish to continue anyway?"
     39LangString VBOX_CA_CHECK_DIGICERT_HIGH_ASSURANCE_EV ${LANG_FRENCH}  "A root certificate needed for driver signature verification during installation is missing:$\r$\n$\t'DigiCert High Assurance EV Root CA'$\r$\nThis can be downloaded from https://www.digicert.com/kb/digicert-root-certificates.htm and installed using $\"$INSTDIR$\".$\r$\nThe installation is likely to fail without the certificate.  Do you wish to continue anyway?"
    3540
    3641LangString VBOX_PLATFORM_UNSUPPORTED ${LANG_FRENCH}                 "Les Additions invité ne sont pas encore supportés sur cette plateforme!"

  • trunk/src/VBox/Additions/WINNT/Installer/Languages/German.nsh

    r96407 r96692  
    3333LangString VBOX_NOTICE_ARCH_AMD64 ${LANG_GERMAN}                    "Diese Applikation läuft nur auf 64-bit Windows-Systemen. Bitte installieren Sie die 32-bit Version der $(^Name)!"
    3434LangString VBOX_NT4_NO_SP6 ${LANG_GERMAN}                           "Es ist kein Service Pack 6 für NT 4.0 installiert.$\r$\nEs wird empfohlen das Service-Pack vor dieser Installation zu installieren. Trotzdem jetzt ohne Service-Pack installieren?"
     35
     36;; @todo translate:
     37LangString VBOX_CA_CHECK_VERISIGN_G5 ${LANG_GERMAN}                 "A root certificate needed for driver signature verification during installation is missing:$\r$\n$\t'VeriSign Trust Network; OU=(c) 2006 VeriSign, Inc. - For authorized use only'$\r$\nThis can be downloaded from https://www.digicert.com/kb/digicert-root-certificates.htm and installed using $\"$INSTDIR$\".$\r$\nThe installation is likely to fail without the certificate.  Do you wish to continue anyway?"
     38LangString VBOX_CA_CHECK_DIGICERT_ASSURED_ID ${LANG_GERMAN}         "A root certificate needed for driver signature verification during installation is missing:$\r$\n$\t'DigiCert Assured ID Root CA'$\r$\nThis can be downloaded from https://www.digicert.com/kb/digicert-root-certificates.htm and installed using $\"$INSTDIR$\".$\r$\nThe installation is likely to fail without the certificate.  Do you wish to continue anyway?"
     39LangString VBOX_CA_CHECK_DIGICERT_HIGH_ASSURANCE_EV ${LANG_GERMAN}  "A root certificate needed for driver signature verification during installation is missing:$\r$\n$\t'DigiCert High Assurance EV Root CA'$\r$\nThis can be downloaded from https://www.digicert.com/kb/digicert-root-certificates.htm and installed using $\"$INSTDIR$\".$\r$\nThe installation is likely to fail without the certificate.  Do you wish to continue anyway?"
    3540
    3641LangString VBOX_PLATFORM_UNSUPPORTED ${LANG_GERMAN}                 "Diese Plattform wird noch nicht durch diese Guest Additions unterstützt!"

  • trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

    r96691 r96692  
    177177VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
    178178        $(PATH_STAGE_BIN)/additions/VBoxAudioTest.exe
     179endif
     180
     181if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
     182 ifdef VBOX_WITH_VBOX_LEGACY_TS_CA
     183VBOX_WINDOWS_ADDITIONS_OTHER_FILES += $(PATH_STAGE_BIN)/additions/vbox-legacy-timestamp-ca.cer
     184 endif
     185 ifdef VBOX_WITH_GA_ROOT_CERTS_INCLUDED
     186  ifdef VBOX_WITH_GA_ROOT_VERISIGN_G5
     187VBOX_WINDOWS_ADDITIONS_OTHER_FILES += $(PATH_STAGE_BIN)/additions/root-versign-pca3-g5.cer
     188  endif
     189  ifdef VBOX_WITH_GA_ROOT_DIGICERT_ASSURED_ID
     190VBOX_WINDOWS_ADDITIONS_OTHER_FILES += $(PATH_STAGE_BIN)/additions/root-digicert-assured-id.cer
     191  endif
     192  ifdef VBOX_WITH_GA_ROOT_DIGICERT_HIGH_ASSURANCE_EV
     193VBOX_WINDOWS_ADDITIONS_OTHER_FILES += $(PATH_STAGE_BIN)/additions/root-digicert-high-assurance-ev.cer
     194  endif
     195 endif
    179196endif
    180197
    … …  
    220237                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh \
    221238                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \
     239                $(PATH_SUB_CURRENT)/Languages/English.nsh \
     240                $(PATH_SUB_CURRENT)/Languages/German.nsh \
     241                $(PATH_SUB_CURRENT)/Languages/French.nsh \
    222242                $(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) \
    223243                $(VBOX_WINDOWS_ADDITIONS_OTHER_FILES) \
    … …  
    235255                $(VB_WIN_ADD_NSIS_ENV) \
    236256                -- $(EXEC_X86_WIN32) $(VBOX_PATH_NSIS)/makensis.exe /NOCD /V2 \
    237                         $(if $(VBOX_SIGN_ADDITIONS),'/DVBOX_SIGN_ADDITIONS=1') \
    238257                        $(if $(VBOX_SIGNING_MODE),'/DEXTERNAL_UNINSTALLER=1') \
    239                         $(if $(VBOX_WITH_VBOX_LEGACY_TS_CA),'/DVBOX_WITH_VBOX_LEGACY_TS_CA=1') \
     258                       $(if-expr defined(VBOX_SIGN_ADDITIONS) && defined(VBOX_SIGNING_MODE), \
     259                        '/DVBOX_SIGN_ADDITIONS=1' \
     260                        $(if-expr defined(VBOX_WITH_GA_ROOT_CERTS_INCLUDED)            ,'/DVBOX_WITH_GA_ROOT_CERTS_INCLUDED=1',) \
     261                        $(if-expr defined(VBOX_WITH_GA_ROOT_VERISIGN_G5)               ,'/DVBOX_WITH_GA_ROOT_VERISIGN_G5=1',) \
     262                        $(if-expr defined(VBOX_WITH_GA_ROOT_DIGICERT_ASSURED_ID)       ,'/DVBOX_WITH_GA_ROOT_DIGICERT_ASSURED_ID=1',) \
     263                        $(if-expr defined(VBOX_WITH_GA_ROOT_DIGICERT_HIGH_ASSURANCE_EV),'/DVBOX_WITH_GA_ROOT_DIGICERT_HIGH_ASSURANCE_EV=1',) \
     264                                $(if-expr defined(VBOX_WITH_VBOX_LEGACY_TS_CA)                 ,'/DVBOX_WITH_VBOX_LEGACY_TS_CA=1') \
     265                       ,) \
    240266                        $(if $(VBOX_INSTALLER_ADD_LANGUAGES),'/DVBOX_INSTALLER_ADD_LANGUAGES=1') \
    241267                        $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES),'/DVBOX_BRAND_$(lang)_LICENSE_RTF=1') \
    … …  
    262288                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh \
    263289                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \
     290                $(PATH_SUB_CURRENT)/Languages/English.nsh \
     291                $(PATH_SUB_CURRENT)/Languages/German.nsh \
     292                $(PATH_SUB_CURRENT)/Languages/French.nsh \
    264293                $(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) \
    265294                $(VBOX_WINDOWS_ADDITIONS_OTHER_FILES) \

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsLog.nsh

    r96451 r96692  
    6767!macro _logToVBoxTray type text
    6868
    69     ${LogVerbose} "${text}"
     69    ${LogVerbose} "To VBoxTray: ${text}"
    7070!if $%VBOX_WITH_GUEST_INSTALL_HELPER% == "1"
    7171    Push $0

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

    r96687 r96692  
    160160FunctionEnd
    161161
     162!ifdef VBOX_SIGN_ADDITIONS
     163  !ifdef VBOX_WITH_GA_ROOT_VERISIGN_G5 | VBOX_WITH_GA_ROOT_DIGICERT_ASSURED_ID | VBOX_WITH_GA_ROOT_DIGICERT_HIGH_ASSURANCE_EV
     164
     165;;
     166; Checks
     167;
     168; @param    pop1    The RDN of the certificate.
     169; @param    pop2    Filename (cert dir) if we're shipping it (VBOX_WITH_GA_ROOT_CERTS_INCLUDED).
     170; @param    pop3    The direct download URL link.
     171; @param    pop4    The message to display if missing.
     172;
     173Function W2K_RootCertCheck
     174  ;
     175  ; Prolog: Save $0, $1, $2, $3 and move the parameters into them. Also save $4 for results.
     176  ;
     177  Push    $0
     178  Exch    4
     179  Push    $1
     180  Exch    4
     181  Push    $2
     182  Exch    4
     183  Push    $3
     184  Exch    4
     185  Pop     $0                                ; RDN
     186  Pop     $1                                ; Filename
     187  Pop     $2                                ; Direct URL
     188  Pop     $3                                ; Missing message
     189  Push    $4
     190
     191  ;
     192  ; Run VBoxCertUtil to check.
     193  ;
     194  ${LogVerbose} "Checking if $0 is installed ..."
     195  ${If} ${Silent}
     196    nsExec::ExecToStack "$\"$INSTDIR\cert\VBoxCertUtil.exe$\" root-exists $\"$0$\""
     197    Exch 1
     198    Pop  $4                                 ; output
     199    ${LogVerbose} "$4"
     200    Pop  $4                                 ; exit code
     201  ${Else}
     202    nsExec::ExecToLog   "$\"$INSTDIR\cert\VBoxCertUtil.exe$\" root-exists $\"$0$\""
     203    Pop  $4                                 ; exit code
     204  ${EndIf}
     205  ${LogVerbose} "Exit code: $4"
     206
     207  ;
     208  ; VBoxCertUtil terminates with exit code 10 if not found, 0 if found and something else on failure.
     209  ;
     210  ${If} $4 == 0
     211    ${LogVerbose} "Root certificate is present."
     212  ${ElseIf} $4 == 10
     213  !ifdef VBOX_WITH_GA_ROOT_CERTS_INCLUDED
     214    ${LogVerbose} "Root certificate is _NOT_ present.  Installing it ..."
     215    ${CmdExecute} "$\"$INSTDIR\cert\VBoxCertUtil.exe$\" add-root $\"$INSTDIR\cert\$1$\"" 'non-zero-exitcode=abort'
     216  !else
     217    ${LogVerbose} "Root certificate is _NOT_ present.  The certificate can be downloaded from $2 and installed using '$INSTDIR\cert\VBoxCertUtil.exe'."
     218    MessageBox MB_YESNO $3 /SD IDYES IDYES l_dont_abort
     219    Abort "Missing signing root certificate $0"
     220l_dont_abort:
     221  !endif
     222  ${ElseIf} $R4 <> 0
     223    ${LogVerbose} "Unable to determine whether the root certificate was present. Assuming the worst."
     224    Abort "Error when checking whether signing root certificate '$0' was present: $4"
     225  ${EndIf}
     226
     227  ;
     228  ; Epilog: Restore $0-$4 (we return nothing).
     229  ;
     230  Pop     $4
     231  Pop     $3
     232  Pop     $2
     233  Pop     $1
     234  Pop     $0
     235FunctionEnd
     236  !endif
     237!endif
     238
    162239Function W2K_Prepare
     240  ; Save registers
     241  Push  $R0
     242  Push  $R1
     243  Push  $R2
     244  Push  $R3
     245  Push  $R4
    163246
    164247  ${If} $g_bNoVBoxServiceExit == "false"
    … …  
    178261  Delete /REBOOTOK "$INSTDIR\VBoxService.exe"
    179262
    180 !ifdef VBOX_SIGN_ADDITIONS && VBOX_WITH_VBOX_LEGACY_TS_CA
    181   ; NSIS only supports global vars, even in functions -- great
     263!ifdef VBOX_SIGN_ADDITIONS
     264  ;
     265  ; When installing signed GAs, we need to check whether the root certs are
     266  ; present, we use VBoxCertUtil for this task.  This utility is also used
     267  ; for installing missing root certs we can ship, like the special timestamp
     268  ; root further down.
     269  ;
     270  ${LogVerbose} "Installing VBoxCertUtil.exe ..."
     271  SetOutPath "$INSTDIR\cert"
     272  FILE "$%PATH_OUT%\bin\additions\VBoxCertUtil.exe"
     273  !ifdef VBOX_WITH_VBOX_LEGACY_TS_CA
     274  FILE "$%PATH_OUT%\bin\additions\vbox-legacy-timestamp-ca.cer"
     275  !endif
     276  !ifdef VBOX_WITH_GA_ROOT_CERTS_INCLUDED
     277    !ifdef VBOX_WITH_GA_ROOT_VERISIGN_G5
     278  FILE "$%PATH_OUT%\bin\additions\root-versign-pca3-g5.cer"
     279    !endif
     280    !ifdef VBOX_WITH_GA_ROOT_DIGICERT_ASSURED_ID
     281  FILE "$%PATH_OUT%\bin\additions\root-digicert-assured-id.cer"
     282    !endif
     283    !ifdef VBOX_WITH_GA_ROOT_DIGICERT_HIGH_ASSURANCE_EV
     284  FILE "$%PATH_OUT%\bin\additions\root-digicert-high-assurance-ev.cer"
     285    !endif
     286  !endif
     287
     288  ; Now that the files are in place, do the checking.
     289  !ifdef VBOX_WITH_GA_ROOT_VERISIGN_G5
     290  Push $(VBOX_CA_CHECK_VERISIGN_G5)
     291  Push "http://cacerts.digicert.com/pca3-g5.crt"
     292  Push "root-versign-pca3-g5.cer"
     293  Push "C=US; O=VeriSign, Inc.; OU=VeriSign Trust Network; OU=(c) 2006 VeriSign, Inc. - For authorized use only; CN=VeriSign Class 3 Public Primary Certification Authority - G5"
     294  Call W2K_RootCertCheck
     295  !endif
     296
     297  !ifdef VBOX_WITH_GA_ROOT_DIGICERT_ASSURED_ID
     298  Push $(VBOX_CA_CHECK_DIGICERT_ASSURED_ID)
     299  Push "https://cacerts.digicert.com/DigiCertAssuredIDRootCA.crt"
     300  Push "root-digicert-assured-id.cer"
     301  Push "C=US; O=DigiCert Inc; OU=www.digicert.com; CN=DigiCert Assured ID Root CA"
     302  Call W2K_RootCertCheck
     303  !endif
     304
     305  !ifdef VBOX_WITH_GA_ROOT_DIGICERT_HIGH_ASSURANCE_EV
     306  Push $(VBOX_CA_CHECK_DIGICERT_HIGH_ASSURANCE_EV)
     307  Push "https://cacerts.digicert.com/DigiCertHighAssuranceEVRootCA.crt"
     308  Push "root-digicert-high-assurance-ev.cer"
     309  Push "C=US; O=DigiCert Inc; OU=www.digicert.com; CN=DigiCert High Assurance EV Root CA"
     310  Call W2K_RootCertCheck
     311  !endif
     312
     313  !ifdef VBOX_WITH_VBOX_LEGACY_TS_CA
     314  ;
     315  ; Install the legacy timestamp CA if required/requested.
     316  ;
     317
     318  ; NSIS only supports global vars, even in functions -- great ;; @todo r=bird: why don't you just change $g_bInstallTimestampCA?
    182319  Var /GLOBAL bDoInstallCA
    183320  StrCpy $bDoInstallCA "false" ; Set a default value
    … …  
    195332  ${If} $bDoInstallCA == "true"
    196333    ${LogVerbose} "Installing legacy timestamp CA certificate ..."
    197     SetOutPath "$INSTDIR\cert"
    198     FILE "$%PATH_OUT%\bin\additions\vbox-legacy-timestamp-ca.cer"
    199     FILE "$%PATH_OUT%\bin\additions\VBoxCertUtil.exe"
    200     ${CmdExecute} "$\"$INSTDIR\cert\VBoxCertUtil.exe$\" add-trusted-publisher --root $\"$INSTDIR\cert\vbox-legacy-timestamp-ca.cer$\"" 'non-zero-exitcode=log'
     334    ${CmdExecute} "$\"$INSTDIR\cert\VBoxCertUtil.exe$\" add-root $\"$INSTDIR\cert\vbox-legacy-timestamp-ca.cer$\"" 'non-zero-exitcode=log'
    201335    ${CmdExecute} "$\"$INSTDIR\cert\VBoxCertUtil.exe$\" display-all" 'non-zero-exitcode=log'
    202336  ${EndIf}
    203 !endif
    204 
     337  !endif ; VBOX_WITH_VBOX_LEGACY_TS_CA
     338
     339!endif ; VBOX_SIGN_ADDITIONS
     340
     341  ; Restore registers
     342  Pop $R4
     343  Pop $R3
     344  Pop $R2
     345  Pop $R1
     346  Pop $R0
    205347FunctionEnd
    206348

  • trunk/src/VBox/Additions/WINNT/tools/Makefile.kmk

    r96684 r96692  
    7171AdditionsInstCertFiles_SOURCES += $(VBOX_LEGACY_TS_CA_FILE)=>vbox-legacy-timestamp-ca.cer
    7272 endif
     73 ifdef VBOX_WITH_GA_ROOT_CERTS_INCLUDED
     74  ifdef VBOX_WITH_GA_ROOT_VERISIGN_G5
     75AdditionsInstCertFiles_SOURCES += \
     76        $(VBOX_PATH_SRC_CERTIFICATES)/CaRoot-VeriSignPca3G5-18dad19e267de8bb4a2158cdcc6b3b4a.crt=>root-versign-pca3-g5.cer
     77  endif
     78  ifdef VBOX_WITH_GA_ROOT_DIGICERT_ASSURED_ID
     79AdditionsInstCertFiles_SOURCES += \
     80        $(VBOX_PATH_SRC_CERTIFICATES)/CaRoot-DigiCertAssuredIDRootCA-0ce7e0e517d846fe8fe560fc1bf03039.crt=>root-digicert-assured-id.cer
     81  endif
     82  ifdef VBOX_WITH_GA_ROOT_DIGICERT_HIGH_ASSURANCE_EV
     83AdditionsInstCertFiles_SOURCES += \
     84        $(VBOX_PATH_SRC_CERTIFICATES)/CaRoot-DigiCertHighAssuranceEVRootCA-02ac5c266a0b409b8f0b79f2ae462577.crt=>root-digicert-high-assurance-ev.cer
     85  endif
     86 endif
    7387endif
    7488
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette