fluencelabs/js-libp2p-crypto
1
0
Fork 0
mirror of https://github.com/fluencelabs/js-libp2p-crypto synced 2025-06-28 17:41:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #63 from libp2p/dryajov-master

Browse Source 
Dryajov master
This commit is contained in:
Friedel Ziegelmayer
2017-01-27 13:53:26 +01:00
committed by GitHub
parent c138a04d2d 99a5245fa3
commit b93b410357
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
package.json
View File

@ -17,10 +17,10 @@
"test": "npm run test:node && npm run test:no-webcrypto && npm run test:browser", "test": "npm run test:node && npm run test:no-webcrypto && npm run test:browser",
"test:node": "aegir-test --env node", "test:node": "aegir-test --env node",
"test:no-webcrypto": "NO_WEBCRYPTO=true aegir-test --env node", "test:no-webcrypto": "NO_WEBCRYPTO=true aegir-test --env node",
"test:browser": "aegir-test --env browser", "test:browser": "aegir-test --env browser --webworker",
"release": "aegir-release", "release": "aegir-release --webworker",
"release-minor": "aegir-release --type minor", "release-minor": "aegir-release --type minor --webworker",
"release-major": "aegir-release --type major", "release-major": "aegir-release --type major --webworker",
"coverage": "aegir-coverage", "coverage": "aegir-coverage",
"coverage-publish": "aegir-coverage publish" "coverage-publish": "aegir-coverage publish"
}, },
@ -33,11 +33,11 @@
"author": "Friedel Ziegelmayer <dignifiedqurie@gmail.com>", "author": "Friedel Ziegelmayer <dignifiedqurie@gmail.com>",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"asn1.js": "^4.8.1", "asn1.js": "^4.9.1",
"async": "^2.1.2", "async": "^2.1.4",
"browserify-aes": "^1.0.6", "browserify-aes": "^1.0.6",
"keypair": "^1.0.0", "keypair": "^1.0.1",
"multihashing-async": "^0.3.0", "multihashing-async": "^0.4.0",
"nodeify": "^1.0.0", "nodeify": "^1.0.0",
"pem-jwk": "^1.5.1", "pem-jwk": "^1.5.1",
"protocol-buffers": "^3.2.1", "protocol-buffers": "^3.2.1",
@ -47,13 +47,13 @@
"webcrypto-shim": "github:dignifiedquire/webcrypto-shim#master" "webcrypto-shim": "github:dignifiedquire/webcrypto-shim#master"
}, },
"devDependencies": { "devDependencies": {
"aegir": "^9.2.1", "aegir": "^9.4.0",
"benchmark": "^2.1.2", "benchmark": "^2.1.3",
"chai": "^3.5.0", "chai": "^3.5.0",
"pre-commit": "^1.1.3" "pre-commit": "^1.2.2"
}, },
"optionalDependencies": { "optionalDependencies": {
"node-webcrypto-ossl": "^1.0.15" "node-webcrypto-ossl": "^1.0.16"
}, },
"pre-commit": [ "pre-commit": [
"lint", "lint",

10
src/crypto/webcrypto-browser.js
View File

@ -1,3 +1,5 @@
/* global self */
'use strict' 'use strict'
module.exports = function getWebCrypto () { module.exports = function getWebCrypto () {
@ -10,5 +12,13 @@ module.exports = function getWebCrypto () {
} }
} }
if (typeof self !== 'undefined') {
require('webcrypto-shim')(self)
if (self.crypto) {
return self.crypto
}
}
throw new Error('Please use an environment with crypto support') throw new Error('Please use an environment with crypto support')
} }