create-ecdh 2.0.0 → 4.0.0

package/.npmignore

@@ -0,0 +1 @@
+test.js

package/browser.js

@@ -25,12 +25,22 @@ var aliases = {
 	ed25519: {
 		name: 'ed25519',
 		byteLength: 32
+	},
+	secp384r1: {
+		name: 'p384',
+		byteLength: 48
+	},
+	secp521r1: {
+		name: 'p521',
+		byteLength: 66
 	}
 };
 
 aliases.p224 = aliases.secp224r1;
 aliases.p256 = aliases.secp256r1 = aliases.prime256v1;
 aliases.p192 = aliases.secp192r1 = aliases.prime192v1;
+aliases.p384 = aliases.secp384r1;
+aliases.p521 = aliases.secp521r1;
 
 function ECDH(curve) {
 	this.curveType = aliases[curve];
@@ -53,9 +63,7 @@ ECDH.prototype.computeSecret = function (other, inenc, enc) {
 	if (!Buffer.isBuffer(other)) {
 		other = new Buffer(other, inenc);
 	}
-	other = new BN(other);
-	other = other.toString(16);
-	var otherPub = this.curve.keyPair(other, 'hex').getPublic();
+	var otherPub = this.curve.keyFromPublic(other).getPublic();
 	var out = otherPub.mul(this.keys.getPrivate()).getX();
 	return formatReturnValue(out, enc, this.curveType.byteLength);
 };
@@ -81,9 +89,7 @@ ECDH.prototype.setPublicKey = function (pub, enc) {
 	if (!Buffer.isBuffer(pub)) {
 		pub = new Buffer(pub, enc);
 	}
-	var pkey = new BN(pub);
-	pkey = pkey.toArray();
-	this.keys._importPublicHex(pkey);
+	this.keys._importPublic(pub);
 	return this;
 };
 
@@ -113,4 +119,4 @@ function formatReturnValue(bn, enc, len) {
 	} else {
 		return buf.toString(enc);
 	}
-}
+}

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "create-ecdh",
-  "version": "2.0.0",
+  "version": "4.0.0",
   "description": "createECDH but browserifiable",
   "main": "index.js",
+  "browser": "browser.js",
   "scripts": {
     "test": "node test.js | tspec"
   },
@@ -23,8 +24,8 @@
   },
   "homepage": "https://github.com/crypto-browserify/createECDH",
   "dependencies": {
-    "bn.js": "^1.0.0",
-    "elliptic": "^1.0.0"
+    "bn.js": "^4.1.0",
+    "elliptic": "^6.0.0"
   },
   "devDependencies": {
     "tap-spec": "^1.0.1",

package/readme.md

@@ -1,4 +1,4 @@
 createECDH [![Build Status](https://travis-ci.org/crypto-browserify/createECDH.svg)](https://travis-ci.org/crypto-browserify/createECDH)
 ====
 
-In io.js or node >= 0.11 this module is just a shortcut to crypto.createECDH.  In node <= 0.11 or the browser this is a pure JavaScript implimentation, more specifically a wrapper around [elliptic](https://github.com/indutny/elliptic), to give it the same API as node. `secp256k1`, `secp224r1` (aka p-224), `prime256v1` (aka p-256, secp256r1), `prime192v1` (aka p-192, secp192r1) curves all work in both this library and node (though only the highlighted name will work in node).
+In io.js or node >= 0.11 this module is just a shortcut to crypto.createECDH.  In node <= 0.11 or the browser this is a pure JavaScript implimentation, more specifically a wrapper around [elliptic](https://github.com/indutny/elliptic), to give it the same API as node. `secp256k1`, `secp224r1` (aka p224), `prime256v1` (aka p256, secp256r1), `prime192v1` (aka p192, secp192r1), `secp384r1` (aka p384), `secp521r1` (aka p521)  curves all work in both this library and node (though only the highlighted name will work in node).

package/test.js

@@ -1,67 +0,0 @@
-var test = require('tape');
-var nodeCrypto  = require('./browser');
-var myCrypto = require('./browser');
-
-var mods = [
-   'secp256k1',
-   'secp224r1',
-   'prime256v1',
-   'prime192v1'
-];
-
-function run(i) {
-	mods.forEach(function (mod) {
-		test(mod + ' run ' + i + ' uncompressed', function (t){
-			t.plan(2);
-			var dh1 = nodeCrypto(mod);
-			dh1.generateKeys();
-			var dh2 = myCrypto(mod);
-			dh2.generateKeys();
-			var pubk1 = dh1.getPublicKey();
-			var pubk2 = dh2.getPublicKey();
-			t.notEquals(pubk1.toString('hex'), pubk2.toString('hex'), 'diff public keys');
-			var pub1 = dh1.computeSecret(pubk2).toString('hex');
-			var pub2 = dh2.computeSecret(pubk1).toString('hex');
-			t.equals(pub1, pub2, 'equal secrets');
-		});
-		test(mod + ' run ' + i + ' compressed', function (t){
-			t.plan(2);
-			var dh1 = nodeCrypto(mod);
-			dh1.generateKeys();
-			var dh2 = myCrypto(mod);
-			dh2.generateKeys();
-			var pubk1 = dh1.getPublicKey(null, 'compressed');
-			var pubk2 = dh2.getPublicKey(null, 'compressed');
-			t.notEquals(pubk1.toString('hex'), pubk2.toString('hex'), 'diff public keys');
-			var pub1 = dh1.computeSecret(pubk2).toString('hex');
-			var pub2 = dh2.computeSecret(pubk1).toString('hex');
-			t.equals(pub1, pub2, 'equal secrets');
-		});
-		test(mod + ' run ' + i + ' set stuff', function (t){
-			t.plan(5);
-			var dh1 = nodeCrypto(mod);
-			var dh2 = myCrypto(mod);
-			dh1.generateKeys();
-			dh2.generateKeys();
-			dh1.setPrivateKey(dh2.getPrivateKey());
-			dh1.setPublicKey(dh2.getPublicKey());
-			var priv1 = dh1.getPrivateKey('hex');
-			var priv2 = dh2.getPrivateKey('hex');
-			t.equals(priv1, priv2, 'same private key');
-			var pubk1 = dh1.getPublicKey();
-			var pubk2 = dh2.getPublicKey();
-			t.equals(pubk1.toString('hex'), pubk2.toString('hex'), 'same public keys, uncompressed');
-			t.equals(dh1.getPublicKey('hex', 'compressed'), dh2.getPublicKey('hex', 'compressed'), 'same public keys compressed');
-			t.equals(dh1.getPublicKey('hex', 'hybrid'), dh2.getPublicKey('hex', 'hybrid'), 'same public keys hybrid');
-			var pub1 = dh1.computeSecret(pubk2).toString('hex');
-			var pub2 = dh2.computeSecret(pubk1).toString('hex');
-			t.equals(pub1, pub2, 'equal secrets');
-		});
-	});
-}
-
-
-var i = 0;
-while (++i < 100) {
-	run(i);
-}