[Pkg-javascript-commits] [node-sha.js] 70/237: Merge branch 'fix3'

[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 a656ccf1440aea4791e7d668f4887834a3ff6710
Merge: 2869ea0 f58c321
Author: Dominic Tarr <dominic.tarr at gmail.com>
Date:   Tue Dec 31 13:01:53 2013 +0700

    Merge branch 'fix3'

 sha1.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --cc sha1.js
index aecf81c,563f14f..8db05e6
--- a/sha1.js
+++ b/sha1.js
@@@ -61,10 -67,14 +61,10 @@@ Sha1.prototype._update = function (arra
    e = _e = this._e
  
    var w = this._w
 -  var x = this._block
 -
 -//  console.log('--- Update ---')
 -//  console.log(hexpp(x))
  
    for(var j = 0; j < 80; j++) {
- 
-     w[j] = j < 16
+     var W = w[j]
+       = j < 16
        ? X.getUint32(j*4, BE)
        : rol(w[j - 3] ^ w[j -  8] ^ w[j - 14] ^ w[j - 16], 1)
  

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