Fixed

- incorrect result when first bit is 1 of bytes.

Changed
- prevent webpack to require dependencies.

.covignore

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

.gitignore

@@ -1,3 +1,3 @@
-node_modules/
-covreporter
-my_test
+/node_modules/
+/coverage/
+/.nyc_output/

.npmignore

@@ -0,0 +1,8 @@
+/node_modules/
+/coverage/
+/.nyc_output/
+/tests/
+.covignore
+.travis.yml
+.npmignore
+bower.json

.travis.yml

@@ -1,12 +1,10 @@
 language: node_js
 node_js:
-  - "0.12.15"
-  - "4.5"
-  - "6.5.0"
+  - "6.11.4"
+  - "8.6.0"
 before_install:
   - npm install coveralls
-  - npm install mocha-lcov-reporter
-script: npm run-script coveralls
+after_success: npm run coveralls
 branches:
   only:
     - master

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## v0.6.0 / 2017-12-21
+### Fixed
+- incorrect result when first bit is 1 of bytes.
+
+### Changed
+- prevent webpack to require dependencies.
+
+## 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.6.0",
   "main": ["src/sha1.js"],
   "ignore": [
     "samples",

package.json

@@ -1,20 +1,20 @@
 {
   "name": "js-sha1",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "A simple SHA1 hash function for JavaScript supports UTF-8 encoding.",
   "main": "src/sha1.js",
   "devDependencies": {
     "expect.js": "~0.3.1",
-    "jscoverage": "~0.5.9",
     "mocha": "~2.3.4",
+    "nyc": "^11.3.0",
     "requirejs": "^2.1.22",
-    "uglifyjs": "~2.4.10"
+    "uglify-js": "^3.1.9"
   },
   "scripts": {
-    "test": "mocha tests/node-test.js -r jscoverage",
-    "report": "mocha tests/node-test.js -r jscoverage --covout=html",
-    "coveralls": "mocha tests/node-test.js -R mocha-lcov-reporter -r jscoverage | coveralls",
-    "build": "uglifyjs src/sha1.js --compress --mangle --comments --output build/sha1.min.js"
+    "test": "nyc mocha tests/node-test.js",
+    "report": "nyc --reporter=html --reporter=text mocha tests/node-test.js",
+    "coveralls": "nyc report --reporter=text-lcov | coveralls",
+    "build": "uglifyjs src/sha1.js -c -m eval --comments -o build/sha1.min.js"
   },
   "repository": {
     "type": "git",
@@ -32,5 +32,10 @@
   "homepage": "https://github.com/emn178/js-sha1",
   "bugs": {
     "url": "https://github.com/emn178/js-sha1/issues"
+  },
+  "nyc": {
+    "exclude": [
+      "tests"
+    ]
   }
 }

src/sha1.js

@@ -1,20 +1,22 @@
 /*
  * [js-sha1]{@link https://github.com/emn178/js-sha1}
  *
- * @version 0.4.0
+ * @version 0.6.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 AMD = typeof define == 'function' && define.amd;
+  var COMMON_JS = !root.JS_SHA1_NO_COMMON_JS && typeof module === 'object' && module.exports;
+  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;
-    try {
-      if (root.JS_SHA1_TEST) {
-        throw 'JS_SHA1_TEST';
-      }
-      crypto = require('crypto');
-      Buffer = require('buffer').Buffer;
-    } catch (e) {
-      console.log(e);
-      return method;
-    }
+    var crypto = eval("require('crypto')");
+    var Buffer = eval("require('buffer').Buffer");
     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';
-    if (notString && message.constructor == root.ArrayBuffer) {
+    var notString = typeof(message) !== 'string';
+    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('./test.js')]
+delete require.cache[require.resolve('../src/sha1.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);