From 98bc0bbc5f313555fce60a7e16d0c7ec38a2a664 Mon Sep 17 00:00:00 2001 From: Tom Swindell Date: Sat, 14 Jan 2017 12:45:52 +0000 Subject: [PATCH 1/8] Support for WebWorker. Signed-off-by: Tom Swindell --- src/crypto/webcrypto-browser.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/crypto/webcrypto-browser.js b/src/crypto/webcrypto-browser.js index d0899c3..1604636 100644 --- a/src/crypto/webcrypto-browser.js +++ b/src/crypto/webcrypto-browser.js @@ -10,5 +10,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') } From 5c61c89391b14b914d35c16a737e9eac164ca431 Mon Sep 17 00:00:00 2001 From: dryajov Date: Fri, 20 Jan 2017 16:20:23 -0800 Subject: [PATCH 2/8] fixing lint issues with `self` --- src/crypto/webcrypto-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/crypto/webcrypto-browser.js b/src/crypto/webcrypto-browser.js index 1604636..3848ae2 100644 --- a/src/crypto/webcrypto-browser.js +++ b/src/crypto/webcrypto-browser.js @@ -1,3 +1,5 @@ +/* global self */ + 'use strict' module.exports = function getWebCrypto () { From a1f054ca8ef6af03e5f597ec0aa04bb9bf395ccf Mon Sep 17 00:00:00 2001 From: dryajov Date: Sun, 22 Jan 2017 19:39:58 -0800 Subject: [PATCH 3/8] adding webworker test task --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b83c208..1681d81 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,11 @@ "scripts": { "lint": "aegir-lint", "build": "aegir-build", - "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 && npm run test:webworker", "test:node": "aegir-test --env node", "test:no-webcrypto": "NO_WEBCRYPTO=true aegir-test --env node", "test:browser": "aegir-test --env browser", + "test:webworker": "aegir-test --env webworker", "release": "aegir-release", "release-minor": "aegir-release --type minor", "release-major": "aegir-release --type major", From 27524354af94b0220a5fd38c0f6183a08862089c Mon Sep 17 00:00:00 2001 From: dryajov Date: Mon, 23 Jan 2017 18:30:30 -0800 Subject: [PATCH 4/8] chore: update contributors --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 1681d81..008225f 100644 --- a/package.json +++ b/package.json @@ -75,6 +75,9 @@ "Friedel Ziegelmayer ", "Greenkeeper ", "Richard Littauer ", + "Tom Swindell ", + "Yusef Napora ", + "dryajov ", "nikuda " ] -} +} \ No newline at end of file From a4edf8b99b6d29c4013715f131c9947421d25b64 Mon Sep 17 00:00:00 2001 From: dryajov Date: Mon, 23 Jan 2017 18:30:30 -0800 Subject: [PATCH 5/8] chore: release version v0.7.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 008225f..cb63469 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "libp2p-crypto", - "version": "0.7.5", + "version": "0.7.6", "description": "Crypto primitives for libp2p", "main": "src/index.js", "browser": { From 1683bf1dc8d8b4af4df1524ca60ae6b537d2fd4b Mon Sep 17 00:00:00 2001 From: dryajov Date: Mon, 23 Jan 2017 18:32:52 -0800 Subject: [PATCH 6/8] reverting version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index cb63469..34c508a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "libp2p-crypto", - "version": "0.7.6", + "version": "0.7.5", "description": "Crypto primitives for libp2p", "main": "src/index.js", "browser": { @@ -80,4 +80,4 @@ "dryajov ", "nikuda " ] -} \ No newline at end of file +} From 34856d58ab03cc6d1209645d3179441b93593200 Mon Sep 17 00:00:00 2001 From: dryajov Date: Thu, 26 Jan 2017 17:20:51 -0800 Subject: [PATCH 7/8] removing contributors --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index f85ff19..2dffbe6 100644 --- a/package.json +++ b/package.json @@ -76,9 +76,7 @@ "Friedel Ziegelmayer ", "Greenkeeper ", "Richard Littauer ", - "Tom Swindell ", "Yusef Napora ", - "dryajov ", "nikuda " ] } From 99a5245fa37654ac43de882ea8b47f706b1977f3 Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Fri, 27 Jan 2017 12:15:19 +0100 Subject: [PATCH 8/8] update deps --- package.json | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 2dffbe6..ccb0d08 100644 --- a/package.json +++ b/package.json @@ -14,14 +14,13 @@ "scripts": { "lint": "aegir-lint", "build": "aegir-build", - "test": "npm run test:node && npm run test:no-webcrypto && npm run test:browser && npm run test:webworker", + "test": "npm run test:node && npm run test:no-webcrypto && npm run test:browser", "test:node": "aegir-test --env node", "test:no-webcrypto": "NO_WEBCRYPTO=true aegir-test --env node", - "test:browser": "aegir-test --env browser", - "test:webworker": "aegir-test --env webworker", - "release": "aegir-release", - "release-minor": "aegir-release --type minor", - "release-major": "aegir-release --type major", + "test:browser": "aegir-test --env browser --webworker", + "release": "aegir-release --webworker", + "release-minor": "aegir-release --type minor --webworker", + "release-major": "aegir-release --type major --webworker", "coverage": "aegir-coverage", "coverage-publish": "aegir-coverage publish" }, @@ -34,11 +33,11 @@ "author": "Friedel Ziegelmayer ", "license": "MIT", "dependencies": { - "asn1.js": "^4.8.1", - "async": "^2.1.2", + "asn1.js": "^4.9.1", + "async": "^2.1.4", "browserify-aes": "^1.0.6", - "keypair": "^1.0.0", - "multihashing-async": "^0.3.0", + "keypair": "^1.0.1", + "multihashing-async": "^0.4.0", "nodeify": "^1.0.0", "pem-jwk": "^1.5.1", "protocol-buffers": "^3.2.1", @@ -48,13 +47,13 @@ "webcrypto-shim": "github:dignifiedquire/webcrypto-shim#master" }, "devDependencies": { - "aegir": "^9.2.1", - "benchmark": "^2.1.2", + "aegir": "^9.4.0", + "benchmark": "^2.1.3", "chai": "^3.5.0", - "pre-commit": "^1.1.3" + "pre-commit": "^1.2.2" }, "optionalDependencies": { - "node-webcrypto-ossl": "^1.0.15" + "node-webcrypto-ossl": "^1.0.16" }, "pre-commit": [ "lint",