diff --git a/build/util/sign.js b/build/util/sign.js index 4293412e..73536c9a 100644 --- a/build/util/sign.js +++ b/build/util/sign.js @@ -1,9 +1,9 @@ const fs = require('fs'); -const signer = require('pkcs15-smartcard-sign'); +const signer = require('pkcs11-smartcard-sign'); const keytar = require('keytar'); const verifyKey = fs.readFileSync('app/resources/public-key.pem'); -const key = '02'; +const signerOptions = JSON.parse(fs.readFileSync('keys/keeweb-sign.json', 'utf8')); function getPin() { if (getPin.pin) { @@ -21,7 +21,7 @@ function getPin() { module.exports = function sign(grunt, data) { return getPin() - .then(pin => signer.sign({ data, verifyKey, pin, key })) + .then(pin => signer.sign({ data, verifyKey, pin, ...signerOptions })) .catch(err => { if (grunt) { grunt.warn(`Error signing data: ${err}`); diff --git a/package-lock.json b/package-lock.json index 8d19084b..9b34e3e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10617,11 +10617,6 @@ "pinkie": "^2.0.0" } }, - "pkcs15-smartcard-sign": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pkcs15-smartcard-sign/-/pkcs15-smartcard-sign-1.0.0.tgz", - "integrity": "sha1-KTjZJCydRYJDcGG736T4S/xhdVE=" - }, "pkg-dir": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", diff --git a/package.json b/package.json index 6e790703..7c3f12fe 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "normalize.css": "8.0.1", "optimize-css-assets-webpack-plugin": "^5.0.3", "pikaday": "1.8.0", - "pkcs15-smartcard-sign": "^1.0.0", + "pkcs11-smartcard-sign": "^1.0.0", "postcss-loader": "^3.0.0", "prettier": "^1.19.1", "puppeteer": "^2.1.1",