merge #78

Author: dominictarr

index.js

@@ -39,10 +39,11 @@ exports.pbkdf2Sync = p.pbkdf2Sync
 require('browserify-aes/inject')(exports, module.exports);
 require('browserify-sign/inject')(module.exports, exports);
 require('diffie-hellman/inject')(exports, module.exports);
+require('create-ecdh/inject')(module.exports, exports);
 
 // the least I can do is make error messages for the rest of the node.js/crypto api.
 each([
-  'createCredentials',
+  'createCredentials', 'publicEncrypt', 'privateDecrypt'
 ], function (name) {
   exports[name] = function () {
     error('sorry,', name, 'is not implemented yet')

package.json

@@ -18,6 +18,8 @@
   "dependencies": {
     "browserify-aes": "0.6.0",
     "browserify-sign": "2.4.0",
+    "create-ecdh": "1.0.0",
+    "diffie-hellman": "2.2.0",
     "pbkdf2-compat": "2.0.1",
     "ripemd160": "0.2.0",
     "diffie-hellman": "2.2.0",

readme.markdown

@@ -21,13 +21,14 @@ Here is the subset that is currently implemented:
 * createDiffieHellman
 * createSign (rsa, ecdsa)
 * createVerify (rsa, ecdsa)
-
+* createECDH (secp256k1)
 
 ## todo
 
 these features from node's `crypto` are still unimplemented.
 
 * createCredentials
+* publicEncrypt/privateDecrypt
 
 ## contributions
 

test/ecdh.js

@@ -0,0 +1,55 @@
+var mods = [
+   'secp256k1'
+];
+var test = require('tape');
+var crypto = require('../');
+test('createECDH', function (t) {
+mods.forEach(function (mod) {
+    t.test(mod + ' uncompressed', function (t){
+      t.plan(2);
+      var dh1 = crypto.createECDH(mod);
+      dh1.generateKeys();
+      var dh2 = crypto.createECDH(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');
+    });
+    t.test(mod + ' compressed', function (t){
+      t.plan(2);
+      var dh1 = crypto.createECDH(mod);
+      dh1.generateKeys();
+      var dh2 = crypto.createECDH(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');
+    });
+    t.test(mod + ' set stuff', function (t){
+      t.plan(5);
+      var dh1 = crypto.createECDH(mod);
+      var dh2 = crypto.createECDH(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');
+    });
+  });
+});