[Pkg-javascript-commits] [node-sha.js] 155/237: merge

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-sha.js.

commit 7d8b28f7627c82ea289e9396d1b93139264e4e1f
Merge: 68974c3 6e0bd2d
Author: Dominic Tarr <dominic.tarr at gmail.com>
Date:   Tue Sep 16 15:30:31 2014 +0300

    merge

 package.json | 4 +++-
 sha1.js      | 3 ++-
 test/hash.js | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --cc sha1.js
index ada604d,3516edb..54e2046
--- a/sha1.js
+++ b/sha1.js
@@@ -6,10 -6,12 +6,11 @@@
   * Distributed under the BSD License
   * See http://pajhome.org.uk/crypt/md5 for details.
   */
 -module.exports = function (Buffer, Hash) {
  
 -  var inherits = require('util').inherits
 -  var global = require('global')
 +var inherits = require('util').inherits
++var global = require('global')
  
 -  inherits(Sha1, Hash)
 +module.exports = function (Buffer, Hash) {
  
    var A = 0|0
    var B = 4|0
@@@ -17,7 -19,10 +18,7 @@@
    var D = 12|0
    var E = 16|0
  
-   var W = new Int32Array(80)
 -  var BE = false
 -  var LE = true
 -
+   var W = new (global.Int32Array || Array)(80)
  
    var POOL = []
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-sha.js.git