merge

Author: calvinmetcalf

create-hash.js

@@ -1,30 +1,82 @@
 var createHash = require('sha.js')
 
-var md5 = toConstructor(require('./md5'))
-var rmd160 = toConstructor(require('ripemd160'))
-
-function toConstructor (fn) {
-  return function () {
-    var buffers = []
-    var m= {
-      update: function (data, enc) {
-        if(!Buffer.isBuffer(data)) data = new Buffer(data, enc)
-        buffers.push(data)
-        return this
-      },
-      digest: function (enc) {
-        var buf = Buffer.concat(buffers)
-        var r = fn(buf)
-        buffers = null
-        return enc ? r.toString(enc) : r
-      }
-    }
-    return m
+var md5 = require('./md5')
+var rmd160 = require('ripemd160')
+var Transform = require('stream').Transform;
+var inherits = require('util').inherits
+
+module.exports = function (alg) {
+  if('md5' === alg) return new HashNoConstructor(md5)
+  if('rmd160' === alg) return new HashNoConstructor(rmd160)
+  return new Hash(createHash(alg))
+}
+inherits(HashNoConstructor, Transform)
+
+function HashNoConstructor(hash) {
+  Transform.call(this);
+  this._hash = hash
+  this.buffers = []
+}
+
+HashNoConstructor.prototype._transform = function (data, _, done) {
+  this.buffers.push(data)
+  done()
+}
+HashNoConstructor.prototype._flush = function (done) {
+  var buf = Buffer.concat(this.buffers)
+  var r = this._hash(buf)
+  this.buffers = null
+  this.push(r)
+  done()
+}
+HashNoConstructor.prototype.update = function (data, enc) {
+  this.write(data, enc)
+  return this
+}
+
+HashNoConstructor.prototype.digest = function (enc) {
+  this.end()
+  var outData = new Buffer('')
+  var chunk
+  while ((chunk = this.read())) {
+    outData = Buffer.concat([outData, chunk])
+  }
+  if (enc) {
+    outData = outData.toString(enc)
   }
+  return outData
 }
 
-module.exports = function (alg) {
-  if('md5' === alg) return new md5()
-  if('rmd160' === alg) return new rmd160()
-  return createHash(alg)
+inherits(Hash, Transform)
+
+function Hash(hash) {
+  Transform.call(this);
+  this._hash = hash
+}
+
+Hash.prototype._transform = function (data, _, done) {
+  this._hash.update(data)
+  done()
+}
+Hash.prototype._flush = function (done) {
+  this.push(this._hash.digest())
+  this._hash = null
+  done()
+}
+Hash.prototype.update = function (data, enc) {
+  this.write(data, enc)
+  return this
+}
+
+Hash.prototype.digest = function (enc) {
+  this.end()
+  var outData = new Buffer('')
+  var chunk
+  while ((chunk = this.read())) {
+    outData = Buffer.concat([outData, chunk])
+  }
+  if (enc) {
+    outData = outData.toString(enc)
+  }
+  return outData
 }

create-hmac.js

@@ -1,12 +1,15 @@
 var createHash = require('./create-hash')
-
+var Transform = require('stream').Transform;
+var inherits = require('util').inherits
 var zeroBuffer = new Buffer(128)
 zeroBuffer.fill(0)
 
 module.exports = Hmac
-
+inherits(Hmac, Transform)
 function Hmac (alg, key) {
   if(!(this instanceof Hmac)) return new Hmac(alg, key)
+
+  Transform.call(this)
   this._opad = opad
   this._alg = alg
 
@@ -32,12 +35,31 @@ function Hmac (alg, key) {
 }
 
 Hmac.prototype.update = function (data, enc) {
-  this._hash.update(data, enc)
+  this.write(data, enc)
   return this
 }
 
-Hmac.prototype.digest = function (enc) {
+Hmac.prototype._transform = function (data, _, next) {
+  this._hash.update(data)
+  next()
+}
+
+Hmac.prototype._flush = function (next) {
   var h = this._hash.digest()
-  return createHash(this._alg).update(this._opad).update(h).digest(enc)
+  this.push(createHash(this._alg).update(this._opad).update(h).digest())
+  next()
+}
+
+Hmac.prototype.digest = function (enc) {
+  this.end()
+  var outData = new Buffer('')
+  var chunk
+  while ((chunk = this.read())) {
+    outData = Buffer.concat([outData, chunk])
+  }
+  if (enc) {
+    outData = outData.toString(enc)
+  }
+  return outData
 }
 

index.js

@@ -36,12 +36,12 @@ var p = require('./pbkdf2')(exports)
 exports.pbkdf2 = p.pbkdf2
 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);
 
 // the least I can do is make error messages for the rest of the node.js/crypto api.
-each(['createCredentials'
-, 'createSign'
-, 'createVerify'
-, 'createDiffieHellman'
+each([
+  'createCredentials',
 ], function (name) {
   exports[name] = function () {
     error('sorry,', name, 'is not implemented yet')

package.json

@@ -2,23 +2,25 @@
   "author": "Dominic Tarr <[email protected]> (dominictarr.com)",
   "name": "crypto-browserify",
   "description": "partial implementation of crypto for the browser",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "homepage": "https://github.com/dominictarr/crypto-browserify",
   "repository": {
     "type": "git",
     "url": "git://github.com/dominictarr/crypto-browserify.git"
   },
   "scripts": {
-    "test": "set -e; for t in test/*.js; do node $t; done"
+    "test": "set -e; for t in test/node/*.js test/*.js; do node $t; done"
   },
   "engines": {
     "node": "*"
   },
   "dependencies": {
+    "browserify-aes": "0.6.0",
+    "browserify-sign": "2.4.0",
     "pbkdf2-compat": "2.0.1",
     "ripemd160": "0.2.0",
     "sha.js": "2.2.6",
-    "browserify-aes": "0.6.0"
+    "diffie-hellman": "2.2.0"
   },
   "devDependencies": {
     "tape": "~2.3.2",

readme.markdown

@@ -18,14 +18,13 @@ Here is the subset that is currently implemented:
 * randomBytes
 * createCipher (aes)
 * createDecipher (aes)
+* createDiffieHellman
 
-## TODO
+## todo
 
-The highest priority unimplemented features are
+these features from node's `crypto` are still unimplemented.
 
-* createDiffieHelman
-* createSign (rsa)
-* createVerify (rsa)
+* createCredentials
 
 ## contributions
 

test/create-hash.js

@@ -9,7 +9,6 @@ var createHash = require('../create-hash')
 
 algorithms.forEach(function (algorithm) {
   test('test ' + algorithm + ' against test vectors', function (t) {
-
     vectors.forEach(function (obj, i) {
       var input = new Buffer(obj.input, 'base64')
       var node = obj[algorithm]
@@ -25,7 +24,14 @@ algorithms.forEach(function (algorithm) {
           t.equal(js, node, algorithm + '(testVector['+i+'], '+encoding+') == ' + node)
         })
     });
-
+    vectors.forEach(function (obj, i) {
+      var input = new Buffer(obj.input, 'base64')
+      var node = obj[algorithm]
+      var hash = createHash(algorithm);
+      hash.end(input)
+      var js = hash.read().toString('hex')
+      t.equal(js, node, algorithm + '(testVector['+i+']) == ' + node)
+    })
     t.end()
   })
 });

test/create-hmac.js

@@ -18,6 +18,19 @@ algorithms.forEach(function (alg) {
     t.end()
   })
 
+  test('hmac('+alg+')', function (t) {
+    vectors.forEach(function (input, i) {
+      var hmac = createHmac(alg, new Buffer(input.key, 'hex'))
+
+      hmac.end(input.data, 'hex')
+      var output = hmac.read()
+
+      output = input.truncate ? output.slice(0, input.truncate) : output
+      t.equal(output.toString('hex'), input[alg])
+    })
+    t.end()
+  })
+
 })
 
 

test/dh.js

@@ -0,0 +1,47 @@
+var test = require('tape');
+var crypto = require('../');
+test('diffie-hellman mod groups', function (t) {
+  [
+     'modp1', 'modp2', 'modp5', 'modp14', 'modp15', 'modp16'
+  ].forEach(function (mod) {
+    t.test(mod, function (t){
+      t.plan(3);
+      var dh1 = crypto.getDiffieHellman(mod);
+      var p1 = dh1.getPrime().toString('hex');
+      dh1.generateKeys();
+      var dh2 = crypto.getDiffieHellman(mod);
+      var p2 = dh2.getPrime().toString('hex');
+      dh2.generateKeys();
+      t.equals(p1, p2, 'equal primes');
+      var pubk1 = dh1.getPublicKey();
+      var pubk2 = dh2.getPublicKey();
+      t.notEquals(pubk1, pubk2, 'diff public keys');
+      var pub1 = dh1.computeSecret(pubk2).toString('hex');
+      var pub2 = dh2.computeSecret(dh1.getPublicKey()).toString('hex');
+      t.equals(pub1, pub2, 'equal secrets');
+    });
+  });
+});
+test('diffie-hellman key lengths', function (t) {
+  [
+     64, 65, 192
+  ].forEach(function (len) {
+    t.test('' + len, function (t){
+      t.plan(3);
+      var dh2 = crypto.createDiffieHellman(len);
+      var prime2 = dh2.getPrime();
+      var p2 = prime2.toString('hex');
+      var dh1 = crypto.createDiffieHellman(prime2);
+      var p1 = dh1.getPrime().toString('hex');
+      dh1.generateKeys();
+      dh2.generateKeys();
+      t.equals(p1, p2, 'equal primes');
+      var pubk1 = dh1.getPublicKey();
+      var pubk2 = dh2.getPublicKey();
+      t.notEquals(pubk1, pubk2, 'diff public keys');
+      var pub1 = dh1.computeSecret(pubk2).toString('hex');
+      var pub2 = dh2.computeSecret(dh1.getPublicKey()).toString('hex');
+      t.equals(pub1, pub2, 'equal secrets');
+    });
+  });
+});

test/node/dh.js

@@ -0,0 +1,51 @@
+var test = require('tape');
+var cryptoB = require('../../');
+var crypto = require('crypto')
+
+test('diffie-hellman mod groups', function (t) {
+  [
+     'modp1', 'modp2', 'modp5', 'modp14', 'modp15', 'modp16'
+  ].forEach(function (mod) {
+    t.test(mod, function (t){
+      t.plan(3);
+      var dh1 = cryptoB.getDiffieHellman(mod);
+      var p1 = dh1.getPrime().toString('hex');
+      dh1.generateKeys();
+
+      var dh2 = crypto.getDiffieHellman(mod);
+      var p2 = dh2.getPrime().toString('hex');
+      dh2.generateKeys();
+      t.equals(p1, p2, 'equal primes');
+      var pubk1 = dh1.getPublicKey();
+      var pubk2 = dh2.getPublicKey();
+      t.notEquals(pubk1, pubk2, 'diff public keys');
+      var pub1 = dh1.computeSecret(pubk2).toString('hex');
+      var pub2 = dh2.computeSecret(pubk1).toString('hex');
+      t.equals(pub1, pub2, 'equal secrets');
+    });
+  });
+});
+
+test('diffie-hellman key lengths', function (t) {
+  [
+     64, 65, 192
+  ].forEach(function (len) {
+    t.test('' + len, function (t){
+      t.plan(3);
+      var dh2 = cryptoB.createDiffieHellman(len);
+      var prime2 = dh2.getPrime();
+      var p2 = prime2.toString('hex');
+      var dh1 = crypto.createDiffieHellman(prime2);
+      var p1 = dh1.getPrime().toString('hex');
+      dh1.generateKeys();
+      dh2.generateKeys();
+      t.equals(p1, p2, 'equal primes');
+      var pubk1 = dh1.getPublicKey();
+      var pubk2 = dh2.getPublicKey();
+      t.notEquals(pubk1, pubk2, 'diff public keys');
+      var pub1 = dh1.computeSecret(pubk2).toString('hex');
+      var pub2 = dh2.computeSecret(dh1.getPublicKey()).toString('hex');
+      t.equals(pub1, pub2, 'equal secrets');
+    });
+  });
+});