Compare commits

...

15 Commits

Author SHA1 Message Date
David Dias
f3cb8ced36 chore: release version v0.10.4 2017-12-01 08:42:19 +00:00
David Dias
0a6f63dce5 chore: update contributors 2017-12-01 08:42:18 +00:00
David Dias
0ce5f34a08 chore: gitignore 2017-12-01 08:42:06 +00:00
David Dias
a826968e71 chore: update deps 2017-12-01 08:41:45 +00:00
Maciej Krüger
7608fdd858 fix: catch error when unmarshaling instead of crashing (#113)
* test: Add failing tests

* fix: Fix some failing tests

* fix: various fixes on garbage error handling and respective tests

* tests: increased timeout for test timing out in CI

* tests: increasing test timeout to please the CI gods

* tests: increasing test timeout to please the CI gods

* fix: for when unMarshallPrivateKey is called with null or undefined key
2017-12-01 08:36:29 +00:00
David Dias
bf9b532067 chore: release version v0.10.3 2017-09-07 10:38:29 +01:00
David Dias
5296f8a42f chore: update contributors 2017-09-07 10:38:29 +01:00
Friedel Ziegelmayer
3a91ae2ed8 feat: switch protocol-buffers to protons (#110)
Ref https://github.com/ipfs/js-ipfs/issues/991
2017-09-07 10:37:56 +01:00
David Dias
e7c11a8e01 chore: release version v0.10.2 2017-09-06 08:30:10 +01:00
David Dias
9bb96dc2bf chore: update contributors 2017-09-06 08:30:09 +01:00
David Dias
957fdd37e9 fix: use regular protocol-buffers until protobufjs is fixed (#109) 2017-09-06 08:29:45 +01:00
Friedel Ziegelmayer
83257bc4bd feat(deps): upgrade to aegir@12 and browserify-aes@1.0.8 2017-09-05 15:28:43 +02:00
David Dias
cb7fae7fcc chore: release version v0.10.1 2017-09-05 11:08:46 +01:00
David Dias
7669847c17 chore: update contributors 2017-09-05 11:08:46 +01:00
Friedel Ziegelmayer
dc2793f138 fix: switch to protobufjs (#107)
rm unsafe-eval
2017-09-05 11:05:47 +01:00
33 changed files with 304 additions and 122 deletions

1
.eslintignore Normal file
View File

@@ -0,0 +1 @@
src/keys/keys.proto.js

2
.gitignore vendored
View File

@@ -1,3 +1,4 @@
docs
package-lock.json package-lock.json
yarn.lock yarn.lock
@@ -43,3 +44,4 @@ test/test-data/go-ipfs-repo/LOG.old
# while testing npm5 # while testing npm5
package-lock.json package-lock.json
yarn.lock

View File

@@ -13,16 +13,11 @@ matrix:
script: script:
- npm run lint - npm run lint
- npm run test - npm run test
- npm run coverage
- make test
before_script: before_script:
- export DISPLAY=:99.0 - export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start - sh -e /etc/init.d/xvfb start
after_success:
- npm run coverage-publish
addons: addons:
firefox: 'latest' firefox: 'latest'
apt: apt:

View File

@@ -1,3 +1,48 @@
<a name="0.10.4"></a>
## [0.10.4](https://github.com/libp2p/js-libp2p-crypto/compare/v0.10.3...v0.10.4) (2017-12-01)
### Bug Fixes
* catch error when unmarshaling instead of crashing ([#113](https://github.com/libp2p/js-libp2p-crypto/issues/113)) ([7608fdd](https://github.com/libp2p/js-libp2p-crypto/commit/7608fdd))
<a name="0.10.3"></a>
## [0.10.3](https://github.com/libp2p/js-libp2p-crypto/compare/v0.10.2...v0.10.3) (2017-09-07)
### Features
* switch protocol-buffers to protons ([#110](https://github.com/libp2p/js-libp2p-crypto/issues/110)) ([3a91ae2](https://github.com/libp2p/js-libp2p-crypto/commit/3a91ae2))
<a name="0.10.2"></a>
## [0.10.2](https://github.com/libp2p/js-libp2p-crypto/compare/v0.10.1...v0.10.2) (2017-09-06)
### Bug Fixes
* use regular protocol-buffers until protobufjs is fixed ([#109](https://github.com/libp2p/js-libp2p-crypto/issues/109)) ([957fdd3](https://github.com/libp2p/js-libp2p-crypto/commit/957fdd3))
### Features
* **deps:** upgrade to aegir@12 and browserify-aes@1.0.8 ([83257bc](https://github.com/libp2p/js-libp2p-crypto/commit/83257bc))
<a name="0.10.1"></a>
## [0.10.1](https://github.com/libp2p/js-libp2p-crypto/compare/v0.10.0...v0.10.1) (2017-09-05)
### Bug Fixes
* switch to protobufjs ([#107](https://github.com/libp2p/js-libp2p-crypto/issues/107)) ([dc2793f](https://github.com/libp2p/js-libp2p-crypto/commit/dc2793f))
<a name="0.10.0"></a> <a name="0.10.0"></a>
# [0.10.0](https://github.com/libp2p/js-libp2p-crypto/compare/v0.9.4...v0.10.0) (2017-09-03) # [0.10.0](https://github.com/libp2p/js-libp2p-crypto/compare/v0.9.4...v0.10.0) (2017-09-03)

View File

@@ -22,5 +22,6 @@ curves.forEach((curve) => {
}, { defer: true }) }, { defer: true })
}) })
suite.on('cycle', (event) => console.log(String(event.target))) suite
.run({async: true}) .on('cycle', (event) => console.log(String(event.target)))
.run({async: true})

View File

@@ -22,8 +22,9 @@ async.waterfall([
setup(cipher, hash, secret) setup(cipher, hash, secret)
})) }))
suite.on('cycle', (event) => console.log(String(event.target))) suite
.run({async: true}) .on('cycle', (event) => console.log(String(event.target)))
.run({async: true})
}) })
function setup (cipher, hash, secret) { function setup (cipher, hash, secret) {

View File

@@ -37,5 +37,6 @@ suite.add('sign and verify', (d) => {
defer: true defer: true
}) })
suite.on('cycle', (event) => console.log(String(event.target))) suite
.run({async: true}) .on('cycle', (event) => console.log(String(event.target)))
.run({async: true})

View File

@@ -2,6 +2,10 @@ machine:
node: node:
version: stable version: stable
post:
test:
- npm run coverage -- --upload
dependencies: dependencies:
pre: pre:
- google-chrome --version - google-chrome --version

View File

@@ -1,6 +1,6 @@
{ {
"name": "libp2p-crypto", "name": "libp2p-crypto",
"version": "0.10.0", "version": "0.10.4",
"description": "Crypto primitives for libp2p", "description": "Crypto primitives for libp2p",
"main": "src/index.js", "main": "src/index.js",
"browser": { "browser": {
@@ -10,16 +10,16 @@
"./src/keys/rsa.js": "./src/keys/rsa-browser.js" "./src/keys/rsa.js": "./src/keys/rsa-browser.js"
}, },
"scripts": { "scripts": {
"lint": "aegir-lint", "lint": "aegir lint",
"build": "aegir-build", "build": "aegir build",
"test": "aegir-test", "build-proto": "pbjs --wrap commonjs --target static-module src/keys/keys.proto > src/keys/keys.proto.js",
"test:node": "aegir-test --env node", "test": "aegir test",
"test:browser": "aegir-test --env browser", "test:node": "aegir test -t node",
"release": "aegir-release", "test:browser": "aegir test -t browser -t webworker",
"release-minor": "aegir-release --type minor", "release": "aegir release",
"release-major": "aegir-release --type major", "release-minor": "aegir release --type minor",
"coverage": "aegir-coverage", "release-major": "aegir release --type major",
"coverage-publish": "aegir-coverage publish" "coverage": "aegir coverage --ignore src/keys/keys.proto.js"
}, },
"keywords": [ "keywords": [
"IPFS", "IPFS",
@@ -30,21 +30,20 @@
"author": "Friedel Ziegelmayer <dignifiedquire@gmail.com>", "author": "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"asn1.js": "^4.9.1", "asn1.js": "^5.0.0",
"async": "^2.5.0", "async": "^2.6.0",
"browserify-aes": "^1.0.6", "browserify-aes": "^1.1.1",
"keypair": "^1.0.1", "keypair": "^1.0.1",
"libp2p-crypto-secp256k1": "~0.2.2", "libp2p-crypto-secp256k1": "~0.2.2",
"multihashing-async": "~0.4.6", "multihashing-async": "~0.4.7",
"pem-jwk": "^1.5.1", "pem-jwk": "^1.5.1",
"protocol-buffers": "^3.2.1", "protons": "^1.0.0",
"rsa-pem-to-jwk": "^1.1.3", "rsa-pem-to-jwk": "^1.1.3",
"safe-buffer": "^5.1.1",
"tweetnacl": "^1.0.0", "tweetnacl": "^1.0.0",
"webcrypto-shim": "github:dignifiedquire/webcrypto-shim#master" "webcrypto-shim": "github:dignifiedquire/webcrypto-shim#master"
}, },
"devDependencies": { "devDependencies": {
"aegir": "^11.0.2", "aegir": "^12.2.0",
"benchmark": "^2.1.4", "benchmark": "^2.1.4",
"chai": "^4.1.2", "chai": "^4.1.2",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
@@ -72,10 +71,11 @@
"Friedel Ziegelmayer <dignifiedquire@gmail.com>", "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
"Greenkeeper <support@greenkeeper.io>", "Greenkeeper <support@greenkeeper.io>",
"Jack Kleeman <jackkleeman@gmail.com>", "Jack Kleeman <jackkleeman@gmail.com>",
"Maciej Krüger <mkg20001@gmail.com>",
"Richard Littauer <richard.littauer@gmail.com>", "Richard Littauer <richard.littauer@gmail.com>",
"Tom Swindell <t.swindell@rubyx.co.uk>", "Tom Swindell <t.swindell@rubyx.co.uk>",
"Yusef Napora <yusef@napora.org>", "Yusef Napora <yusef@napora.org>",
"greenkeeper[bot] <greenkeeper[bot]@users.noreply.github.com>", "greenkeeper[bot] <greenkeeper[bot]@users.noreply.github.com>",
"nikuda <nikuda@gmail.com>" "nikuda <nikuda@gmail.com>"
] ]
} }

55
src/aes/index-browser.js Normal file
View File

@@ -0,0 +1,55 @@
'use strict'
const asm = require('asmcrypto.js')
const setImmediate = require('async/setImmediate')
exports.create = function (key, iv, callback) {
const done = (err, res) => setImmediate(() => callback(err, res))
if (key.length !== 16 && key.length !== 32) {
return done(new Error('Invalid key length'))
}
const enc = new asm.AES_CTR.Encrypt({
key: key,
nonce: iv
})
const dec = new asm.AES_CTR.Decrypt({
key: key,
nonce: iv
})
const res = {
encrypt (data, cb) {
const done = (err, res) => setImmediate(() => cb(err, res))
let res
try {
res = Buffer.from(
enc.process(data).result
)
} catch (err) {
return done(err)
}
done(null, res)
},
decrypt (data, cb) {
const done = (err, res) => setImmediate(() => cb(err, res))
let res
try {
res = Buffer.from(
dec.process(data).result
)
} catch (err) {
return done(err)
}
done(null, res)
}
}
done(null, res)
}

View File

@@ -1,7 +1,6 @@
'use strict' 'use strict'
const nodeify = require('../nodeify') const nodeify = require('../nodeify')
const Buffer = require('safe-buffer').Buffer
const crypto = require('../webcrypto.js')() const crypto = require('../webcrypto.js')()
const lengths = require('./lengths') const lengths = require('./lengths')

View File

@@ -3,7 +3,6 @@
const webcrypto = require('../webcrypto.js')() const webcrypto = require('../webcrypto.js')()
const nodeify = require('../nodeify') const nodeify = require('../nodeify')
const BN = require('asn1.js').bignum const BN = require('asn1.js').bignum
const Buffer = require('safe-buffer').Buffer
const util = require('../util') const util = require('../util')
const toBase64 = util.toBase64 const toBase64 = util.toBase64

View File

@@ -1,8 +1,7 @@
'use strict' 'use strict'
const multihashing = require('multihashing-async') const multihashing = require('multihashing-async')
const protobuf = require('protocol-buffers') const protobuf = require('protons')
const Buffer = require('safe-buffer').Buffer
const crypto = require('./ed25519') const crypto = require('./ed25519')
const pbm = protobuf(require('./keys.proto')) const pbm = protobuf(require('./keys.proto'))

View File

@@ -2,36 +2,33 @@
const nacl = require('tweetnacl') const nacl = require('tweetnacl')
const setImmediate = require('async/setImmediate') const setImmediate = require('async/setImmediate')
const Buffer = require('safe-buffer').Buffer
exports.publicKeyLength = nacl.sign.publicKeyLength exports.publicKeyLength = nacl.sign.publicKeyLength
exports.privateKeyLength = nacl.sign.secretKeyLength exports.privateKeyLength = nacl.sign.secretKeyLength
exports.generateKey = function (callback) { exports.generateKey = function (callback) {
const done = (err, res) => setImmediate(() => { setImmediate(() => {
callback(err, res) let result
try {
result = nacl.sign.keyPair()
} catch (err) {
return callback(err)
}
callback(null, result)
}) })
let keys
try {
keys = nacl.sign.keyPair()
} catch (err) {
return done(err)
}
done(null, keys)
} }
// seed should be a 32 byte uint8array // seed should be a 32 byte uint8array
exports.generateKeyFromSeed = function (seed, callback) { exports.generateKeyFromSeed = function (seed, callback) {
const done = (err, res) => setImmediate(() => callback(err, res)) setImmediate(() => {
let result
let keys try {
try { result = nacl.sign.keyPair.fromSeed(seed)
keys = nacl.sign.keyPair.fromSeed(seed) } catch (err) {
} catch (err) { return callback(err)
return done(err) }
} callback(null, result)
done(null, keys) })
} }
exports.hashAndSign = function (key, msg, callback) { exports.hashAndSign = function (key, msg, callback) {
@@ -42,6 +39,13 @@ exports.hashAndSign = function (key, msg, callback) {
exports.hashAndVerify = function (key, sig, msg, callback) { exports.hashAndVerify = function (key, sig, msg, callback) {
setImmediate(() => { setImmediate(() => {
callback(null, nacl.sign.detached.verify(msg, sig, key)) let result
try {
result = nacl.sign.detached.verify(msg, sig, key)
} catch (err) {
return callback(err)
}
callback(null, result)
}) })
} }

View File

@@ -1,6 +1,6 @@
'use strict' 'use strict'
const protobuf = require('protocol-buffers') const protobuf = require('protons')
const keysPBM = protobuf(require('./keys.proto')) const keysPBM = protobuf(require('./keys.proto'))
exports = module.exports exports = module.exports
@@ -50,15 +50,16 @@ exports.generateKeyPairFromSeed = (type, seed, bits, cb) => {
// representative object // representative object
exports.unmarshalPublicKey = (buf) => { exports.unmarshalPublicKey = (buf) => {
const decoded = keysPBM.PublicKey.decode(buf) const decoded = keysPBM.PublicKey.decode(buf)
const data = decoded.Data
switch (decoded.Type) { switch (decoded.Type) {
case keysPBM.KeyType.RSA: case keysPBM.KeyType.RSA:
return supportedKeys.rsa.unmarshalRsaPublicKey(decoded.Data) return supportedKeys.rsa.unmarshalRsaPublicKey(data)
case keysPBM.KeyType.Ed25519: case keysPBM.KeyType.Ed25519:
return supportedKeys.ed25519.unmarshalEd25519PublicKey(decoded.Data) return supportedKeys.ed25519.unmarshalEd25519PublicKey(data)
case keysPBM.KeyType.Secp256k1: case keysPBM.KeyType.Secp256k1:
if (supportedKeys.secp256k1) { if (supportedKeys.secp256k1) {
return supportedKeys.secp256k1.unmarshalSecp256k1PublicKey(decoded.Data) return supportedKeys.secp256k1.unmarshalSecp256k1PublicKey(data)
} else { } else {
throw new Error('secp256k1 support requires libp2p-crypto-secp256k1 package') throw new Error('secp256k1 support requires libp2p-crypto-secp256k1 package')
} }
@@ -80,16 +81,23 @@ exports.marshalPublicKey = (key, type) => {
// Converts a protobuf serialized private key into its // Converts a protobuf serialized private key into its
// representative object // representative object
exports.unmarshalPrivateKey = (buf, callback) => { exports.unmarshalPrivateKey = (buf, callback) => {
const decoded = keysPBM.PrivateKey.decode(buf) let decoded
try {
decoded = keysPBM.PrivateKey.decode(buf)
} catch (err) {
return callback(err)
}
const data = decoded.Data
switch (decoded.Type) { switch (decoded.Type) {
case keysPBM.KeyType.RSA: case keysPBM.KeyType.RSA:
return supportedKeys.rsa.unmarshalRsaPrivateKey(decoded.Data, callback) return supportedKeys.rsa.unmarshalRsaPrivateKey(data, callback)
case keysPBM.KeyType.Ed25519: case keysPBM.KeyType.Ed25519:
return supportedKeys.ed25519.unmarshalEd25519PrivateKey(decoded.Data, callback) return supportedKeys.ed25519.unmarshalEd25519PrivateKey(data, callback)
case keysPBM.KeyType.Secp256k1: case keysPBM.KeyType.Secp256k1:
if (supportedKeys.secp256k1) { if (supportedKeys.secp256k1) {
return supportedKeys.secp256k1.unmarshalSecp256k1PrivateKey(decoded.Data, callback) return supportedKeys.secp256k1.unmarshalSecp256k1PrivateKey(data, callback)
} else { } else {
return callback(new Error('secp256k1 support requires libp2p-crypto-secp256k1 package')) return callback(new Error('secp256k1 support requires libp2p-crypto-secp256k1 package'))
} }

View File

@@ -1,7 +1,6 @@
'use strict' 'use strict'
const whilst = require('async/whilst') const whilst = require('async/whilst')
const Buffer = require('safe-buffer').Buffer
const hmac = require('../hmac') const hmac = require('../hmac')
const cipherMap = { const cipherMap = {

View File

@@ -5,13 +5,11 @@ module.exports = `enum KeyType {
Ed25519 = 1; Ed25519 = 1;
Secp256k1 = 2; Secp256k1 = 2;
} }
message PublicKey { message PublicKey {
required KeyType Type = 1; required KeyType Type = 1;
required bytes Data = 2; required bytes Data = 2;
} }
message PrivateKey { message PrivateKey {
required KeyType Type = 1; required KeyType Type = 1;
required bytes Data = 2; required bytes Data = 2;
}` }`

View File

@@ -1,7 +1,6 @@
'use strict' 'use strict'
const nodeify = require('../nodeify') const nodeify = require('../nodeify')
const Buffer = require('safe-buffer').Buffer
const webcrypto = require('../webcrypto.js')() const webcrypto = require('../webcrypto.js')()
@@ -18,11 +17,11 @@ exports.generateKey = function (bits, callback) {
true, true,
['sign', 'verify'] ['sign', 'verify']
) )
.then(exportKey) .then(exportKey)
.then((keys) => ({ .then((keys) => ({
privateKey: keys[0], privateKey: keys[0],
publicKey: keys[1] publicKey: keys[1]
})), callback) })), callback)
} }
// Takes a jwk key // Takes a jwk key

View File

@@ -1,7 +1,7 @@
'use strict' 'use strict'
const multihashing = require('multihashing-async') const multihashing = require('multihashing-async')
const protobuf = require('protocol-buffers') const protobuf = require('protons')
const crypto = require('./rsa') const crypto = require('./rsa')
const pbm = protobuf(require('./keys.proto')) const pbm = protobuf(require('./keys.proto'))

View File

@@ -9,30 +9,36 @@ const jwkToPem = require('pem-jwk').jwk2pem
exports.utils = require('./rsa-utils') exports.utils = require('./rsa-utils')
exports.generateKey = function (bits, callback) { exports.generateKey = function (bits, callback) {
const done = (err, res) => setImmediate(() => callback(err, res)) setImmediate(() => {
let result
try {
const key = keypair({ bits: bits })
result = {
privateKey: pemToJwk(key.private),
publicKey: pemToJwk(key.public)
}
} catch (err) {
return callback(err)
}
let key callback(null, result)
try {
key = keypair({ bits: bits })
} catch (err) {
return done(err)
}
done(null, {
privateKey: pemToJwk(key.private),
publicKey: pemToJwk(key.public)
}) })
} }
// Takes a jwk key // Takes a jwk key
exports.unmarshalPrivateKey = function (key, callback) { exports.unmarshalPrivateKey = function (key, callback) {
callback(null, { setImmediate(() => {
privateKey: key, if (!key) {
publicKey: { return callback(new Error('Key is invalid'))
kty: key.kty,
n: key.n,
e: key.e
} }
callback(null, {
privateKey: key,
publicKey: {
kty: key.kty,
n: key.n,
e: key.e
}
})
}) })
} }
@@ -41,16 +47,33 @@ exports.getRandomValues = function (arr) {
} }
exports.hashAndSign = function (key, msg, callback) { exports.hashAndSign = function (key, msg, callback) {
const sign = crypto.createSign('RSA-SHA256') setImmediate(() => {
let result
try {
const sign = crypto.createSign('RSA-SHA256')
sign.update(msg)
const pem = jwkToPem(key)
result = sign.sign(pem)
} catch (err) {
return callback(new Error('Key or message is invalid!: ' + err.message))
}
sign.update(msg) callback(null, result)
setImmediate(() => callback(null, sign.sign(jwkToPem(key)))) })
} }
exports.hashAndVerify = function (key, sig, msg, callback) { exports.hashAndVerify = function (key, sig, msg, callback) {
const verify = crypto.createVerify('RSA-SHA256') setImmediate(() => {
let result
try {
const verify = crypto.createVerify('RSA-SHA256')
verify.update(msg)
const pem = jwkToPem(key)
result = verify.verify(pem, sig)
} catch (err) {
return callback(new Error('Key or message is invalid!:' + err.message))
}
verify.update(msg) callback(null, result)
})
setImmediate(() => callback(null, verify.verify(jwkToPem(key), sig)))
} }

View File

@@ -1,7 +1,6 @@
'use strict' 'use strict'
const BN = require('asn1.js').bignum const BN = require('asn1.js').bignum
const Buffer = require('safe-buffer').Buffer
// Convert a BN.js instance to a base64 encoded string without padding // Convert a BN.js instance to a base64 encoded string without padding
// Adapted from https://tools.ietf.org/html/draft-ietf-jose-json-web-signature-41#appendix-C // Adapted from https://tools.ietf.org/html/draft-ietf-jose-json-web-signature-41#appendix-C
@@ -11,8 +10,8 @@ exports.toBase64 = function toBase64 (bn, len) {
return s return s
.replace(/(=*)$/, '') // Remove any trailing '='s .replace(/(=*)$/, '') // Remove any trailing '='s
.replace(/\+/g, '-') // 62nd char of encoding .replace(/\+/g, '-') // 62nd char of encoding
.replace(/\//g, '_') // 63rd char of encoding .replace(/\//g, '_') // 63rd char of encoding
} }
// Convert a base64 encoded string to a BN.js instance // Convert a base64 encoded string to a BN.js instance

View File

@@ -7,7 +7,6 @@ const dirtyChai = require('dirty-chai')
const expect = chai.expect const expect = chai.expect
chai.use(dirtyChai) chai.use(dirtyChai)
const series = require('async/series') const series = require('async/series')
const Buffer = require('safe-buffer').Buffer
const crypto = require('../../src') const crypto = require('../../src')
const fixtures = require('./../fixtures/aes') const fixtures = require('./../fixtures/aes')

View File

@@ -9,7 +9,8 @@ chai.use(dirtyChai)
const crypto = require('../src') const crypto = require('../src')
const fixtures = require('./fixtures/go-key-rsa') const fixtures = require('./fixtures/go-key-rsa')
describe('libp2p-crypto', () => { describe('libp2p-crypto', function () {
this.timeout(20 * 1000)
let key let key
before((done) => { before((done) => {
crypto.keys.generateKeyPair('RSA', 2048, (err, _key) => { crypto.keys.generateKeyPair('RSA', 2048, (err, _key) => {

View File

@@ -1,7 +1,5 @@
'use strict' 'use strict'
const Buffer = require('safe-buffer').Buffer
module.exports = { module.exports = {
curve: 'P-256', curve: 'P-256',
bob: { bob: {

View File

@@ -1,7 +1,5 @@
'use strict' 'use strict'
const Buffer = require('safe-buffer').Buffer
module.exports = { module.exports = {
// These were generated in a gore (https://github.com/motemen/gore) repl session: // These were generated in a gore (https://github.com/motemen/gore) repl session:
// //

View File

@@ -1,7 +1,5 @@
'use strict' 'use strict'
const Buffer = require('safe-buffer').Buffer
module.exports = { module.exports = {
private: { private: {
hash: Buffer.from([ hash: Buffer.from([

View File

@@ -1,7 +1,5 @@
'use strict' 'use strict'
const Buffer = require('safe-buffer').Buffer
module.exports = [{ module.exports = [{
cipher: 'AES-256', cipher: 'AES-256',
hash: 'SHA256', hash: 'SHA256',

View File

@@ -1,9 +1,6 @@
'use strict' 'use strict'
const Buffer = require('safe-buffer').Buffer
module.exports = { module.exports = {
// protobuf marshaled key pair generated with libp2p-crypto-secp256k1 // protobuf marshaled key pair generated with libp2p-crypto-secp256k1
// and marshaled with libp2p-crypto.marshalPublicKey / marshalPrivateKey // and marshaled with libp2p-crypto.marshalPublicKey / marshalPrivateKey
pbmPrivateKey: Buffer.from('08021220e0600103010000000100000000000000be1dc82c2e000000e8d6030301000000', 'hex'), pbmPrivateKey: Buffer.from('08021220e0600103010000000100000000000000be1dc82c2e000000e8d6030301000000', 'hex'),

View File

@@ -0,0 +1,46 @@
/* eslint-env mocha */
'use strict'
const chai = require('chai')
const dirtyChai = require('dirty-chai')
const expect = chai.expect
chai.use(dirtyChai)
const util = require('util')
const garbage = [Buffer.from('00010203040506070809', 'hex'), {}, null, false, undefined, true, 1, 0, Buffer.from(''), 'aGVsbG93b3JsZA==', 'helloworld', '']
function doTests (fncName, fnc, num, skipBuffersAndStrings) {
if (!num) {
num = 1
}
garbage.forEach((garbage) => {
if (skipBuffersAndStrings && (Buffer.isBuffer(garbage) || (typeof garbage) === 'string')) {
// skip this garbage because it's a buffer or a string and we were told do do that
return
}
let args = []
for (let i = 0; i < num; i++) {
args.push(garbage)
}
it(fncName + '(' + args.map(garbage => util.inspect(garbage)).join(', ') + ')', cb => {
args.push((err, res) => {
expect(err).to.exist()
expect(res).to.not.exist()
cb()
})
fnc.apply(null, args)
})
})
}
module.exports = (obj, fncs, num) => {
describe('returns error via cb instead of crashing', () => {
fncs.forEach(fnc => {
doTests(fnc, obj[fnc], num)
})
})
}
module.exports.doTests = doTests

View File

@@ -2,7 +2,6 @@
/* eslint-env mocha */ /* eslint-env mocha */
'use strict' 'use strict'
const Buffer = require('safe-buffer').Buffer
const chai = require('chai') const chai = require('chai')
const dirtyChai = require('dirty-chai') const dirtyChai = require('dirty-chai')
const expect = chai.expect const expect = chai.expect

View File

@@ -5,13 +5,15 @@ const chai = require('chai')
const dirtyChai = require('dirty-chai') const dirtyChai = require('dirty-chai')
const expect = chai.expect const expect = chai.expect
chai.use(dirtyChai) chai.use(dirtyChai)
const Buffer = require('safe-buffer').Buffer
const crypto = require('../../src') const crypto = require('../../src')
const ed25519 = crypto.keys.supportedKeys.ed25519 const ed25519 = crypto.keys.supportedKeys.ed25519
const fixtures = require('../fixtures/go-key-ed25519') const fixtures = require('../fixtures/go-key-ed25519')
describe('ed25519', () => { const testGarbage = require('../helpers/test-garbage-error-handling')
describe('ed25519', function () {
this.timeout(20 * 1000)
let key let key
before((done) => { before((done) => {
crypto.keys.generateKeyPair('Ed25519', 512, (err, _key) => { crypto.keys.generateKeyPair('Ed25519', 512, (err, _key) => {
@@ -177,6 +179,12 @@ describe('ed25519', () => {
}) })
}) })
describe('returns error via cb instead of crashing', () => {
const key = crypto.keys.unmarshalPublicKey(fixtures.verify.publicKey)
testGarbage.doTests('key.verify', key.verify.bind(key), 2)
testGarbage.doTests('crypto.keys.unmarshalPrivateKey', crypto.keys.unmarshalPrivateKey.bind(crypto.keys))
})
describe('go interop', () => { describe('go interop', () => {
let privateKey let privateKey

View File

@@ -5,13 +5,15 @@ const chai = require('chai')
const dirtyChai = require('dirty-chai') const dirtyChai = require('dirty-chai')
const expect = chai.expect const expect = chai.expect
chai.use(dirtyChai) chai.use(dirtyChai)
const Buffer = require('safe-buffer').Buffer
const crypto = require('../../src') const crypto = require('../../src')
const rsa = crypto.keys.supportedKeys.rsa const rsa = crypto.keys.supportedKeys.rsa
const fixtures = require('../fixtures/go-key-rsa') const fixtures = require('../fixtures/go-key-rsa')
describe('RSA', () => { const testGarbage = require('../helpers/test-garbage-error-handling')
describe('RSA', function () {
this.timeout(20 * 1000)
let key let key
before((done) => { before((done) => {
@@ -132,6 +134,12 @@ describe('RSA', () => {
}) })
}) })
describe('returns error via cb instead of crashing', () => {
const key = crypto.keys.unmarshalPublicKey(fixtures.verify.publicKey)
testGarbage.doTests('key.verify', key.verify.bind(key), 2, true)
testGarbage.doTests('crypto.keys.unmarshalPrivateKey', crypto.keys.unmarshalPrivateKey.bind(crypto.keys))
})
describe('go interop', () => { describe('go interop', () => {
it('verifies with data from go', (done) => { it('verifies with data from go', (done) => {
const key = crypto.keys.unmarshalPublicKey(fixtures.verify.publicKey) const key = crypto.keys.unmarshalPublicKey(fixtures.verify.publicKey)

View File

@@ -32,7 +32,7 @@ const mockSecp256k1Module = {
} }
describe('without libp2p-crypto-secp256k1 module present', () => { describe('without libp2p-crypto-secp256k1 module present', () => {
crypto.keys.supportedKeys['secp256k1'] = undefined crypto.keys.supportedKeys.secp256k1 = undefined
it('fails to generate a secp256k1 key', (done) => { it('fails to generate a secp256k1 key', (done) => {
crypto.keys.generateKeyPair('secp256k1', 256, (err, key) => { crypto.keys.generateKeyPair('secp256k1', 256, (err, key) => {
@@ -61,7 +61,7 @@ describe('with libp2p-crypto-secp256k1 module present', () => {
let key let key
before((done) => { before((done) => {
crypto.keys.supportedKeys['secp256k1'] = mockSecp256k1Module crypto.keys.supportedKeys.secp256k1 = mockSecp256k1Module
crypto.keys.generateKeyPair('secp256k1', 256, (err, _key) => { crypto.keys.generateKeyPair('secp256k1', 256, (err, _key) => {
if (err) return done(err) if (err) return done(err)
key = _key key = _key
@@ -70,7 +70,7 @@ describe('with libp2p-crypto-secp256k1 module present', () => {
}) })
after((done) => { after((done) => {
delete crypto.keys['secp256k1'] delete crypto.keys.secp256k1
done() done()
}) })