Merge branch 'master' of github.com:crypto-browserify/sha.js

Author: dominictarr

.travis.yml

@@ -1,4 +1,10 @@
 language: node_js
 node_js:
   - "0.10"
+  - "0.12"
+  - "iojs"
+env:
+  - TEST_SUITE=lint
+  - TEST_SUITE=unit
+script: "npm run-script $TEST_SUITE"
 

bin.js

@@ -1,37 +1,43 @@
 #! /usr/bin/env node
 
 var createHash = require('./browserify')
-
 var argv = process.argv.slice(2)
 
-if(/--help|-h/.test(argv[0])) return usage()
-
-function stream (alg, s) {
+function pipe (algorithm, s) {
   var start = Date.now()
-  var hash = createHash(alg || 'sha1')
-  s
-  .on('data', function (data) {
+  var hash = createHash(algorithm || 'sha1')
+
+  s.on('data', function (data) {
     hash.update(data)
   })
-  .on('end', function (data) {
-    if(process.env.DEBUG)
+
+  s.on('end', function () {
+    if (process.env.DEBUG) {
       return console.log(hash.digest('hex'), Date.now() - start)
+    }
+
     console.log(hash.digest('hex'))
   })
 }
- 
-if(!process.stdin.isTTY) {
-  stream(argv[0], process.stdin)
-} else if (argv.length) {
-  var filename = argv.pop()
-  var alg = argv.pop()
-  stream(alg, require('fs').createReadStream(filename))
-} else {
-  usage()
-}
 
 function usage () {
   console.error('sha.js [algorithm=sha1] [filename] # hash filename with algorithm')
   console.error('input | sha.js [algorithm=sha1]    # hash stdin with algorithm')
   console.error('sha.js --help                      # display this message')
 }
+
+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()
+    pipe(algorithm, require('fs').createReadStream(filename))
+  }
+} else {
+  usage()
+}

hash.js

@@ -1,15 +1,15 @@
-//prototype class for hash functions
+// prototype class for hash functions
 function Hash (blockSize, finalSize) {
-  this._block = new Buffer(blockSize) //new Uint32Array(blockSize/4)
+  this._block = new Buffer(blockSize)
   this._finalSize = finalSize
   this._blockSize = blockSize
   this._len = 0
   this._s = 0
 }
 
 Hash.prototype.update = function (data, enc) {
-  if ("string" === typeof data) {
-    enc = enc || "utf8"
+  if (typeof data === 'string') {
+    enc = enc || 'utf8'
     data = new Buffer(data, enc)
   }
 

hexpp.js

@@ -1,29 +1,18 @@
-
-
 function toHex (buf, group, wrap, LE) {
   buf = buf.buffer || buf
   var s = ''
   var l = buf.byteLength || buf.length
-  for(var i = 0; i < l ; i++) {
-    var byte = (i&0xfffffffc)|(!LE ? i%4 : 3 - i%4)
-    s = s + ((buf[byte]>>4).toString(16))
-          + ((buf[byte]&0xf).toString(16))
-          + (group-1==i%group ? ' ' : '')
-          + (wrap-1==i%wrap ? '\n' : '')
+  for (var i = 0; i < l ; i++) {
+    var byteParam = (i & 0xfffffffc) | (!LE ? i % 4 : 3 - i % 4)
+    s += ((buf[byteParam] >> 4).toString(16)) +
+         ((buf[byteParam] & 0xf).toString(16)) +
+         (group - 1 === i % group ? ' ' : '') +
+         (wrap - 1 === i % wrap ? '\n' : '')
   }
   return s
 }
 
-function reverseByteOrder(n) {
-  return (
-    ((n << 24) & 0xff000000)
-  | ((n <<  8) & 0x00ff0000)
-  | ((n >>  8) & 0x0000ff00)
-  | ((n >> 24) & 0x000000ff)
-  )
-}
-
-var hexpp = module.exports = function (buffer, opts) {
+var hexpp = module.exports = function hexpp (buffer, opts) {
   opts = opts || {}
   opts.groups = opts.groups || 4
   opts.wrap = opts.wrap || 16
@@ -35,4 +24,3 @@ hexpp.defaults = function (opts) {
     return hexpp(b, opts)
   }
 }
-

index.js

@@ -1,9 +1,11 @@
-var exports = module.exports = function (alg) {
-  var Alg = exports[alg.toLowerCase()]
-  if(!Alg) throw new Error(alg + ' is not supported (we accept pull requests)')
-  return new Alg()
-}
+var exports = module.exports = function SHA (algorithm) {
+  algorithm = algorithm.toLowerCase()
+
+  var Algorithm = exports[algorithm]
+  if (!Algorithm) throw new Error(algorithm + ' is not supported (we accept pull requests)')
 
+  return new Algorithm()
+}
 
 exports.sha = require('./sha')
 exports.sha1 = require('./sha1')

package.json

@@ -13,13 +13,16 @@
   "devDependencies": {
     "buffer": "~2.3.2",
     "hash-test-vectors": "^1.3.1",
+    "standard": "^4.0.0",
     "tape": "~2.3.2",
     "typedarray": "0.0.6"
   },
   "bin": "./bin.js",
   "scripts": {
-    "prepublish": "npm ls && npm test",
-    "test": "set -e; for t in test/*.js; do node $t; done;"
+    "prepublish": "npm ls && npm run unit",
+    "lint": "standard",
+    "test": "npm run lint && npm run unit",
+    "unit": "set -e; for t in test/*.js; do node $t; done;"
   },
   "author": "Dominic Tarr <[email protected]> (dominictarr.com)",
   "license": "MIT"

sha.js

@@ -11,7 +11,7 @@ var Hash = require('./hash')
 
 var W = new Array(80)
 
-function Sha() {
+function Sha () {
   this.init()
   this._w = W
 
@@ -21,20 +21,20 @@ function Sha() {
 inherits(Sha, Hash)
 
 Sha.prototype.init = function () {
-  this._a = 0x67452301
-  this._b = 0xefcdab89
-  this._c = 0x98badcfe
-  this._d = 0x10325476
-  this._e = 0xc3d2e1f0
+  this._a = 0x67452301 | 0
+  this._b = 0xefcdab89 | 0
+  this._c = 0x98badcfe | 0
+  this._d = 0x10325476 | 0
+  this._e = 0xc3d2e1f0 | 0
 
   return this
 }
 
 /*
  * Bitwise rotate a 32-bit number to the left.
  */
-function rol(num, cnt) {
-  return (num << cnt) | (num >>> (32 - cnt));
+function rol (num, cnt) {
+  return (num << cnt) | (num >>> (32 - cnt))
 }
 
 Sha.prototype._update = function (M) {
@@ -52,8 +52,8 @@ Sha.prototype._update = function (M) {
    * SHA-1 has a bitwise rotate left operation. But, SHA is not
    * function calcW() { return rol(W[j - 3] ^ W[j -  8] ^ W[j - 14] ^ W[j - 16], 1) }
    */
-  function calcW() { return W[j - 3] ^ W[j -  8] ^ W[j - 14] ^ W[j - 16] }
-  function loop(w, f) {
+  function calcW () { return W[j - 3] ^ W[j - 8] ^ W[j - 14] ^ W[j - 16] }
+  function loop (w, f) {
     W[j] = w
 
     var t = rol(a, 5) + f + e + w + k
@@ -86,11 +86,11 @@ Sha.prototype._update = function (M) {
 Sha.prototype._hash = function () {
   var H = new Buffer(20)
 
-  H.writeInt32BE(this._a|0, 0)
-  H.writeInt32BE(this._b|0, 4)
-  H.writeInt32BE(this._c|0, 8)
-  H.writeInt32BE(this._d|0, 12)
-  H.writeInt32BE(this._e|0, 16)
+  H.writeInt32BE(this._a | 0, 0)
+  H.writeInt32BE(this._b | 0, 4)
+  H.writeInt32BE(this._c | 0, 8)
+  H.writeInt32BE(this._d | 0, 12)
+  H.writeInt32BE(this._e | 0, 16)
 
   return H
 }

sha1.js

@@ -12,7 +12,7 @@ var Hash = require('./hash')
 
 var W = new Array(80)
 
-function Sha1() {
+function Sha1 () {
   this.init()
   this._w = W
 
@@ -22,20 +22,20 @@ function Sha1() {
 inherits(Sha1, Hash)
 
 Sha1.prototype.init = function () {
-  this._a = 0x67452301
-  this._b = 0xefcdab89
-  this._c = 0x98badcfe
-  this._d = 0x10325476
-  this._e = 0xc3d2e1f0
+  this._a = 0x67452301 | 0
+  this._b = 0xefcdab89 | 0
+  this._c = 0x98badcfe | 0
+  this._d = 0x10325476 | 0
+  this._e = 0xc3d2e1f0 | 0
 
   return this
 }
 
 /*
  * Bitwise rotate a 32-bit number to the left.
  */
-function rol(num, cnt) {
-  return (num << cnt) | (num >>> (32 - cnt));
+function rol (num, cnt) {
+  return (num << cnt) | (num >>> (32 - cnt))
 }
 
 Sha1.prototype._update = function (M) {
@@ -49,8 +49,8 @@ Sha1.prototype._update = function (M) {
 
   var j = 0, k
 
-  function calcW() { return rol(W[j - 3] ^ W[j -  8] ^ W[j - 14] ^ W[j - 16], 1) }
-  function loop(w, f) {
+  function calcW () { return rol(W[j - 3] ^ W[j - 8] ^ W[j - 14] ^ W[j - 16], 1) }
+  function loop (w, f) {
     W[j] = w
 
     var t = rol(a, 5) + f + e + w + k
@@ -83,14 +83,13 @@ Sha1.prototype._update = function (M) {
 Sha1.prototype._hash = function () {
   var H = new Buffer(20)
 
-  H.writeInt32BE(this._a|0, 0)
-  H.writeInt32BE(this._b|0, 4)
-  H.writeInt32BE(this._c|0, 8)
-  H.writeInt32BE(this._d|0, 12)
-  H.writeInt32BE(this._e|0, 16)
+  H.writeInt32BE(this._a | 0, 0)
+  H.writeInt32BE(this._b | 0, 4)
+  H.writeInt32BE(this._c | 0, 8)
+  H.writeInt32BE(this._d | 0, 12)
+  H.writeInt32BE(this._e | 0, 16)
 
   return H
 }
 
 module.exports = Sha1
-

sha224.js

@@ -7,40 +7,40 @@
  */
 
 var inherits = require('inherits')
-var SHA256 = require('./sha256')
+var Sha256 = require('./sha256')
 var Hash = require('./hash')
 
 var W = new Array(64)
 
-function Sha224() {
+function Sha224 () {
   this.init()
 
   this._w = W // new Array(64)
 
   Hash.call(this, 64, 56)
 }
 
-inherits(Sha224, SHA256)
+inherits(Sha224, Sha256)
 
 Sha224.prototype.init = function () {
-  this._a = 0xc1059ed8|0
-  this._b = 0x367cd507|0
-  this._c = 0x3070dd17|0
-  this._d = 0xf70e5939|0
-  this._e = 0xffc00b31|0
-  this._f = 0x68581511|0
-  this._g = 0x64f98fa7|0
-  this._h = 0xbefa4fa4|0
+  this._a = 0xc1059ed8 | 0
+  this._b = 0x367cd507 | 0
+  this._c = 0x3070dd17 | 0
+  this._d = 0xf70e5939 | 0
+  this._e = 0xffc00b31 | 0
+  this._f = 0x68581511 | 0
+  this._g = 0x64f98fa7 | 0
+  this._h = 0xbefa4fa4 | 0
 
   return this
 }
 
 Sha224.prototype._hash = function () {
   var H = new Buffer(28)
 
-  H.writeInt32BE(this._a,  0)
-  H.writeInt32BE(this._b,  4)
-  H.writeInt32BE(this._c,  8)
+  H.writeInt32BE(this._a, 0)
+  H.writeInt32BE(this._b, 4)
+  H.writeInt32BE(this._c, 8)
   H.writeInt32BE(this._d, 12)
   H.writeInt32BE(this._e, 16)
   H.writeInt32BE(this._f, 20)