UnknownObject/js-sha1
1
0
Fork 0
mirror of https://github.com/emn178/js-sha1.git synced 2026-08-12 20:11:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ArrayBuffer dosen't work in Webpack.

Browse Source
This commit is contained in:
Chen, Yi-Cyuan
2016-12-30 09:56:58 +08:00
parent 80d540792b
commit c724643de0
9 changed files with 59 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.covignore
+1 -1
View File
@@ -1,2 +1,2 @@
/node_modules/
/tests/
node_modules/
.gitignore
+3 -3
View File
@@ -1,3 +1,3 @@
node_modules/
covreporter
my_test
/node_modules/
/covreporter/
/my_test/
CHANGELOG.md
+4
View File
@@ -1,5 +1,9 @@
# Change Log
## v0.4.1 / 2016-12-30
### Fixed
- ArrayBuffer dosen't work in Webpack.
## v0.4.0 / 2016-12-05
### Added
- update method.
bower.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "js-sha1",
"version": "0.4.0",
"version": "0.4.1",
"main": ["src/sha1.js"],
"ignore": [
"samples",
build/sha1.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "js-sha1",
"version": "0.4.0",
"version": "0.4.1",
"description": "A simple SHA1 hash function for JavaScript supports UTF-8 encoding.",
"main": "src/sha1.js",
"devDependencies": {
src/sha1.js
+22 -29
View File
@@ -1,20 +1,22 @@
/*
* [js-sha1]{@link https://github.com/emn178/js-sha1}
*
* @version 0.4.0
* @version 0.4.1
* @author Chen, Yi-Cyuan [emn178@gmail.com]
* @copyright Chen, Yi-Cyuan 2014-2016
* @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 = require('crypto');
var Buffer = 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);
@@ -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];
@@ -180,12 +173,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 +205,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 +232,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 +259,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 +363,4 @@
});
}
}
}(this));
})();
tests/node-test.js
+22 -4
View File
@@ -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
+3 -4
View File
@@ -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 = [