Fixed incorrect result when file size >= 512M.

.covignore

@@ -1,2 +1,2 @@
+/node_modules/
 /tests/
-node_modules/

.gitignore

@@ -1,3 +1,3 @@
-node_modules/
+/node_modules/
-covreporter
+/covreporter/
-my_test
+/my_test/

.travis.yml

@@ -1,8 +1,7 @@
 language: node_js
 node_js:
-  - "0.12.15"
+  - "6.11.4"
-  - "4.5"
+  - "8.6.0"
-  - "6.5.0"
 before_install:
   - npm install coveralls
   - npm install mocha-lcov-reporter

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## v0.5.0 / 2017-10-31
+### Fixed
+- incorrect result when file size >= 512M.
+
+## v0.4.1 / 2016-12-30
+### Fixed
+- ArrayBuffer dosen't work in Webpack.
+
 ## v0.4.0 / 2016-12-05
 ### Added
 - update method.

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2014-2016 Chen, Yi-Cyuan
+Copyright 2014-2017 Chen, Yi-Cyuan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "js-sha1",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "main": ["src/sha1.js"],
   "ignore": [
     "samples",

package-lock.json

@@ -0,0 +1,286 @@
+{
+  "name": "js-sha1",
+  "version": "0.5.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
+    "async": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+      "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
+      "dev": true
+    },
+    "coffee-script": {
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz",
+      "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==",
+      "dev": true
+    },
+    "commander": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
+      "integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=",
+      "dev": true
+    },
+    "debug": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.3.tgz",
+      "integrity": "sha1-/IxrLWACgEtAgcAgjg9kYLofo+Q=",
+      "dev": true,
+      "requires": {
+        "ms": "0.6.2"
+      }
+    },
+    "diff": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
+      "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=",
+      "dev": true
+    },
+    "ejs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-1.0.0.tgz",
+      "integrity": "sha1-ycYKSKRu5FL7MqccMXuV5aofyz0=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
+      "integrity": "sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=",
+      "dev": true
+    },
+    "expect.js": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/expect.js/-/expect.js-0.3.1.tgz",
+      "integrity": "sha1-sKWaDS7/VDdUTr8M6qYBWEHQm1s=",
+      "dev": true
+    },
+    "glob": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz",
+      "integrity": "sha1-4xPusknHr/qlxHUoaw4RW1mDlGc=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "2.0.3",
+        "inherits": "2.0.3",
+        "minimatch": "0.2.14"
+      }
+    },
+    "graceful-fs": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
+      "integrity": "sha1-fNLNsiiko/Nule+mzBQt59GhNtA=",
+      "dev": true
+    },
+    "growl": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz",
+      "integrity": "sha1-Sy3sjZB+k9szZiTc7AGDUC+MlCg=",
+      "dev": true
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "jade": {
+      "version": "0.26.3",
+      "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
+      "integrity": "sha1-jxDXl32NefL2/4YqgbBRPMslaGw=",
+      "dev": true,
+      "requires": {
+        "commander": "0.6.1",
+        "mkdirp": "0.3.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
+          "integrity": "sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
+          "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=",
+          "dev": true
+        }
+      }
+    },
+    "jscoverage": {
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/jscoverage/-/jscoverage-0.5.9.tgz",
+      "integrity": "sha1-M3tR3ZBU6OyTwLCxU3VTtSvwst8=",
+      "dev": true,
+      "requires": {
+        "coffee-script": "1.12.7",
+        "debug": "1.0.3",
+        "ejs": "1.0.0",
+        "optimist": "0.3.1",
+        "uglify-js": "2.4.15",
+        "xfs": "0.1.8"
+      }
+    },
+    "lru-cache": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+      "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+      "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "2.7.3",
+        "sigmund": "1.0.1"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+      "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "mocha": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.3.4.tgz",
+      "integrity": "sha1-himm+wRPLSJapLgaKuLQAWmesmY=",
+      "dev": true,
+      "requires": {
+        "commander": "2.3.0",
+        "debug": "2.2.0",
+        "diff": "1.4.0",
+        "escape-string-regexp": "1.0.2",
+        "glob": "3.2.3",
+        "growl": "1.8.1",
+        "jade": "0.26.3",
+        "mkdirp": "0.5.0",
+        "supports-color": "1.2.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        }
+      }
+    },
+    "ms": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+      "integrity": "sha1-2JwhJMb9wTU9Zai3e/GqxLGTcIw=",
+      "dev": true
+    },
+    "optimist": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.1.tgz",
+      "integrity": "sha1-ZoDTBWAZOvWlXrZDlIg+17y5jy4=",
+      "dev": true,
+      "requires": {
+        "wordwrap": "0.0.3"
+      }
+    },
+    "requirejs": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.5.tgz",
+      "integrity": "sha512-svnO+aNcR/an9Dpi44C7KSAy5fFGLtmPbaaCeQaklUz8BQhS64tWWIIlvEA5jrWICzlO/X9KSzSeXFnZdBu8nw==",
+      "dev": true
+    },
+    "sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.1.34",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+      "integrity": "sha1-p8/omux7FoLDsZjQrPtH19CQVms=",
+      "dev": true,
+      "requires": {
+        "amdefine": "1.0.1"
+      }
+    },
+    "supports-color": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz",
+      "integrity": "sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "2.4.15",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz",
+      "integrity": "sha1-ErxthDRfvDBuE/cHXWQ3qL9k1+M=",
+      "dev": true,
+      "requires": {
+        "async": "0.2.10",
+        "optimist": "0.3.7",
+        "source-map": "0.1.34",
+        "uglify-to-browserify": "1.0.2"
+      },
+      "dependencies": {
+        "optimist": {
+          "version": "0.3.7",
+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+          "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
+          "dev": true,
+          "requires": {
+            "wordwrap": "0.0.3"
+          }
+        }
+      }
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+      "dev": true
+    },
+    "uglifyjs": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/uglifyjs/-/uglifyjs-2.4.11.tgz",
+      "integrity": "sha1-NEDWTgRXWViVJEGOtkHGi7kNET4=",
+      "dev": true
+    },
+    "wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+      "dev": true
+    },
+    "xfs": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/xfs/-/xfs-0.1.8.tgz",
+      "integrity": "sha1-iHY8QtEdHvlWy9ZNnU2GunM1n9A=",
+      "dev": true
+    }
+  }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-sha1",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "A simple SHA1 hash function for JavaScript supports UTF-8 encoding.",
   "main": "src/sha1.js",
   "devDependencies": {

src/sha1.js

@@ -1,20 +1,22 @@
 /*
  * [js-sha1]{@link https://github.com/emn178/js-sha1}
  *
- * @version 0.4.0
+ * @version 0.5.0
  * @author Chen, Yi-Cyuan [emn178@gmail.com]
- * @copyright Chen, Yi-Cyuan 2014-2016
+ * @copyright Chen, Yi-Cyuan 2014-2017
  * @license MIT
  */
-(function(root) {
+/*jslint bitwise: true */
+(function() {
   'use strict';
 
-  var NODE_JS = typeof process == 'object' && process.versions && process.versions.node;
+  var root = typeof window === 'object' ? window : {};
+  var NODE_JS = !root.JS_SHA1_NO_NODE_JS && typeof process === 'object' && process.versions && process.versions.node;
   if (NODE_JS) {
     root = global;
   }
-  var COMMON_JS = !root.JS_SHA1_TEST && typeof module == 'object' && module.exports;
+  var COMMON_JS = !root.JS_SHA1_NO_COMMON_JS && typeof module === 'object' && module.exports;
-  var AMD = typeof define == 'function' && define.amd;
+  var AMD = typeof define === 'function' && define.amd;
   var HEX_CHARS = '0123456789abcdef'.split('');
   var EXTRA = [-2147483648, 8388608, 32768, 128];
   var SHIFT = [24, 16, 8, 0];
@@ -39,7 +41,7 @@
     method.update = function (message) {
       return method.create().update(message);
     };
-    for (var i = 0;i < OUTPUT_TYPES.length;++i) {
+    for (var i = 0; i < OUTPUT_TYPES.length; ++i) {
       var type = OUTPUT_TYPES[i];
       method[type] = createOutputMethod(type);
     }
@@ -47,21 +49,12 @@
   };
 
   var nodeWrap = function (method) {
-    var crypto, Buffer;
+    var crypto = require('crypto');
-    try {
+    var Buffer = require('buffer').Buffer;
-      if (root.JS_SHA1_TEST) {
-        throw 'JS_SHA1_TEST';
-      }
-      crypto = require('crypto');
-      Buffer = require('buffer').Buffer;
-    } catch (e) {
-      console.log(e);
-      return method;
-    }
     var nodeMethod = function (message) {
-      if (typeof message == 'string') {
+      if (typeof message === 'string') {
         return crypto.createHash('sha1').update(message, 'utf8').digest('hex');
-      } else if (message.constructor == ArrayBuffer) {
+      } else if (message.constructor === ArrayBuffer) {
         message = new Uint8Array(message);
       } else if (message.length === undefined) {
         return method(message);
@@ -88,7 +81,7 @@
     this.h3 = 0x10325476;
     this.h4 = 0xC3D2E1F0;
 
-    this.block = this.start = this.bytes = 0;
+    this.block = this.start = this.bytes = this.hBytes = 0;
     this.finalized = this.hashed = false;
     this.first = true;
   }
@@ -97,8 +90,8 @@
     if (this.finalized) {
       return;
     }
-    var notString = typeof(message) != 'string';
+    var notString = typeof(message) !== 'string';
-    if (notString && message.constructor == root.ArrayBuffer) {
+    if (notString && message.constructor === root.ArrayBuffer) {
       message = new Uint8Array(message);
     }
     var code, index = 0, i, length = message.length || 0, blocks = this.blocks;
@@ -114,11 +107,11 @@
       }
 
       if(notString) {
-        for (i = this.start;index < length && i < 64; ++index) {
+        for (i = this.start; index < length && i < 64; ++index) {
           blocks[i >> 2] |= message[index] << SHIFT[i++ & 3];
         }
       } else {
-        for (i = this.start;index < length && i < 64; ++index) {
+        for (i = this.start; index < length && i < 64; ++index) {
           code = message.charCodeAt(index);
           if (code < 0x80) {
             blocks[i >> 2] |= code << SHIFT[i++ & 3];
@@ -150,6 +143,10 @@
         this.start = i;
       }
     }
+    if (this.bytes > 4294967295) {
+      this.hBytes += this.bytes / 4294967296 << 0;
+      this.bytes = this.bytes % 4294967296;
+    }
     return this;
   };
 
@@ -172,6 +169,7 @@
       blocks[8] = blocks[9] = blocks[10] = blocks[11] =
       blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
     }
+    blocks[14] = this.hBytes << 3 | this.bytes >> 29;
     blocks[15] = this.bytes << 3;
     this.hash();
   };
@@ -180,12 +178,12 @@
     var a = this.h0, b = this.h1, c = this.h2, d = this.h3, e = this.h4;
     var f, j, t, blocks = this.blocks;
 
-    for(j = 16;j < 80;++j) {
+    for(j = 16; j < 80; ++j) {
       t = blocks[j - 3] ^ blocks[j - 8] ^ blocks[j - 14] ^ blocks[j - 16];
       blocks[j] =  (t << 1) | (t >>> 31);
     }
 
-    for(j = 0;j < 20;j += 5) {
+    for(j = 0; j < 20; j += 5) {
       f = (b & c) | ((~b) & d);
       t = (a << 5) | (a >>> 27);
       e = t + f + e + 1518500249 + blocks[j] << 0;
@@ -212,7 +210,7 @@
       c = (c << 30) | (c >>> 2);
     }
 
-    for(;j < 40;j += 5) {
+    for(; j < 40; j += 5) {
       f = b ^ c ^ d;
       t = (a << 5) | (a >>> 27);
       e = t + f + e + 1859775393 + blocks[j] << 0;
@@ -239,7 +237,7 @@
       c = (c << 30) | (c >>> 2);
     }
 
-    for(;j < 60;j += 5) {
+    for(; j < 60; j += 5) {
       f = (b & c) | (b & d) | (c & d);
       t = (a << 5) | (a >>> 27);
       e = t + f + e - 1894007588 + blocks[j] << 0;
@@ -266,7 +264,7 @@
       c = (c << 30) | (c >>> 2);
     }
 
-    for(;j < 80;j += 5) {
+    for(; j < 80; j += 5) {
       f = b ^ c ^ d;
       t = (a << 5) | (a >>> 27);
       e = t + f + e - 899497514 + blocks[j] << 0;
@@ -370,4 +368,4 @@
       });
     }
   }
-}(this));
+})();

tests/node-test.js

@@ -1,12 +1,26 @@
-sha1 = require('../src/sha1.js');
+// Node.js env
 expect = require('expect.js');
+sha1 = require('../src/sha1.js');
 require('./test.js');
 
-delete require.cache[require.resolve('../src/sha1.js')]
+delete require.cache[require.resolve('../src/sha1.js')];
-delete require.cache[require.resolve('./test.js')]
+delete require.cache[require.resolve('./test.js')];
 sha1 = null;
 
-JS_SHA1_TEST = true;
+// Webpack browser env
+JS_SHA1_NO_NODE_JS = true;
+window = global;
+sha1 = require('../src/sha1.js');
+require('./test.js');
+
+delete require.cache[require.resolve('../src/sha1.js')];
+delete require.cache[require.resolve('./test.js')];
+sha1 = null;
+
+// browser env
+JS_SHA1_NO_NODE_JS = true;
+JS_SHA1_NO_COMMON_JS = true;
+window = global;
 require('../src/sha1.js');
 require('./test.js');
 
@@ -14,6 +28,10 @@ delete require.cache[require.resolve('../src/sha1.js')];
 delete require.cache[require.resolve('./test.js')];
 sha1 = null;
 
+// browser AMD
+JS_SHA1_NO_NODE_JS = true;
+JS_SHA1_NO_COMMON_JS = true;
+window = global;
 define = function (func) {
   sha1 = func();
   require('./test.js');

tests/test.js

@@ -1,8 +1,8 @@
-(function(sha1) {
+(function (sha1) {
   Array.prototype.toHexString = ArrayBuffer.prototype.toHexString = function () {
     var array = new Uint8Array(this);
     var hex = '';
-    for (var i = 0;i < array.length;++i) {
+    for (var i = 0; i < array.length; ++i) {
       var c = array[i].toString('16');
       hex += c.length == 1 ? '0' + c : c;
     }
@@ -49,7 +49,6 @@
       '5ba93c9db0cff93f52b521d7420e43f6eda2784f': new ArrayBuffer(1)
     },
     'Object': {
-      'da39a3ee5e6b4b0d3255bfef95601890afd80709': {},
       'da39a3ee5e6b4b0d3255bfef95601890afd80709': {what: 'ever'}
     }
   };
@@ -58,7 +57,7 @@
     testCases['Buffer'] = {
       'da39a3ee5e6b4b0d3255bfef95601890afd80709': new Buffer(0),
       '2fd4e1c67a2d28fced849ee1bb76e7391b93eb12': new Buffer(new Uint8Array([84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101, 114, 32, 116, 104, 101, 32, 108, 97, 122, 121, 32, 100, 111, 103]))
-    }
+    };
   }
 
   var methods = [
@@ -176,5 +175,12 @@
         }
       });
     });
+
+    context('when large size', function () {
+      var hash = sha1.create();
+      hash.bytes = 4294967295;
+      hash.update('any');
+      expect(hash.hBytes).to.be(1);
+    });
   });
 })(sha1);