Comparing version 0.1.3 to 0.1.4
{ | ||
"name": "js-sha256", | ||
"version": "0.1.3", | ||
"version": "0.1.4", | ||
"main": ["build/sha256.min.js"], | ||
@@ -5,0 +5,0 @@ "ignore": [ |
@@ -0,1 +1,5 @@ | ||
# v0.1.4 / 2015-01-24 | ||
* Improve performance. | ||
# v0.1.3 / 2015-01-09 | ||
@@ -2,0 +6,0 @@ |
{ | ||
"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.", | ||
@@ -5,0 +5,0 @@ "main": "src/sha256.js", |
# 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) | ||
@@ -98,4 +98,4 @@ [![NPM](https://nodei.co/npm/js-sha256.png?stars&downloads)](https://nodei.co/npm/js-sha256/) | ||
## Benchmark | ||
[ASCII](http://jsperf.com/sha256-ascii/) | ||
[UTF8](http://jsperf.com/sha256-utf8/) | ||
[UTF8](http://jsperf.com/sha256/64) | ||
[ASCII](http://jsperf.com/sha256-ascii/) | ||
@@ -102,0 +102,0 @@ ## Extensions |
/* | ||
* js-sha256 v0.1.3 | ||
* js-sha256 v0.1.4 | ||
* https://github.com/emn178/js-sha256 | ||
@@ -13,3 +13,12 @@ * | ||
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 SHIFT = [24, 16, 8, 0]; | ||
@@ -34,6 +43,2 @@ var K =[0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, | ||
var sha2 = function(message, is256, asciiOnly) { | ||
if(is256 === undefined) { | ||
is256 = true; | ||
} | ||
var chunks, h0, h1, h2, h3, h4, h5, h6, h7; | ||
@@ -66,3 +71,3 @@ if(!asciiOnly && /[^\x00-\x7F]/.test(message)) { | ||
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; | ||
@@ -80,5 +85,6 @@ | ||
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) { | ||
@@ -93,8 +99,9 @@ tmp1 = (a >>> 2) | (a << 30); | ||
s1 = tmp1 ^ tmp2 ^ tmp3; | ||
maj = (a & b) ^ (a & c) ^ (b & c); | ||
ab = a & b; | ||
maj = ab ^ (a & c) ^ bc; | ||
ch = (e & f) ^ (~e & g); | ||
t1 = (h + s1 + ch + K[j + 0] + w[j + 0]) << 0; | ||
t2 = (s0 + maj) << 0; | ||
h = (d + t1) << 0; | ||
d = (t1 + t2) << 0; | ||
t1 = h + s1 + ch + K[j] + w[j] << 0; | ||
t2 = s0 + maj << 0; | ||
h = d + t1 << 0; | ||
d = t1 + t2 << 0; | ||
tmp1 = (d >>> 2) | (d << 30); | ||
@@ -108,8 +115,9 @@ tmp2 = (d >>> 13) | (d << 19); | ||
s1 = tmp1 ^ tmp2 ^ tmp3; | ||
maj = (d & a) ^ (d & b) ^ (a & b); | ||
da = d & a; | ||
maj = da ^ (d & b) ^ ab; | ||
ch = (h & e) ^ (~h & f); | ||
t1 = (g + s1 + ch + K[j + 1] + w[j + 1]) << 0; | ||
t2 = (s0 + maj) << 0; | ||
g = (c + t1) << 0; | ||
c = (t1 + t2) << 0; | ||
t1 = g + s1 + ch + K[j + 1] + w[j + 1] << 0; | ||
t2 = s0 + maj << 0; | ||
g = c + t1 << 0; | ||
c = t1 + t2 << 0; | ||
tmp1 = (c >>> 2) | (c << 30); | ||
@@ -123,8 +131,9 @@ tmp2 = (c >>> 13) | (c << 19); | ||
s1 = tmp1 ^ tmp2 ^ tmp3; | ||
maj = (c & d) ^ (c & a) ^ (d & a); | ||
cd = c & d; | ||
maj = cd ^ (c & a) ^ da; | ||
ch = (g & h) ^ (~g & e); | ||
t1 = (f + s1 + ch + K[j + 2] + w[j + 2]) << 0; | ||
t2 = (s0 + maj) << 0; | ||
f = (b + t1) << 0; | ||
b = (t1 + t2) << 0; | ||
t1 = f + s1 + ch + K[j + 2] + w[j + 2] << 0; | ||
t2 = s0 + maj << 0; | ||
f = b + t1 << 0; | ||
b = t1 + t2 << 0; | ||
tmp1 = (b >>> 2) | (b << 30); | ||
@@ -138,35 +147,57 @@ tmp2 = (b >>> 13) | (b << 19); | ||
s1 = tmp1 ^ tmp2 ^ tmp3; | ||
maj = (b & c) ^ (b & d) ^ (c & d); | ||
bc = b & c; | ||
maj = bc ^ (b & d) ^ cd; | ||
ch = (f & g) ^ (~f & h); | ||
t1 = (e + s1 + ch + K[j + 3] + w[j + 3]) << 0; | ||
t2 = (s0 + maj) << 0; | ||
e = (a + t1) << 0; | ||
a = (t1 + t2) << 0; | ||
t1 = e + s1 + ch + K[j + 3] + w[j + 3] << 0; | ||
t2 = s0 + maj << 0; | ||
e = a + t1 << 0; | ||
a = t1 + t2 << 0; | ||
} | ||
h0 = (h0 + a) << 0; | ||
h1 = (h1 + b) << 0; | ||
h2 = (h2 + c) << 0; | ||
h3 = (h3 + d) << 0; | ||
h4 = (h4 + e) << 0; | ||
h5 = (h5 + f) << 0; | ||
h6 = (h6 + g) << 0; | ||
h7 = (h7 + h) << 0; | ||
h0 = h0 + a << 0; | ||
h1 = h1 + b << 0; | ||
h2 = h2 + c << 0; | ||
h3 = h3 + d << 0; | ||
h4 = h4 + e << 0; | ||
h5 = h5 + f << 0; | ||
h6 = h6 + g << 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) { | ||
hex += toHexString(h7); | ||
hex += HEX_CHARS[(h7 >> 28) & 0x0F] + HEX_CHARS[(h7 >> 24) & 0x0F] + | ||
HEX_CHARS[(h7 >> 20) & 0x0F] + HEX_CHARS[(h7 >> 16) & 0x0F] + | ||
HEX_CHARS[(h7 >> 12) & 0x0F] + HEX_CHARS[(h7 >> 8) & 0x0F] + | ||
HEX_CHARS[(h7 >> 4) & 0x0F] + HEX_CHARS[h7 & 0x0F]; | ||
} | ||
return hex; | ||
}; | ||
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; | ||
}; | ||
@@ -207,5 +238,5 @@ var getBytesFromUtf8 = function(str) { | ||
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 | ||
@@ -226,5 +257,5 @@ return chunks; | ||
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 | ||
@@ -234,3 +265,3 @@ return chunks; | ||
if(typeof(module) != 'undefined') { | ||
if(!root.JS_SHA256_TEST && NODE_JS) { | ||
sha256.sha256 = sha256; | ||
@@ -237,0 +268,0 @@ sha256.sha224 = sha224; |
@@ -5,1 +5,11 @@ sha256 = require('../src/sha256.js').sha256; | ||
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'); |
@@ -23,2 +23,3 @@ describe('sha256', function() { | ||
expect(sha256('aécio')).to.be('53196d1acfce0c4b264e01e8018c989d571351f59e33f055f76ff15b4f0516c6'); | ||
expect(sha256('𠜎')).to.be('8d10a48685dbc34484696de7ea7434d80a54c1d60100530faccf697463ef19c9'); | ||
}); | ||
@@ -57,2 +58,3 @@ }); | ||
expect(sha224('aécio')).to.be('d12841cafd89c534924a839e62bf35a2b5f3717b7802eb19bd8d8e15'); | ||
expect(sha224('𠜎')).to.be('eaa0129b5509f5701db218fb7076b282e4409da52d06363aa3bdd63d'); | ||
}); | ||
@@ -59,0 +61,0 @@ }); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
24321
346