Merge pull request #45 from crypto-browserify/dcousens-patch-2

hash: _update never returns anything

Author: calvinmetcalf

.npmignore

@@ -0,0 +1 @@
+tests/

bin.js

@@ -28,11 +28,9 @@ function usage () {
 
 if (!process.stdin.isTTY) {
   pipe(argv[0], process.stdin)
-
 } else if (argv.length) {
   if (/--help|-h/.test(argv[0])) {
     usage()
-
   } else {
     var filename = argv.pop()
     var algorithm = argv.pop()

hash.js

@@ -1,12 +1,11 @@
-var Buffer = require('buffer/').Buffer
+var Buffer = require('safe-buffer').Buffer
 
 // prototype class for hash functions
 function Hash (blockSize, finalSize) {
   this._block = new Buffer(blockSize)
   this._finalSize = finalSize
   this._blockSize = blockSize
   this._len = 0
-  this._s = 0
 }
 
 Hash.prototype.update = function (data, enc) {
@@ -15,56 +14,62 @@ Hash.prototype.update = function (data, enc) {
     data = new Buffer(data, enc)
   }
 
-  var l = this._len += data.length
-  var s = this._s || 0
-  var f = 0
-  var buffer = this._block
+  var block = this._block
+  var blockSize = this._blockSize
+  var length = data.length
+  var accum = this._len
 
-  while (s < l) {
-    var t = Math.min(data.length, f + this._blockSize - (s % this._blockSize))
-    var ch = (t - f)
+  for (var offset = 0; offset < length;) {
+    var assigned = accum % blockSize
+    var remainder = Math.min(length - offset, blockSize - assigned)
 
-    for (var i = 0; i < ch; i++) {
-      buffer[(s % this._blockSize) + i] = data[i + f]
+    for (var i = 0; i < remainder; i++) {
+      block[assigned + i] = data[offset + i]
     }
 
-    s += ch
-    f += ch
+    accum += remainder
+    offset += remainder
 
-    if ((s % this._blockSize) === 0) {
-      this._update(buffer)
+    if ((accum % blockSize) === 0) {
+      this._update(block)
     }
   }
-  this._s = s
 
+  this._len += length
   return this
 }
 
 Hash.prototype.digest = function (enc) {
-  // Suppose the length of the message M, in bits, is l
-  var l = this._len * 8
+  var rem = this._len % this._blockSize
 
-  // Append the bit 1 to the end of the message
-  this._block[this._len % this._blockSize] = 0x80
+  this._block[rem] = 0x80
 
-  // and then k zero bits, where k is the smallest non-negative solution to the equation (l + 1 + k) === finalSize mod blockSize
-  this._block.fill(0, this._len % this._blockSize + 1)
+  // zero (rem + 1) trailing bits, where (rem + 1) is the smallest
+  // non-negative solution to the equation (length + 1 + (rem + 1)) === finalSize mod blockSize
+  this._block.fill(0, rem + 1)
 
-  if (l % (this._blockSize * 8) >= this._finalSize * 8) {
+  if (rem >= this._finalSize) {
     this._update(this._block)
     this._block.fill(0)
   }
 
-  // to this append the block which is equal to the number l written in binary
-  if (l <= 0xffffffff) {
-    this._block.writeUInt32BE(l, this._blockSize - 4)
+  var bits = this._len * 8
+
+  // uint32
+  if (bits <= 0xffffffff) {
+    this._block.writeUInt32BE(bits, this._blockSize - 4)
+
+  // uint64
   } else {
-    var ll = l & 0xffffffff
-    this._block.writeUInt32BE((l - ll) / 0x100000000, this._blockSize - 8)
-    this._block.writeUInt32BE(ll, this._blockSize - 4)
+    var lowBits = bits & 0xffffffff
+    var highBits = (bits - lowBits) / 0x100000000
+
+    this._block.writeUInt32BE(highBits, this._blockSize - 8)
+    this._block.writeUInt32BE(lowBits, this._blockSize - 4)
   }
 
-  var hash = this._update(this._block) || this._hash()
+  this._update(this._block)
+  var hash = this._hash()
 
   return enc ? hash.toString(enc) : hash
 }

hexpp.js

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "inherits": "^2.0.1",
-    "buffer": "^2.3.4"
+    "safe-buffer": "^5.0.1"
   },
   "devDependencies": {
     "buffer": "~2.3.2",

package.json

@@ -8,7 +8,7 @@
 
 var inherits = require('inherits')
 var Hash = require('./hash')
-var Buffer = require('buffer/').Buffer
+var Buffer = require('safe-buffer').Buffer
 
 var K = [
   0x5a827999, 0x6ed9eba1, 0x8f1bbcdc | 0, 0xca62c1d6 | 0

sha.js

@@ -9,7 +9,7 @@
 
 var inherits = require('inherits')
 var Hash = require('./hash')
-var Buffer = require('buffer/').Buffer
+var Buffer = require('safe-buffer').Buffer
 
 var K = [
   0x5a827999, 0x6ed9eba1, 0x8f1bbcdc | 0, 0xca62c1d6 | 0

sha1.js

@@ -9,7 +9,7 @@
 var inherits = require('inherits')
 var Sha256 = require('./sha256')
 var Hash = require('./hash')
-var Buffer = require('buffer/').Buffer
+var Buffer = require('safe-buffer').Buffer
 
 var W = new Array(64)
 

sha224.js

@@ -8,7 +8,7 @@
 
 var inherits = require('inherits')
 var Hash = require('./hash')
-var Buffer = require('buffer/').Buffer
+var Buffer = require('safe-buffer').Buffer
 
 var K = [
   0x428A2F98, 0x71374491, 0xB5C0FBCF, 0xE9B5DBA5,

sha256.js

@@ -1,7 +1,7 @@
 var inherits = require('inherits')
 var SHA512 = require('./sha512')
 var Hash = require('./hash')
-var Buffer = require('buffer/').Buffer
+var Buffer = require('safe-buffer').Buffer
 
 var W = new Array(160)