parse-asn1
Advanced tools
Comparing version 5.1.1 to 5.1.2
@@ -25,3 +25,4 @@ // from https://github.com/Rantanen/node-dtls/blob/25a7dc861bda38cfeac93a723500eea4f0ac2e86/Certificate.js | ||
this.key('algorithm').objid(), | ||
this.key('parameters').optional() | ||
this.key('parameters').optional(), | ||
this.key('curve').objid().optional() | ||
) | ||
@@ -68,3 +69,3 @@ }) | ||
this.seq().obj( | ||
this.key('version').explicit(0).int(), | ||
this.key('version').explicit(0).int().optional(), | ||
this.key('serialNumber').int(), | ||
@@ -71,0 +72,0 @@ this.key('signature').use(AlgorithmIdentifier), |
@@ -6,2 +6,3 @@ var asn1 = require('./asn1') | ||
var compat = require('pbkdf2') | ||
const Buffer = require('safe-buffer').Buffer | ||
module.exports = parseKeys | ||
@@ -16,3 +17,3 @@ | ||
if (typeof buffer === 'string') { | ||
buffer = new Buffer(buffer) | ||
buffer = Buffer.from(buffer) | ||
} | ||
@@ -102,3 +103,3 @@ | ||
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) | ||
@@ -105,0 +106,0 @@ var out = [] |
{ | ||
"name": "parse-asn1", | ||
"version": "5.1.1", | ||
"version": "5.1.2", | ||
"description": "utility library for parsing asn1 files for use with browserify-sign.", | ||
@@ -22,3 +22,4 @@ "main": "index.js", | ||
"evp_bytestokey": "^1.0.0", | ||
"pbkdf2": "^3.0.3" | ||
"pbkdf2": "^3.0.3", | ||
"safe-buffer": "^5.1.1" | ||
}, | ||
@@ -25,0 +26,0 @@ "devDependencies": { |
@@ -74,2 +74,6 @@ var test = require('tape') | ||
} | ||
var cert2 = { | ||
private: fs.readFileSync(__dirname + '/cert.priv'), | ||
public: fs.readFileSync(__dirname + '/cert.pub') | ||
} | ||
var i = 0 | ||
@@ -84,29 +88,2 @@ function testIt (keys) { | ||
function testEOL (keys) { | ||
var publicKey = keys.public.toString() | ||
var newLineRegex = /\r?\n/g | ||
var genPrivate = function (replace) { | ||
if (keys.private.key) { | ||
return { key: keys.private.key.toString().replace(newLineRegex, replace), passphrase: keys.private.passphrase } | ||
} else { | ||
return keys.private.toString().replace(newLineRegex, replace) | ||
} | ||
} | ||
var testN = { | ||
private: genPrivate('\n'), | ||
public: publicKey.replace(newLineRegex, '\n') | ||
} | ||
testIt(testN) | ||
var testR = { | ||
private: genPrivate('\r'), | ||
public: publicKey.replace(newLineRegex, '\r') | ||
} | ||
testIt(testR) | ||
var testRN = { | ||
private: genPrivate('\r\n'), | ||
public: publicKey.replace(newLineRegex, '\r\n') | ||
} | ||
testIt(testRN) | ||
} | ||
testIt(dsa) | ||
@@ -126,16 +103,2 @@ testIt(dsa2) | ||
testIt(cert) | ||
testEOL(dsa) | ||
testEOL(dsa2) | ||
testEOL(rsa1024) | ||
testEOL(ec) | ||
testEOL(rsa2028) | ||
testEOL(nonrsa1024) | ||
testEOL(ecpass) | ||
testEOL(dsapass) | ||
testEOL(dsapass2) | ||
testEOL(rsapass) | ||
testEOL(rsapass2) | ||
testEOL(pass1024) | ||
testEOL(pass1024) | ||
testEOL(cert) | ||
testIt(cert2) |
39288
39
6
440
+ Addedsafe-buffer@^5.1.1