From f6156b63062a4ad8095da7ac4c1be772b9ae31d2 Mon Sep 17 00:00:00 2001
From: Robin <robin@getgreenshot.org>
Date: Mon, 15 Aug 2016 18:16:43 +0200
Subject: [PATCH] Trying with Import-PfxCertificate

---
 Greenshot/releases/innosetup/setup.iss.template |  4 ++--
 build.ps1                                       | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Greenshot/releases/innosetup/setup.iss.template b/Greenshot/releases/innosetup/setup.iss.template
index 413bb97ba..398410fbf 100644
--- a/Greenshot/releases/innosetup/setup.iss.template
+++ b/Greenshot/releases/innosetup/setup.iss.template
@@ -128,9 +128,9 @@ OutputDir=..\
 PrivilegesRequired=none
 SetupIconFile=..\..\icons\applicationIcon\icon.ico
 ; Create a SHA1 signature
-SignTool=SignTool sign /debug /sm /fd sha1 /tr http://time.certum.pl /td sha1 $f
+SignTool=SignTool sign /debug /fd sha1 /tr http://time.certum.pl /td sha1 $f
 ; Append a SHA256 to the previous SHA1 signature (this is what as does)
-SignTool=SignTool sign /debug /as /sm /fd sha256 /tr http://time.certum.pl /td sha256 $f
+SignTool=SignTool sign /debug /as /fd sha256 /tr http://time.certum.pl /td sha256 $f
 SignedUninstaller=yes
 UninstallDisplayIcon={app}\{#ExeName}.exe
 Uninstallable=true
diff --git a/build.ps1 b/build.ps1
index 3de252787..ee46d3f4f 100644
--- a/build.ps1
+++ b/build.ps1
@@ -55,17 +55,17 @@ Function MD5($filename) {
 Function PrepareCertificate() {
 	$decodedContentBytes = [System.Convert]::FromBase64String($env:Certificate)
 	$decodedContentBytes | set-content "greenshot.pfx" -encoding byte
-	$certutilArguments = @('-p', $env:CertificatePassword, '-importpfx', "greenshot.pfx")
-	Start-Process -wait certutil -ArgumentList $certutilArguments -NoNewWindow
+	#$certutilArguments = @('-p', $env:CertificatePassword, '-importpfx', "greenshot.pfx")
+	#Start-Process -wait certutil -ArgumentList $certutilArguments -NoNewWindow
 	
-	#Import-PfxCertificate –FilePath "greenshot.pfx" "cert:\localMachine\my" -Password "$env:CertificatePassword"
+	Import-PfxCertificate –FilePath "greenshot.pfx" -CertStoreLocation Cert:\CurrentUser\My -Password $env:CertificatePassword
 }
 
 # Sign the specify file
 Function SignWithCertificate($filename) {
 	Write-Host "Signing $filename" 
-	$signSha1Arguments = @('sign', '/debug',          '/sm', '/fd', 'sha1'  , '/tr', 'http://time.certum.pl', '/td', 'sha1'  , $filename)
-	$signSha256Arguments = @('sign', '/debug', '/as', '/sm', '/fd', 'sha256', '/tr', 'http://time.certum.pl', '/td', 'sha256', $filename)
+	$signSha1Arguments = @('sign', '/debug',          '/fd', 'sha1'  , '/tr', 'http://time.certum.pl', '/td', 'sha1'  , $filename)
+	$signSha256Arguments = @('sign', '/debug', '/as', '/fd', 'sha256', '/tr', 'http://time.certum.pl', '/td', 'sha256', $filename)
 
 	Start-Process -wait $env:SignTool -ArgumentList $signSha1Arguments -NoNewWindow
 	Start-Process -wait $env:SignTool -ArgumentList $signSha256Arguments -NoNewWindow