Skip to content

Commit 99ee0fc

Browse files
committed
Fix Windows signing args
The hash arg seems to only accept the short `-h` form. In addition, the args in the environment contained a fixed hash type which is removed here.
1 parent d56b73e commit 99ee0fc

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

electron_app/riot.im/env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export OSSLSIGNCODE_SIGNARGS='-pkcs11module /Library/Frameworks/eToken.framework/Versions/Current/libeToken.dylib -pkcs11engine /usr/local/lib/engines/engine_pkcs11.so -certs electron_app/riot.im/New_Vector_Ltd.pem -key 0a3271cbc1ec0fd8afb37f6bbe0cd65ba08d3b4d -t http://timestamp.comodoca.com -h sha256 -verbose'
1+
export OSSLSIGNCODE_SIGNARGS='-pkcs11module /Library/Frameworks/eToken.framework/Versions/Current/libeToken.dylib -pkcs11engine /usr/local/lib/engines/engine_pkcs11.so -certs electron_app/riot.im/New_Vector_Ltd.pem -key 0a3271cbc1ec0fd8afb37f6bbe0cd65ba08d3b4d -t http://timestamp.comodoca.com -verbose'

scripts/electron_winSign.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@ exports.default = async function(options) {
3636
'tmp_' + Math.random().toString(36).substring(2, 15) + '.exe',
3737
);
3838
const args = [
39-
'-hash', options.hash,
39+
'-h', options.hash,
4040
'-pass', tokenPassphrase,
4141
'-in', inPath,
4242
'-out', tmpFile,
4343
];
4444
if (options.isNest) args.push('-nest');
4545
cmdLine += shellescape(args);
4646

47+
console.log("Running", cmdLine);
4748
const signproc = exec(cmdLine, {}, (error, stdout) => {
4849
console.log(stdout);
4950
});

0 commit comments

Comments
 (0)