chore: fix out of date npms (#21)

This commit is contained in:
Masahiro Saito 2018-06-30 07:38:19 +09:00 committed by David Dias
parent 974c507069
commit 0065b0a49e
2 changed files with 6 additions and 5 deletions

View File

@ -43,14 +43,14 @@
"homepage": "https://github.com/libp2p/js-libp2p-keychain#readme", "homepage": "https://github.com/libp2p/js-libp2p-keychain#readme",
"dependencies": { "dependencies": {
"async": "^2.6.0", "async": "^2.6.0",
"deepmerge": "^1.5.2",
"interface-datastore": "~0.4.2", "interface-datastore": "~0.4.2",
"libp2p-crypto": "~0.12.0", "libp2p-crypto": "~0.13.0",
"lodash.merge": "^4.6.1",
"pull-stream": "^3.6.1", "pull-stream": "^3.6.1",
"sanitize-filename": "^1.6.1" "sanitize-filename": "^1.6.1"
}, },
"devDependencies": { "devDependencies": {
"aegir": "^12.4.0", "aegir": "^13.0.7",
"chai": "^4.1.2", "chai": "^4.1.2",
"chai-string": "^1.4.0", "chai-string": "^1.4.0",
"datastore-fs": "~0.4.2", "datastore-fs": "~0.4.2",

View File

@ -2,7 +2,7 @@
'use strict' 'use strict'
const sanitize = require('sanitize-filename') const sanitize = require('sanitize-filename')
const deepmerge = require('deepmerge') const deepmerge = require('lodash.merge')
const crypto = require('libp2p-crypto') const crypto = require('libp2p-crypto')
const DS = require('interface-datastore') const DS = require('interface-datastore')
const pull = require('pull-stream') const pull = require('pull-stream')
@ -104,7 +104,8 @@ class Keychain {
} }
this.store = store this.store = store
const opts = deepmerge(defaultOptions, options) const opts = {}
deepmerge(opts, defaultOptions, options)
// Enforce NIST SP 800-132 // Enforce NIST SP 800-132
if (!opts.passPhrase || opts.passPhrase.length < 20) { if (!opts.passPhrase || opts.passPhrase.length < 20) {