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

Improve performance.

Browse Source
This commit is contained in:
Chen Yi-Cyuan
2015-01-24 10:47:09 +08:00
parent a564472309
commit 5df847f0e0
9 changed files with 105 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -1 +1,2 @@
node_modules/ node_modules/
covreporter
.travis.yml
+3
View File
@@ -10,3 +10,6 @@ install:
- npm install - npm install
script: script:
- npm run-script coveralls - npm run-script coveralls
branches:
only:
- master
CHANGELOG.md
+4
View File
@@ -1,3 +1,7 @@
# v0.1.4 / 2015-01-24
* Improve performance.
# v0.1.3 / 2015-01-09 # v0.1.3 / 2015-01-09
* Improve performance. * Improve performance.
README.md
+1 -1
View File
@@ -1,5 +1,5 @@
# js-sha256 # js-sha256
[![Build Status](https://api.travis-ci.org/emn178/js-sha256.png)](https://travis-ci.org/emn178/js-sha256) [![Build Status](https://api.travis-ci.org/emn178/js-sha256.png?branch=master)](https://travis-ci.org/emn178/js-sha256?branch=master)
[![Build Status](https://coveralls.io/repos/emn178/js-sha256/badge.png?branch=master)](https://coveralls.io/r/emn178/js-sha256?branch=master) [![Build Status](https://coveralls.io/repos/emn178/js-sha256/badge.png?branch=master)](https://coveralls.io/r/emn178/js-sha256?branch=master)
[![NPM](https://nodei.co/npm/js-sha256.png?stars&downloads)](https://nodei.co/npm/js-sha256/) [![NPM](https://nodei.co/npm/js-sha256.png?stars&downloads)](https://nodei.co/npm/js-sha256/)
A simple SHA-256 / SHA-224 hash function for JavaScript supports UTF-8 encoding. A simple SHA-256 / SHA-224 hash function for JavaScript supports UTF-8 encoding.
bower.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "js-sha256", "name": "js-sha256",
"version": "0.1.3", "version": "0.1.4",
"main": ["build/sha256.min.js"], "main": ["build/sha256.min.js"],
"ignore": [ "ignore": [
"samples", "samples",
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "js-sha256", "name": "js-sha256",
"version": "0.1.3", "version": "0.1.4",
"description": "A simple SHA-256 / SHA-224 hash function for JavaScript supports UTF-8 encoding.", "description": "A simple SHA-256 / SHA-224 hash function for JavaScript supports UTF-8 encoding.",
"main": "src/sha256.js", "main": "src/sha256.js",
"devDependencies": { "devDependencies": {
src/sha256.js
+82 -51
View File
@@ -1,5 +1,5 @@
/* /*
* js-sha256 v0.1.3 * js-sha256 v0.1.4
* https://github.com/emn178/js-sha256 * https://github.com/emn178/js-sha256
* *
* Copyright 2014-2015, emn178@gmail.com * Copyright 2014-2015, emn178@gmail.com
@@ -10,7 +10,16 @@
;(function(root, undefined) { ;(function(root, undefined) {
'use strict'; 'use strict';
var NODE_JS = typeof(module) != 'undefined';
if(NODE_JS) {
root = global;
if(root.JS_SHA256_TEST) {
root.navigator = { userAgent: 'Firefox'};
}
}
var FIREFOX = (root.JS_SHA256_TEST || !NODE_JS) && navigator.userAgent.indexOf('Firefox') != -1;
var HEX_CHARS = '0123456789abcdef'.split(''); var HEX_CHARS = '0123456789abcdef'.split('');
var SHIFT = [24, 16, 8, 0];
var K =[0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, var K =[0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
@@ -30,10 +39,6 @@
}; };
var sha2 = function(message, is256, asciiOnly) { var sha2 = function(message, is256, asciiOnly) {
if(is256 === undefined) {
is256 = true;
}
var chunks, h0, h1, h2, h3, h4, h5, h6, h7; var chunks, h0, h1, h2, h3, h4, h5, h6, h7;
if(!asciiOnly && /[^\x00-\x7F]/.test(message)) { if(!asciiOnly && /[^\x00-\x7F]/.test(message)) {
chunks = getChunksFromUtf8(message); chunks = getChunksFromUtf8(message);
@@ -61,7 +66,7 @@
} }
for(var i = 0, length = chunks.length;i < length;++i) { for(var i = 0, length = chunks.length;i < length;++i) {
var w = chunks[i], s0, s1, j, tmp1, tmp2, tmp3, maj, t1, t2, ch, var w = chunks[i], s0, s1, j, tmp1, tmp2, tmp3, maj, t1, t2, ch, ab, da, cd, bc,
a = h0, b = h1, c = h2, d = h3, e = h4, f = h5, g = h6, h = h7; a = h0, b = h1, c = h2, d = h3, e = h4, f = h5, g = h6, h = h7;
for(j = 16;j < 64;++j) { for(j = 16;j < 64;++j) {
@@ -74,9 +79,10 @@
tmp1 = (tmp1 >>> 17) | (tmp1 << 15); tmp1 = (tmp1 >>> 17) | (tmp1 << 15);
tmp2 = (tmp2 >>> 19) | (tmp2 << 13); tmp2 = (tmp2 >>> 19) | (tmp2 << 13);
s1 = tmp1 ^ tmp2 ^ (w[j - 2] >>> 10); s1 = tmp1 ^ tmp2 ^ (w[j - 2] >>> 10);
w[j] = (w[j - 16] + s0 + w[j - 7] + s1) << 0; w[j] = w[j - 16] + s0 + w[j - 7] + s1 << 0;
} }
bc = b & c;
for(j = 0;j < 64;j += 4) { for(j = 0;j < 64;j += 4) {
tmp1 = (a >>> 2) | (a << 30); tmp1 = (a >>> 2) | (a << 30);
tmp2 = (a >>> 13) | (a << 19); tmp2 = (a >>> 13) | (a << 19);
@@ -86,12 +92,13 @@
tmp2 = (e >>> 11) | (e << 21); tmp2 = (e >>> 11) | (e << 21);
tmp3 = (e >>> 25) | (e << 7); tmp3 = (e >>> 25) | (e << 7);
s1 = tmp1 ^ tmp2 ^ tmp3; s1 = tmp1 ^ tmp2 ^ tmp3;
maj = (a & b) ^ (a & c) ^ (b & c); ab = a & b;
maj = ab ^ (a & c) ^ bc;
ch = (e & f) ^ (~e & g); ch = (e & f) ^ (~e & g);
t1 = (h + s1 + ch + K[j + 0] + w[j + 0]) << 0; t1 = h + s1 + ch + K[j] + w[j] << 0;
t2 = (s0 + maj) << 0; t2 = s0 + maj << 0;
h = (d + t1) << 0; h = d + t1 << 0;
d = (t1 + t2) << 0; d = t1 + t2 << 0;
tmp1 = (d >>> 2) | (d << 30); tmp1 = (d >>> 2) | (d << 30);
tmp2 = (d >>> 13) | (d << 19); tmp2 = (d >>> 13) | (d << 19);
tmp3 = (d >>> 22) | (d << 10); tmp3 = (d >>> 22) | (d << 10);
@@ -100,12 +107,13 @@
tmp2 = (h >>> 11) | (h << 21); tmp2 = (h >>> 11) | (h << 21);
tmp3 = (h >>> 25) | (h << 7); tmp3 = (h >>> 25) | (h << 7);
s1 = tmp1 ^ tmp2 ^ tmp3; s1 = tmp1 ^ tmp2 ^ tmp3;
maj = (d & a) ^ (d & b) ^ (a & b); da = d & a;
maj = da ^ (d & b) ^ ab;
ch = (h & e) ^ (~h & f); ch = (h & e) ^ (~h & f);
t1 = (g + s1 + ch + K[j + 1] + w[j + 1]) << 0; t1 = g + s1 + ch + K[j + 1] + w[j + 1] << 0;
t2 = (s0 + maj) << 0; t2 = s0 + maj << 0;
g = (c + t1) << 0; g = c + t1 << 0;
c = (t1 + t2) << 0; c = t1 + t2 << 0;
tmp1 = (c >>> 2) | (c << 30); tmp1 = (c >>> 2) | (c << 30);
tmp2 = (c >>> 13) | (c << 19); tmp2 = (c >>> 13) | (c << 19);
tmp3 = (c >>> 22) | (c << 10); tmp3 = (c >>> 22) | (c << 10);
@@ -114,12 +122,13 @@
tmp2 = (g >>> 11) | (g << 21); tmp2 = (g >>> 11) | (g << 21);
tmp3 = (g >>> 25) | (g << 7); tmp3 = (g >>> 25) | (g << 7);
s1 = tmp1 ^ tmp2 ^ tmp3; s1 = tmp1 ^ tmp2 ^ tmp3;
maj = (c & d) ^ (c & a) ^ (d & a); cd = c & d;
maj = cd ^ (c & a) ^ da;
ch = (g & h) ^ (~g & e); ch = (g & h) ^ (~g & e);
t1 = (f + s1 + ch + K[j + 2] + w[j + 2]) << 0; t1 = f + s1 + ch + K[j + 2] + w[j + 2] << 0;
t2 = (s0 + maj) << 0; t2 = s0 + maj << 0;
f = (b + t1) << 0; f = b + t1 << 0;
b = (t1 + t2) << 0; b = t1 + t2 << 0;
tmp1 = (b >>> 2) | (b << 30); tmp1 = (b >>> 2) | (b << 30);
tmp2 = (b >>> 13) | (b << 19); tmp2 = (b >>> 13) | (b << 19);
tmp3 = (b >>> 22) | (b << 10); tmp3 = (b >>> 22) | (b << 10);
@@ -128,36 +137,58 @@
tmp2 = (f >>> 11) | (f << 21); tmp2 = (f >>> 11) | (f << 21);
tmp3 = (f >>> 25) | (f << 7); tmp3 = (f >>> 25) | (f << 7);
s1 = tmp1 ^ tmp2 ^ tmp3; s1 = tmp1 ^ tmp2 ^ tmp3;
maj = (b & c) ^ (b & d) ^ (c & d); bc = b & c;
maj = bc ^ (b & d) ^ cd;
ch = (f & g) ^ (~f & h); ch = (f & g) ^ (~f & h);
t1 = (e + s1 + ch + K[j + 3] + w[j + 3]) << 0; t1 = e + s1 + ch + K[j + 3] + w[j + 3] << 0;
t2 = (s0 + maj) << 0; t2 = s0 + maj << 0;
e = (a + t1) << 0; e = a + t1 << 0;
a = (t1 + t2) << 0; a = t1 + t2 << 0;
} }
h0 = (h0 + a) << 0; h0 = h0 + a << 0;
h1 = (h1 + b) << 0; h1 = h1 + b << 0;
h2 = (h2 + c) << 0; h2 = h2 + c << 0;
h3 = (h3 + d) << 0; h3 = h3 + d << 0;
h4 = (h4 + e) << 0; h4 = h4 + e << 0;
h5 = (h5 + f) << 0; h5 = h5 + f << 0;
h6 = (h6 + g) << 0; h6 = h6 + g << 0;
h7 = (h7 + h) << 0; h7 = h7 + h << 0;
} }
var hex = toHexString(h0) + toHexString(h1)+ toHexString(h2) + toHexString(h3) + toHexString(h4) + toHexString(h5) + toHexString(h6); var hex = HEX_CHARS[(h0 >> 28) & 0x0F] + HEX_CHARS[(h0 >> 24) & 0x0F] +
HEX_CHARS[(h0 >> 20) & 0x0F] + HEX_CHARS[(h0 >> 16) & 0x0F] +
HEX_CHARS[(h0 >> 12) & 0x0F] + HEX_CHARS[(h0 >> 8) & 0x0F] +
HEX_CHARS[(h0 >> 4) & 0x0F] + HEX_CHARS[h0 & 0x0F] +
HEX_CHARS[(h1 >> 28) & 0x0F] + HEX_CHARS[(h1 >> 24) & 0x0F] +
HEX_CHARS[(h1 >> 20) & 0x0F] + HEX_CHARS[(h1 >> 16) & 0x0F] +
HEX_CHARS[(h1 >> 12) & 0x0F] + HEX_CHARS[(h1 >> 8) & 0x0F] +
HEX_CHARS[(h1 >> 4) & 0x0F] + HEX_CHARS[h1 & 0x0F] +
HEX_CHARS[(h2 >> 28) & 0x0F] + HEX_CHARS[(h2 >> 24) & 0x0F] +
HEX_CHARS[(h2 >> 20) & 0x0F] + HEX_CHARS[(h2 >> 16) & 0x0F] +
HEX_CHARS[(h2 >> 12) & 0x0F] + HEX_CHARS[(h2 >> 8) & 0x0F] +
HEX_CHARS[(h2 >> 4) & 0x0F] + HEX_CHARS[h2 & 0x0F] +
HEX_CHARS[(h3 >> 28) & 0x0F] + HEX_CHARS[(h3 >> 24) & 0x0F] +
HEX_CHARS[(h3 >> 20) & 0x0F] + HEX_CHARS[(h3 >> 16) & 0x0F] +
HEX_CHARS[(h3 >> 12) & 0x0F] + HEX_CHARS[(h3 >> 8) & 0x0F] +
HEX_CHARS[(h3 >> 4) & 0x0F] + HEX_CHARS[h3 & 0x0F] +
HEX_CHARS[(h4 >> 28) & 0x0F] + HEX_CHARS[(h4 >> 24) & 0x0F] +
HEX_CHARS[(h4 >> 20) & 0x0F] + HEX_CHARS[(h4 >> 16) & 0x0F] +
HEX_CHARS[(h4 >> 12) & 0x0F] + HEX_CHARS[(h4 >> 8) & 0x0F] +
HEX_CHARS[(h4 >> 4) & 0x0F] + HEX_CHARS[h4 & 0x0F] +
HEX_CHARS[(h5 >> 28) & 0x0F] + HEX_CHARS[(h5 >> 24) & 0x0F] +
HEX_CHARS[(h5 >> 20) & 0x0F] + HEX_CHARS[(h5 >> 16) & 0x0F] +
HEX_CHARS[(h5 >> 12) & 0x0F] + HEX_CHARS[(h5 >> 8) & 0x0F] +
HEX_CHARS[(h5 >> 4) & 0x0F] + HEX_CHARS[h5 & 0x0F] +
HEX_CHARS[(h6 >> 28) & 0x0F] + HEX_CHARS[(h6 >> 24) & 0x0F] +
HEX_CHARS[(h6 >> 20) & 0x0F] + HEX_CHARS[(h6 >> 16) & 0x0F] +
HEX_CHARS[(h6 >> 12) & 0x0F] + HEX_CHARS[(h6 >> 8) & 0x0F] +
HEX_CHARS[(h6 >> 4) & 0x0F] + HEX_CHARS[h6 & 0x0F];
if(is256) { if(is256) {
hex += toHexString(h7); hex += HEX_CHARS[(h7 >> 28) & 0x0F] + HEX_CHARS[(h7 >> 24) & 0x0F] +
} HEX_CHARS[(h7 >> 20) & 0x0F] + HEX_CHARS[(h7 >> 16) & 0x0F] +
return hex; HEX_CHARS[(h7 >> 12) & 0x0F] + HEX_CHARS[(h7 >> 8) & 0x0F] +
}; HEX_CHARS[(h7 >> 4) & 0x0F] + HEX_CHARS[h7 & 0x0F];
var toHexString = function(num) {
var hex = '';
for(var i = 0; i < 4; i++) {
var offset = 3 - i << 3;
hex += HEX_CHARS[(num >> (offset + 4)) & 0x0F] + HEX_CHARS[(num >> offset) & 0x0F];
} }
return hex; return hex;
}; };
@@ -196,9 +227,9 @@
} }
for(i = 0;i < length;++i) { for(i = 0;i < length;++i) {
blocks = chunks[i >> 6]; blocks = chunks[i >> 6];
blocks[(i & 63) >> 2] |= message.charCodeAt(i) << (3 - (i & 3) << 3); blocks[(i & 63) >> 2] |= message.charCodeAt(i) << SHIFT[i & 3];
} }
blocks[(i & 63) >> 2] |= 0x80 << (3 - (i & 3) << 3); blocks[(i & 63) >> 2] |= 0x80 << SHIFT[i & 3];
blocks[15] = length << 3; // length * 8 blocks[15] = length << 3; // length * 8
return chunks; return chunks;
}; };
@@ -214,14 +245,14 @@
} }
for(i = 0;i < length;++i) { for(i = 0;i < length;++i) {
blocks = chunks[i >> 6]; blocks = chunks[i >> 6];
blocks[(i & 63) >> 2] |= bytes[i] << (3 - (i & 3) << 3); blocks[(i & 63) >> 2] |= bytes[i] << SHIFT[i & 3];
} }
blocks[(i & 63) >> 2] |= 0x80 << (3 - (i & 3) << 3); blocks[(i & 63) >> 2] |= 0x80 << SHIFT[i & 3];
blocks[15] = length << 3; // length * 8 blocks[15] = length << 3; // length * 8
return chunks; return chunks;
}; };
if(typeof(module) != 'undefined') { if(!root.JS_SHA256_TEST && NODE_JS) {
sha256.sha256 = sha256; sha256.sha256 = sha256;
sha256.sha224 = sha224; sha256.sha224 = sha224;
module.exports = sha256; module.exports = sha256;
tests/node-test.js
+10
View File
@@ -2,3 +2,13 @@ sha256 = require('../src/sha256.js').sha256;
sha224 = require('../src/sha256.js').sha224; sha224 = require('../src/sha256.js').sha224;
expect = require('expect.js'); expect = require('expect.js');
require('./test.js'); require('./test.js');
delete require.cache[require.resolve('../src/sha256.js')]
delete require.cache[require.resolve('./test.js')]
sha256 = null;
sha224 = null;
JS_SHA256_TEST = true;
testName = 'without ArrayBuffer';
require('../src/sha256.js');
require('./test.js');
tests/test.js
+2
View File
@@ -20,6 +20,7 @@ describe('sha256', function() {
it('should be successful', function() { it('should be successful', function() {
expect(sha256('中文')).to.be('72726d8818f693066ceb69afa364218b692e62ea92b385782363780f47529c21'); expect(sha256('中文')).to.be('72726d8818f693066ceb69afa364218b692e62ea92b385782363780f47529c21');
expect(sha256('aécio')).to.be('53196d1acfce0c4b264e01e8018c989d571351f59e33f055f76ff15b4f0516c6'); expect(sha256('aécio')).to.be('53196d1acfce0c4b264e01e8018c989d571351f59e33f055f76ff15b4f0516c6');
expect(sha256('𠜎')).to.be('8d10a48685dbc34484696de7ea7434d80a54c1d60100530faccf697463ef19c9');
}); });
}); });
@@ -53,6 +54,7 @@ describe('sha224', function() {
it('should be successful', function() { it('should be successful', function() {
expect(sha224('中文')).to.be('dfbab71afdf54388af4d55f8bd3de8c9b15e0eb916bf9125f4a959d4'); expect(sha224('中文')).to.be('dfbab71afdf54388af4d55f8bd3de8c9b15e0eb916bf9125f4a959d4');
expect(sha224('aécio')).to.be('d12841cafd89c534924a839e62bf35a2b5f3717b7802eb19bd8d8e15'); expect(sha224('aécio')).to.be('d12841cafd89c534924a839e62bf35a2b5f3717b7802eb19bd8d8e15');
expect(sha224('𠜎')).to.be('eaa0129b5509f5701db218fb7076b282e4409da52d06363aa3bdd63d');
}); });
}); });