This commit is contained in:
antelle 2020-04-05 23:39:36 +02:00
parent 81e4a0eff9
commit e0615c751e
No known key found for this signature in database
GPG Key ID: 094A2F2D6136A4EE
1 changed files with 10 additions and 18 deletions

View File

@ -44,30 +44,22 @@ module.exports = function(grunt) {
const signtool = const signtool =
'C:\\Program Files (x86)\\Windows Kits\\10\\App Certification Kit\\signtool.exe'; 'C:\\Program Files (x86)\\Windows Kits\\10\\App Certification Kit\\signtool.exe';
const res = spawnSync(signtool, ['verify', '/pa', '/sha1', opt.certHash, signedFile]); const res = spawnSync(signtool, ['verify', '/pa', '/v', signedFile]);
// eslint-disable-next-line no-console
console.log('res.status', res.status, res.stdout.toString('utf8'), res);
const res2 = spawnSync(signtool, [ if (res.status) {
'verify',
'/pa',
'/sha1',
opt.certHash.replace('1', '2'),
signedFile
]);
// eslint-disable-next-line no-console
console.log('res.status', res2.status, res2.stdout.toString('utf8'), res2);
const res3 = spawnSync(signtool, ['verify', '/pa', '/v', signedFile]);
// eslint-disable-next-line no-console
console.log('res.status', res3.status, res3.stdout.toString('utf8'), res3);
if (!res.stdout.includes('Successfully verified')) {
grunt.warn( grunt.warn(
`Verify error ${file}: exit code ${res.status}.\n${res.stdout.toString()}` `Verify error ${file}: exit code ${res.status}.\n${res.stdout.toString()}`
); );
} }
if (!res.stdout.includes('Successfully verified')) {
grunt.warn(`Verify error ${file}:\n${res.stdout.toString()}`);
}
if (!res.stdout.includes(opt.certHash)) {
grunt.warn(`Verify error ${file}: expected hash was not found`);
}
fs.unlinkSync(signedFile, file); fs.unlinkSync(signedFile, file);
fs.writeFileSync(file, taskResult.data); fs.writeFileSync(file, taskResult.data);
grunt.log.writeln(`Signed ${file}: ${name}`); grunt.log.writeln(`Signed ${file}: ${name}`);