nav tabs on admin dashboard
This commit is contained in:
5
node_modules/parse-asn1/index.js
generated
vendored
5
node_modules/parse-asn1/index.js
generated
vendored
@@ -3,6 +3,7 @@ var aesid = require('./aesid.json')
|
||||
var fixProc = require('./fixProc')
|
||||
var ciphers = require('browserify-aes')
|
||||
var compat = require('pbkdf2')
|
||||
var Buffer = require('safe-buffer').Buffer
|
||||
module.exports = parseKeys
|
||||
|
||||
function parseKeys (buffer) {
|
||||
@@ -12,7 +13,7 @@ function parseKeys (buffer) {
|
||||
buffer = buffer.key
|
||||
}
|
||||
if (typeof buffer === 'string') {
|
||||
buffer = new Buffer(buffer)
|
||||
buffer = Buffer.from(buffer)
|
||||
}
|
||||
|
||||
var stripped = fixProc(buffer, password)
|
||||
@@ -97,7 +98,7 @@ function decrypt (data, password) {
|
||||
var iv = data.algorithm.decrypt.cipher.iv
|
||||
var cipherText = data.subjectPrivateKey
|
||||
var keylen = parseInt(algo.split('-')[1], 10) / 8
|
||||
var key = compat.pbkdf2Sync(password, salt, iters, keylen)
|
||||
var key = compat.pbkdf2Sync(password, salt, iters, keylen, 'sha1')
|
||||
var cipher = ciphers.createDecipheriv(algo, key, iv)
|
||||
var out = []
|
||||
out.push(cipher.update(cipherText))
|
||||
|
||||
Reference in New Issue
Block a user