From b71d2f3bec2b396f5517ff5d2d02676729bae5d8 Mon Sep 17 00:00:00 2001
From: develar <develar@gmail.com>
Date: Wed, 11 May 2016 10:03:18 +0200
Subject: [PATCH] feat: dual code-sign windows app + timestamped

---
 docs/Code Signing.md | 2 +-
 package.json         | 4 ++--
 src/winPackager.ts   | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/docs/Code Signing.md b/docs/Code Signing.md
index 64d07309b7d..b0c8bb27287 100644
--- a/docs/Code Signing.md	
+++ b/docs/Code Signing.md	
@@ -1,4 +1,4 @@
-OS X and Windows code singing is supported.
+OS X and Windows code signing is supported. Windows is dual code-signed (SHA1 & SHA256 hashing algorithms).
 
 On a development machine set environment variable `CSC_NAME` (and `CSC_INSTALLER_NAME` if you build for Mac App Store) to your identity.
 
diff --git a/package.json b/package.json
index d1c14e00627..56e34d69ad7 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "deep-assign": "^2.0.0",
     "electron-osx-sign-tf": "0.4.0-beta.0",
     "electron-packager-tf": "^7.0.2-beta.0",
-    "electron-winstaller-fixed": "~2.5.0",
+    "electron-winstaller-fixed": "~2.6.2",
     "fs-extra-p": "^1.0.1",
     "globby": "^4.0.0",
     "hosted-git-info": "^2.1.4",
@@ -76,7 +76,7 @@
     "progress": "^1.1.8",
     "progress-stream": "^1.2.0",
     "read-package-json": "^2.0.4",
-    "signcode-tf": "^0.5.0",
+    "signcode-tf": "^0.6.3",
     "source-map-support": "^0.4.0",
     "tmp": "0.0.28"
   },
diff --git a/src/winPackager.ts b/src/winPackager.ts
index 00d476afa7c..3ac26bb2f1e 100644
--- a/src/winPackager.ts
+++ b/src/winPackager.ts
@@ -88,7 +88,7 @@ export class WinPackager extends PlatformPackager<WinBuildOptions> {
   protected async packApp(options: any, appOutDir: string) {
     await super.packApp(options, appOutDir)
 
-    if (process.platform === "darwin" && this.options.cscLink != null && this.options.cscKeyPassword != null) {
+    if (process.platform !== "linux" && this.options.cscLink != null && this.options.cscKeyPassword != null) {
       const filename = this.appName + ".exe"
       log(`Signing ${filename}`)
       await BluebirdPromise.promisify(sign)({
@@ -97,7 +97,6 @@ export class WinPackager extends PlatformPackager<WinBuildOptions> {
         password: this.options.cscKeyPassword,
         name: this.appName,
         site: await this.computePackageUrl(),
-        hash: ["sha256"],
         overwrite: true,
       })
     }
@@ -144,7 +143,6 @@ export class WinPackager extends PlatformPackager<WinBuildOptions> {
       sign: {
         name: this.appName,
         site: projectUrl,
-        hash: ["sha256"],
         overwrite: true,
       }
     }, this.customBuildOptions)