Allow Windows layout builds to fully skip code signing (GH-12808)

zooba · web-flow · commit 606c66a17faf · 2019-04-12T11:24:15.000-07:00
diff --git a/Tools/msi/make_cat.ps1 b/Tools/msi/make_cat.ps1
@@ -16,6 +16,7 @@
 #>
 param(
     [Parameter(Mandatory=$true)][string]$catalog,
+    [switch]$sign,
     [string]$description,
     [string]$certname,
     [string]$certsha1,
@@ -31,4 +32,6 @@ MakeCat $catalog
 if (-not $?) {
     throw "Catalog compilation failed"
 }
-Sign-File -certname $certname -certsha1 $certsha1 -certfile $certfile -description $description -files @($catalog -replace 'cdf$', 'cat')
+if ($sign) {
+    Sign-File -certname $certname -certsha1 $certsha1 -certfile $certfile -description $description -files @($catalog -replace 'cdf$', 'cat')
+}
diff --git a/Tools/msi/sdktools.psm1 b/Tools/msi/sdktools.psm1
@@ -31,15 +31,17 @@ function Sign-File {
         $certfile = $env:SigningCertificateFile;
     }
 
+    if (-not ($certsha1 -or $certname -or $certfile)) {
+        throw "No signing certificate specified"
+    }
+
     foreach ($a in $files) {
         if ($certsha1) {
             SignTool sign /sha1 $certsha1 /fd sha256 /t http://timestamp.verisign.com/scripts/timestamp.dll /d $description $a
         } elseif ($certname) {
             SignTool sign /a /n $certname /fd sha256 /t http://timestamp.verisign.com/scripts/timestamp.dll /d $description $a
         } elseif ($certfile) {
             SignTool sign /f $certfile /fd sha256 /t http://timestamp.verisign.com/scripts/timestamp.dll /d $description $a
-        } else {
-            SignTool sign /a /fd sha256 /t http://timestamp.verisign.com/scripts/timestamp.dll /d $description $a
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,15 +31,17 @@ function Sign-File {`
`31`	`31`	`$certfile = $env:SigningCertificateFile;`
`32`	`32`	`}`
`33`	`33`
	`34`	`+ if (-not ($certsha1 -or $certname -or $certfile)) {`
	`35`	`+ throw "No signing certificate specified"`
	`36`	`+ }`
	`37`	`+`
`34`	`38`	`foreach ($a in $files) {`
`35`	`39`	`if ($certsha1) {`
`36`	`40`	`SignTool sign /sha1 $certsha1 /fd sha256 /t http://timestamp.verisign.com/scripts/timestamp.dll /d $description $a`
`37`	`41`	`} elseif ($certname) {`
`38`	`42`	`SignTool sign /a /n $certname /fd sha256 /t http://timestamp.verisign.com/scripts/timestamp.dll /d $description $a`
`39`	`43`	`} elseif ($certfile) {`
`40`	`44`	`SignTool sign /f $certfile /fd sha256 /t http://timestamp.verisign.com/scripts/timestamp.dll /d $description $a`
`41`		`- } else {`
`42`		`- SignTool sign /a /fd sha256 /t http://timestamp.verisign.com/scripts/timestamp.dll /d $description $a`
`43`	`45`	`}`
`44`	`46`	`}`
`45`	`47`	`}`