gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
RiotRobot 2019-11-27 11:54:33 +00:00
parent d56b73e220
commit 99ee0fc72d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electron_app/riot.im/env.sh
View File

@ -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' 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'

3
scripts/electron_winSign.js
View File

@ -36,7 +36,7 @@ exports.default = async function(options) {
'tmp_' + Math.random().toString(36).substring(2, 15) + '.exe', 'tmp_' + Math.random().toString(36).substring(2, 15) + '.exe',
); );
const args = [ const args = [
'-hash', options.hash, '-h', options.hash,
'-pass', tokenPassphrase, '-pass', tokenPassphrase,
'-in', inPath, '-in', inPath,
'-out', tmpFile, '-out', tmpFile,
@ -44,6 +44,7 @@ exports.default = async function(options) {
if (options.isNest) args.push('-nest'); if (options.isNest) args.push('-nest');
cmdLine += shellescape(args); cmdLine += shellescape(args);
console.log("Running", cmdLine);
const signproc = exec(cmdLine, {}, (error, stdout) => { const signproc = exec(cmdLine, {}, (error, stdout) => {
console.log(stdout); console.log(stdout);
}); });