From 867982ab92f0f8e40adda0086a870b4a1e9e0ee7 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 23 Sep 2019 10:26:09 +0100 Subject: [PATCH 1/2] chore: upgrade node-forge dep --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7595c48..0634ac2 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "keypair": "^1.0.1", "libp2p-crypto-secp256k1": "~0.3.0", "multihashing-async": "~0.5.1", - "node-forge": "~0.7.6", + "node-forge": "^0.8.5", "pem-jwk": "^2.0.0", "protons": "^1.0.1", "rsa-pem-to-jwk": "^1.1.3", From 6f2c3478953fce0871db232ea7cfd71b43bd213d Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 23 Sep 2019 10:36:22 +0100 Subject: [PATCH 2/2] chore: update aegir so tests run on browsers agin --- package.json | 4 ++-- src/keys/index.js | 4 ++-- src/keys/key-stretcher.js | 2 +- src/util.js | 2 +- test/helpers/test-garbage-error-handling.js | 2 +- test/util.spec.js | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 0634ac2..4c3ebba 100644 --- a/package.json +++ b/package.json @@ -53,9 +53,9 @@ "ursa-optional": "~0.9.10" }, "devDependencies": { - "aegir": "^18.0.3", + "aegir": "^20.0.0", "benchmark": "^2.1.4", - "bundlesize": "~0.17.0", + "bundlesize": "^0.18.0", "chai": "^4.2.0", "chai-string": "^1.5.0", "dirty-chai": "^2.0.1" diff --git a/src/keys/index.js b/src/keys/index.js index 7d3e3c6..e68e739 100644 --- a/src/keys/index.js +++ b/src/keys/index.js @@ -28,7 +28,7 @@ exports.generateEphemeralKeyPair = require('./ephemeral-keys') // Generates a keypair of the given type and bitsize exports.generateKeyPair = (type, bits, cb) => { - let key = supportedKeys[type.toLowerCase()] + const key = supportedKeys[type.toLowerCase()] if (!key) { return cb(new Error('invalid or unsupported key type')) @@ -40,7 +40,7 @@ exports.generateKeyPair = (type, bits, cb) => { // Generates a keypair of the given type and bitsize // seed is a 32 byte uint8array exports.generateKeyPairFromSeed = (type, seed, bits, cb) => { - let key = supportedKeys[type.toLowerCase()] + const key = supportedKeys[type.toLowerCase()] if (!key) { return cb(new Error('invalid or unsupported key type')) } diff --git a/src/keys/key-stretcher.js b/src/keys/key-stretcher.js index 2d7f995..24cfcdd 100644 --- a/src/keys/key-stretcher.js +++ b/src/keys/key-stretcher.js @@ -47,7 +47,7 @@ module.exports = (cipherType, hash, secret, callback) => { return callback(err) } - let result = [] + const result = [] let j = 0 whilst( diff --git a/src/util.js b/src/util.js index e5f7b6b..3624bfe 100644 --- a/src/util.js +++ b/src/util.js @@ -6,7 +6,7 @@ const BN = require('asn1.js').bignum // Adapted from https://tools.ietf.org/html/draft-ietf-jose-json-web-signature-41#appendix-C exports.toBase64 = function toBase64 (bn, len) { // if len is defined then the bytes are leading-0 padded to the length - let s = bn.toArrayLike(Buffer, 'be', len).toString('base64') + const s = bn.toArrayLike(Buffer, 'be', len).toString('base64') return s .replace(/(=*)$/, '') // Remove any trailing '='s diff --git a/test/helpers/test-garbage-error-handling.js b/test/helpers/test-garbage-error-handling.js index 46fedea..95a823d 100644 --- a/test/helpers/test-garbage-error-handling.js +++ b/test/helpers/test-garbage-error-handling.js @@ -19,7 +19,7 @@ function doTests (fncName, fnc, num, skipBuffersAndStrings) { // skip this garbage because it's a buffer or a string and we were told do do that return } - let args = [] + const args = [] for (let i = 0; i < num; i++) { args.push(garbage) } diff --git a/test/util.spec.js b/test/util.spec.js index bf66ccd..3688861 100644 --- a/test/util.spec.js +++ b/test/util.spec.js @@ -24,7 +24,7 @@ describe('Util', () => { }) it('toBase64 zero padding', (done) => { - let bnpad = new BN('ff', 16) + const bnpad = new BN('ff', 16) expect(util.toBase64(bnpad, 2)).to.eql('AP8') done() })