diff --git a/.travis.yml b/.travis.yml index 2f3d847..aabe614 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,11 @@ node_js: - "0.11" - "0.10" - "0.8" -install: +before_install: - npm install mocha -g - npm install coveralls -g - npm install mocha-lcov-reporter -g - - npm install -script: - - npm run-script coveralls +script: npm run-script coveralls branches: only: - master diff --git a/CHANGELOG.md b/CHANGELOG.md index 808c94a..2586213 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v0.2.0 / 2015-02-03 + +* Remove ascii parameter. +* Improve performance. +* Add test cases. + # v0.1.4 / 2015-01-24 * Improve performance. diff --git a/README.md b/README.md index 7362d92..cef6588 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 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://travis-ci.org/emn178/js-sha256.svg?branch=master)](https://travis-ci.org/emn178/js-sha256) +[![Coverage Status](https://coveralls.io/repos/emn178/js-sha256/badge.svg?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/) A simple SHA-256 / SHA-224 hash function for JavaScript supports UTF-8 encoding. @@ -37,41 +37,15 @@ sha256 = require('js-sha256').sha256; sha224 = require('js-sha256').sha224; ``` -### Methods - -#### sha256(str, asciiOnly) - -Hash string to sha256, set asciiOnly to true for better performace if you ensure input is ascii. - -##### *str: `String`* - -String to hash. - -##### *asciiOnly: `Boolean` (default: `false`)* - -Specify the string encoding is ASCII. - -#### sha224(str, asciiOnly) - -Hash string to sha224, set asciiOnly to true for better performace if you ensure input is ascii. - -##### *str: `String`* - -String to hash. - -##### *asciiOnly: `Boolean` (default: `false`)* - -Specify the string encoding is ASCII. - ## Example Code ```JavaScript sha256(''); -sha256('The quick brown fox jumps over the lazy dog', true); -sha256('The quick brown fox jumps over the lazy dog.', true); +sha256('The quick brown fox jumps over the lazy dog'); +sha256('The quick brown fox jumps over the lazy dog.'); sha224(''); -sha224('The quick brown fox jumps over the lazy dog', true); -sha224('The quick brown fox jumps over the lazy dog.', true); +sha224('The quick brown fox jumps over the lazy dog'); +sha224('The quick brown fox jumps over the lazy dog.'); ``` Output diff --git a/bower.json b/bower.json index 9e5a443..cb19aac 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "js-sha256", - "version": "0.1.4", + "version": "0.2.0", "main": ["build/sha256.min.js"], "ignore": [ "samples", diff --git a/build/sha256.min.js b/build/sha256.min.js index 1f0a123..849a9a9 100644 --- a/build/sha256.min.js +++ b/build/sha256.min.js @@ -1,7 +1,8 @@ -(function(E,J){var G="0123456789abcdef".split(""),F=[1116352408,1899447441,3049323471,3921009573,961987163,1508970993,2453635748,2870763221,3624381080,310598401,607225278,1426881987,1925078388,2162078206,2614888103,3248222580,3835390401,4022224774,264347078,604807628,770255983,1249150122,1555081692,1996064986,2554220882,2821834349,2952996808,3210313671,3336571891,3584528711,113926993,338241895,666307205,773529912,1294757372,1396182291,1695183700,1986661051,2177026350,2456956037,2730485921,2820302411, -3259730800,3345764771,3516065817,3600352804,4094571909,275423344,430227734,506948616,659060556,883997877,958139571,1322822218,1537002063,1747873779,1955562222,2024104815,2227730452,2361852424,2428436474,2756734187,3204031479,3329325298],z=function(e,x){return H(e,!0,x)},I=function(e,x){return H(e,!1,x)},H=function(e,x,f){x===J&&(x=!0);var k,g,l,a,B,C,D;if(!f&&/[^\x00-\x7F]/.test(e)){g=[];for(l=f=0;la?g[f++]=a:(2048>a?g[f++]=192|a>>6:(55296>a||57344<=a?g[f++]=224| -a>>12:(a=65536+((a&1023)<<10|e.charCodeAt(++l)&1023),g[f++]=240|a>>18,g[f++]=128|a>>12&63),g[f++]=128|a>>6&63),g[f++]=128|a&63);e=g.length;f=(e+8>>6)+1;l=[];for(a=0;a>6],k[(a&63)>>2]|=g[a]<<(3-(a&3)<<3);k[(a&63)>>2]|=128<<(3-(a&3)<<3);k[15]=e<<3}else{k=e.length;f=(k+8>>6)+1;l=[];for(a=0;a>6],g[(a&63)>>2]|=e.charCodeAt(a)<<(3-(a&3)<<3);g[(a&63)>>2]|=128<<(3-(a& -3)<<3);g[15]=k<<3}k=l;x?(g=1779033703,f=3144134277,l=1013904242,a=2773480762,B=1359893119,C=2600822924,D=528734635,e=1541459225):(g=3238371032,f=914150663,l=812702999,a=4144912697,B=4290775857,C=1750603025,D=1694076839,e=3204075428);for(var z=0,E=k.length;zh;++h)c=b=y[h-15],c=c>>>7|c<<25,b=b>>>18|b<<14,m=c^b^y[h-15]>>>3,c=b=y[h-2],c=c>>>17|c<<15,b=b>>>19|b<<13,b=c^b^y[h-2]>>>10,y[h]=y[h-16]+m+y[h-7]+b<<0;for(h=0;64>h;h+=4)c= -n>>>2|n<<30,b=n>>>13|n<<19,d=n>>>22|n<<10,m=c^b^d,c=t>>>6|t<<26,b=t>>>11|t<<21,d=t>>>25|t<<7,b=c^b^d,c=n&p^n&q^p&q,d=t&u^~t&v,b=w+b+d+F[h+0]+y[h+0]<<0,m=m+c<<0,w=r+b<<0,r=b+m<<0,c=r>>>2|r<<30,b=r>>>13|r<<19,d=r>>>22|r<<10,m=c^b^d,c=w>>>6|w<<26,b=w>>>11|w<<21,d=w>>>25|w<<7,b=c^b^d,c=r&n^r&p^n&p,d=w&t^~w&u,b=v+b+d+F[h+1]+y[h+1]<<0,m=m+c<<0,v=q+b<<0,q=b+m<<0,c=q>>>2|q<<30,b=q>>>13|q<<19,d=q>>>22|q<<10,m=c^b^d,c=v>>>6|v<<26,b=v>>>11|v<<21,d=v>>>25|v<<7,b=c^b^d,c=q&r^q&n^r&n,d=v&w^~v&t,b=u+b+d+F[h+2]+ -y[h+2]<<0,m=m+c<<0,u=p+b<<0,p=b+m<<0,c=p>>>2|p<<30,b=p>>>13|p<<19,d=p>>>22|p<<10,m=c^b^d,c=u>>>6|u<<26,b=u>>>11|u<<21,d=u>>>25|u<<7,b=c^b^d,c=p&q^p&r^q&r,d=u&v^~u&w,b=t+b+d+F[h+3]+y[h+3]<<0,m=m+c<<0,t=n+b<<0,n=b+m<<0;g=g+n<<0;f=f+p<<0;l=l+q<<0;a=a+r<<0;B=B+t<<0;C=C+u<<0;D=D+v<<0;e=e+w<<0}k=A(g)+A(f)+A(l)+A(a)+A(B)+A(C)+A(D);x&&(k+=A(e));return k},A=function(e){for(var x="",f=0;4>f;f++)var k=3-f<<3,x=x+(G[e>>k+4&15]+G[e>>k&15]);return x};"undefined"!=typeof module?(z.sha256=z,z.sha224=I,module.exports= -z):E&&(E.sha256=z,E.sha224=I)})(this); \ No newline at end of file +(function(B,P){var H="undefined"!=typeof module;H&&(B=global);var a="0123456789abcdef".split(""),O=[-2147483648,8388608,32768,128],D=[24,16,8,0],I=[1116352408,1899447441,3049323471,3921009573,961987163,1508970993,2453635748,2870763221,3624381080,310598401,607225278,1426881987,1925078388,2162078206,2614888103,3248222580,3835390401,4022224774,264347078,604807628,770255983,1249150122,1555081692,1996064986,2554220882,2821834349,2952996808,3210313671,3336571891,3584528711,113926993,338241895,666307205, +773529912,1294757372,1396182291,1695183700,1986661051,2177026350,2456956037,2730485921,2820302411,3259730800,3345764771,3516065817,3600352804,4094571909,275423344,430227734,506948616,659060556,883997877,958139571,1322822218,1537002063,1747873779,1955562222,2024104815,2227730452,2361852424,2428436474,2756734187,3204031479,3329325298],b=[],C=function(a){return M(a,!0)},N=function(a){return M(a,!1)},M=function(B,C){var k,n,p,q,r,t,u,v,e,H=!1,d,E=0,J=0,K=0,L=B.length,h,c,f,g,G,F;C?(k=1779033703,n=3144134277, +p=1013904242,q=2773480762,r=1359893119,t=2600822924,u=528734635,v=1541459225):(k=3238371032,n=914150663,p=812702999,q=4144912697,r=4290775857,t=1750603025,u=1694076839,v=3204075428);b[64]=0;do{b[0]=b[64];b[16]=b[1]=b[2]=b[3]=b[4]=b[5]=b[6]=b[7]=b[8]=b[9]=b[10]=b[11]=b[12]=b[13]=b[14]=b[15]=0;for(d=J;Ed;++E)e=B.charCodeAt(E),128>e?b[d>>2]|=e<e?b[d>>2]|=(192|e>>6)<e||57344<=e?b[d>>2]|=(224|e>>12)<>2]|= +(240|e>>18)<>2]|=(128|e>>12&63)<>2]|=(128|e>>6&63)<>2]|=(128|e&63)<>2]|=O[d&3],++E);E>L&&56>d&&(b[15]=K<<3,H=!0);d=k;var l=n,m=p,w=q,x=r,y=t,z=u,A=v;for(e=16;64>e;++e)f=c=b[e-15],f=f>>>7|f<<25,c=c>>>18|c<<14,h=f^c^b[e-15]>>>3,f=c=b[e-2],f=f>>>17|f<<15,c=c>>>19|c<<13,c=f^c^b[e-2]>>>10,b[e]=b[e-16]+h+b[e-7]+c<<0;F=l&m;for(e=0;64>e;e+=4)f=d>>>2|d<<30,c=d>>>13|d<<19,g=d>>>22|d<<10,h=f^c^g,f=x>>>6|x<<26,c=x>>>11| +x<<21,g=x>>>25|x<<7,c=f^c^g,G=d&l,f=G^d&m^F,g=x&y^~x&z,c=A+c+g+I[e]+b[e]<<0,h=h+f<<0,A=w+c<<0,w=c+h<<0,f=w>>>2|w<<30,c=w>>>13|w<<19,g=w>>>22|w<<10,h=f^c^g,f=A>>>6|A<<26,c=A>>>11|A<<21,g=A>>>25|A<<7,c=f^c^g,F=w&d,f=F^w&l^G,g=A&x^~A&y,c=z+c+g+I[e+1]+b[e+1]<<0,h=h+f<<0,z=m+c<<0,m=c+h<<0,f=m>>>2|m<<30,c=m>>>13|m<<19,g=m>>>22|m<<10,h=f^c^g,f=z>>>6|z<<26,c=z>>>11|z<<21,g=z>>>25|z<<7,c=f^c^g,G=m&w,f=G^m&d^F,g=z&A^~z&x,c=y+c+g+I[e+2]+b[e+2]<<0,h=h+f<<0,y=l+c<<0,l=c+h<<0,f=l>>>2|l<<30,c=l>>>13|l<<19,g=l>>> +22|l<<10,h=f^c^g,f=y>>>6|y<<26,c=y>>>11|y<<21,g=y>>>25|y<<7,c=f^c^g,F=l&m,f=F^l&w^G,g=y&z^~y&A,c=x+c+g+I[e+3]+b[e+3]<<0,h=h+f<<0,x=d+c<<0,d=c+h<<0;k=k+d<<0;n=n+l<<0;p=p+m<<0;q=q+w<<0;r=r+x<<0;t=t+y<<0;u=u+z<<0;v=v+A<<0}while(!H);k=a[k>>28&15]+a[k>>24&15]+a[k>>20&15]+a[k>>16&15]+a[k>>12&15]+a[k>>8&15]+a[k>>4&15]+a[k&15]+a[n>>28&15]+a[n>>24&15]+a[n>>20&15]+a[n>>16&15]+a[n>>12&15]+a[n>>8&15]+a[n>>4&15]+a[n&15]+a[p>>28&15]+a[p>>24&15]+a[p>>20&15]+a[p>>16&15]+a[p>>12&15]+a[p>>8&15]+a[p>>4&15]+a[p&15]+ +a[q>>28&15]+a[q>>24&15]+a[q>>20&15]+a[q>>16&15]+a[q>>12&15]+a[q>>8&15]+a[q>>4&15]+a[q&15]+a[r>>28&15]+a[r>>24&15]+a[r>>20&15]+a[r>>16&15]+a[r>>12&15]+a[r>>8&15]+a[r>>4&15]+a[r&15]+a[t>>28&15]+a[t>>24&15]+a[t>>20&15]+a[t>>16&15]+a[t>>12&15]+a[t>>8&15]+a[t>>4&15]+a[t&15]+a[u>>28&15]+a[u>>24&15]+a[u>>20&15]+a[u>>16&15]+a[u>>12&15]+a[u>>8&15]+a[u>>4&15]+a[u&15];C&&(k+=a[v>>28&15]+a[v>>24&15]+a[v>>20&15]+a[v>>16&15]+a[v>>12&15]+a[v>>8&15]+a[v>>4&15]+a[v&15]);return k};!B.JS_SHA256_TEST&&H?(C.sha256=C, +C.sha224=N,module.exports=C):B&&(B.sha256=C,B.sha224=N)})(this); \ No newline at end of file diff --git a/package.json b/package.json index d6d1ec0..9a36710 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "js-sha256", - "version": "0.1.4", + "version": "0.2.0", "description": "A simple SHA-256 / SHA-224 hash function for JavaScript supports UTF-8 encoding.", "main": "src/sha256.js", "devDependencies": { diff --git a/src/sha256.js b/src/sha256.js index b2e400b..28914f5 100644 --- a/src/sha256.js +++ b/src/sha256.js @@ -1,5 +1,5 @@ /* - * js-sha256 v0.1.4 + * js-sha256 v0.2.0 * https://github.com/emn178/js-sha256 * * Copyright 2014-2015, emn178@gmail.com @@ -13,14 +13,10 @@ 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 EXTRA = [-2147483648, 8388608, 32768, 128]; var SHIFT = [24, 16, 8, 0]; - var K =[0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, @@ -30,21 +26,21 @@ 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2]; - var sha256 = function(message, asciiOnly) { - return sha2(message, true, asciiOnly); + var blocks = []; + + var sha256 = function(message) { + return sha2(message, true); }; - var sha224 = function(message, asciiOnly) { - return sha2(message, false, asciiOnly); + var sha224 = function(message) { + return sha2(message, false); }; - var sha2 = function(message, is256, asciiOnly) { - var chunks, h0, h1, h2, h3, h4, h5, h6, h7; - if(!asciiOnly && /[^\x00-\x7F]/.test(message)) { - chunks = getChunksFromUtf8(message); - } else { - chunks = getChunksFromAscii(message); - } + var sha2 = function(message, is256) { + var h0, h1, h2, h3, h4, h5, h6, h7, code, end = false, + i, j, index = 0, start = 0, bytes = 0, length = message.length, + s0, s1, tmp1, tmp2, tmp3, maj, t1, t2, ch, ab, da, cd, bc; + if(is256) { h0 = 0x6a09e667; h1 = 0xbb67ae85; @@ -64,22 +60,56 @@ h6 = 0x64f98fa7; h7 = 0xbefa4fa4; } + blocks[64] = 0; + do { + blocks[0] = blocks[64]; + blocks[16] = blocks[1] = blocks[2] = blocks[3] = + blocks[4] = blocks[5] = blocks[6] = blocks[7] = + blocks[8] = blocks[9] = blocks[10] = blocks[11] = + blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0; + for (i = start;index < length && i < 64; ++index) { + code = message.charCodeAt(index); + if (code < 0x80) { + blocks[i >> 2] |= code << SHIFT[i++ & 3]; + } else if (code < 0x800) { + blocks[i >> 2] |= (0xc0 | (code >> 6)) << SHIFT[i++ & 3]; + blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3]; + } else if (code < 0xd800 || code >= 0xe000) { + blocks[i >> 2] |= (0xe0 | (code >> 12)) << SHIFT[i++ & 3]; + blocks[i >> 2] |= (0x80 | ((code >> 6) & 0x3f)) << SHIFT[i++ & 3]; + blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3]; + } else { + code = 0x10000 + (((code & 0x3ff) << 10) | (message.charCodeAt(++index) & 0x3ff)); + blocks[i >> 2] |= (0xf0 | (code >> 18)) << SHIFT[i++ & 3]; + blocks[i >> 2] |= (0x80 | ((code >> 12) & 0x3f)) << SHIFT[i++ & 3]; + blocks[i >> 2] |= (0x80 | ((code >> 6) & 0x3f)) << SHIFT[i++ & 3]; + blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3]; + } + } + blocks[64] = blocks[16]; + bytes += i - start; + start = i - 64; + if(index == length) { + blocks[i >> 2] |= EXTRA[i & 3]; + ++index; + } + if(index > length && i < 56) { + blocks[15] = bytes << 3; + end = true; + } - for(var i = 0, length = chunks.length;i < length;++i) { - 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; - + var a = h0, b = h1, c = h2, d = h3, e = h4, f = h5, g = h6, h = h7; for(j = 16;j < 64;++j) { // rightrotate - tmp1 = tmp2 = w[j - 15]; + tmp1 = tmp2 = blocks[j - 15]; tmp1 = (tmp1 >>> 7) | (tmp1 << 25); tmp2 = (tmp2 >>> 18) | (tmp2 << 14); - s0 = tmp1 ^ tmp2 ^ (w[j - 15] >>> 3); - tmp1 = tmp2 = w[j - 2]; + s0 = tmp1 ^ tmp2 ^ (blocks[j - 15] >>> 3); + tmp1 = tmp2 = blocks[j - 2]; tmp1 = (tmp1 >>> 17) | (tmp1 << 15); tmp2 = (tmp2 >>> 19) | (tmp2 << 13); - s1 = tmp1 ^ tmp2 ^ (w[j - 2] >>> 10); - w[j] = w[j - 16] + s0 + w[j - 7] + s1 << 0; + s1 = tmp1 ^ tmp2 ^ (blocks[j - 2] >>> 10); + blocks[j] = blocks[j - 16] + s0 + blocks[j - 7] + s1 << 0; } bc = b & c; @@ -95,7 +125,7 @@ ab = a & b; maj = ab ^ (a & c) ^ bc; ch = (e & f) ^ (~e & g); - t1 = h + s1 + ch + K[j] + w[j] << 0; + t1 = h + s1 + ch + K[j] + blocks[j] << 0; t2 = s0 + maj << 0; h = d + t1 << 0; d = t1 + t2 << 0; @@ -110,7 +140,7 @@ da = d & a; maj = da ^ (d & b) ^ ab; ch = (h & e) ^ (~h & f); - t1 = g + s1 + ch + K[j + 1] + w[j + 1] << 0; + t1 = g + s1 + ch + K[j + 1] + blocks[j + 1] << 0; t2 = s0 + maj << 0; g = c + t1 << 0; c = t1 + t2 << 0; @@ -125,7 +155,7 @@ cd = c & d; maj = cd ^ (c & a) ^ da; ch = (g & h) ^ (~g & e); - t1 = f + s1 + ch + K[j + 2] + w[j + 2] << 0; + t1 = f + s1 + ch + K[j + 2] + blocks[j + 2] << 0; t2 = s0 + maj << 0; f = b + t1 << 0; b = t1 + t2 << 0; @@ -140,7 +170,7 @@ bc = b & c; maj = bc ^ (b & d) ^ cd; ch = (f & g) ^ (~f & h); - t1 = e + s1 + ch + K[j + 3] + w[j + 3] << 0; + t1 = e + s1 + ch + K[j + 3] + blocks[j + 3] << 0; t2 = s0 + maj << 0; e = a + t1 << 0; a = t1 + t2 << 0; @@ -154,7 +184,7 @@ h5 = h5 + f << 0; h6 = h6 + g << 0; h7 = h7 + h << 0; - } + } while(!end); var hex = HEX_CHARS[(h0 >> 28) & 0x0F] + HEX_CHARS[(h0 >> 24) & 0x0F] + HEX_CHARS[(h0 >> 20) & 0x0F] + HEX_CHARS[(h0 >> 16) & 0x0F] + @@ -193,65 +223,6 @@ return hex; }; - var getBytesFromUtf8 = function(str) { - var bytes = [], index = 0; - for (var i = 0;i < str.length; i++) { - var c = str.charCodeAt(i); - if (c < 0x80) { - bytes[index++] = c; - } else if (c < 0x800) { - bytes[index++] = 0xc0 | (c >> 6); - bytes[index++] = 0x80 | (c & 0x3f); - } else if (c < 0xd800 || c >= 0xe000) { - bytes[index++] = 0xe0 | (c >> 12); - bytes[index++] = 0x80 | ((c >> 6) & 0x3f); - bytes[index++] = 0x80 | (c & 0x3f); - } else { - c = 0x10000 + (((c & 0x3ff) << 10) | (str.charCodeAt(++i) & 0x3ff)); - bytes[index++] = 0xf0 | (c >> 18); - bytes[index++] = 0x80 | ((c >> 12) & 0x3f); - bytes[index++] = 0x80 | ((c >> 6) & 0x3f); - bytes[index++] = 0x80 | (c & 0x3f); - } - } - return bytes; - }; - - var getChunksFromAscii = function(message) { - // a block is 32 bits(4 bytes), a chunk is 512 bits(64 bytes) - var length = message.length; - var chunkCount = ((length + 8) >> 6) + 1; - var chunks = [], blocks, i; - for(i = 0;i < chunkCount;++i) { - chunks[i] = blocks = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; - } - for(i = 0;i < length;++i) { - blocks = chunks[i >> 6]; - blocks[(i & 63) >> 2] |= message.charCodeAt(i) << SHIFT[i & 3]; - } - blocks[(i & 63) >> 2] |= 0x80 << SHIFT[i & 3]; - blocks[15] = length << 3; // length * 8 - return chunks; - }; - - var getChunksFromUtf8 = function(message) { - // a block is 32 bits(4 bytes), a chunk is 512 bits(64 bytes) - var bytes = getBytesFromUtf8(message); - var length = bytes.length; - var chunkCount = ((length + 8) >> 6) + 1; - var chunks = [], blocks, i; - for(i = 0;i < chunkCount;++i) { - chunks[i] = blocks = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; - } - for(i = 0;i < length;++i) { - blocks = chunks[i >> 6]; - blocks[(i & 63) >> 2] |= bytes[i] << SHIFT[i & 3]; - } - blocks[(i & 63) >> 2] |= 0x80 << SHIFT[i & 3]; - blocks[15] = length << 3; // length * 8 - return chunks; - }; - if(!root.JS_SHA256_TEST && NODE_JS) { sha256.sha256 = sha256; sha256.sha224 = sha224; diff --git a/tests/node-test.js b/tests/node-test.js index 76a85e1..26082a9 100644 --- a/tests/node-test.js +++ b/tests/node-test.js @@ -9,6 +9,5 @@ sha256 = null; sha224 = null; JS_SHA256_TEST = true; -testName = 'without ArrayBuffer'; require('../src/sha256.js'); require('./test.js'); diff --git a/tests/test.js b/tests/test.js index 505b7c1..46e5347 100644 --- a/tests/test.js +++ b/tests/test.js @@ -5,12 +5,16 @@ describe('sha256', function() { expect(sha256('')).to.be('e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'); expect(sha256('The quick brown fox jumps over the lazy dog')).to.be('d7a8fbb307d7809469ca9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592'); expect(sha256('The quick brown fox jumps over the lazy dog.')).to.be('ef537f25c895bfa782526529a9b63d97aa631564d5d789c2b765448c8635fb6c'); + expect(sha256('0123456780123456780123456780123456780123456780123456780')).to.be('5e6b963e2b6444dab8544beab8532850cef2a9d143872a6a5384abe37e61b3db'); + expect(sha256('01234567801234567801234567801234567801234567801234567801')).to.be('85d240a4a03a0710423fc4f701da51e8785c9eaa96d718ab1c7991d6afd60d62'); }); }); describe('more than 64 bytes', function() { it('should be successful', function() { expect(sha256('The MD5 message-digest algorithm is a widely used cryptographic hash function producing a 128-bit (16-byte) hash value, typically expressed in text format as a 32 digit hexadecimal number. MD5 has been utilized in a wide variety of cryptographic applications, and is also commonly used to verify data integrity.')).to.be('54e73d89e1924fdcd056390266a983924b6d6d461e9470b6cd50bbaf69b5c54c'); + expect(sha256('01234567801234567801234567801234567801234567801234567801234567801234567')).to.be('74b51c6911f9a8b5e7c499effe7604e43b672166818873c27752c248de434841'); + expect(sha256('012345678012345678012345678012345678012345678012345678012345678012345678')).to.be('6fba9e623ae6abf028a1b195748814aa95eebfb22e3ec5e15d2444cd6c48186a'); }); }); }); @@ -26,6 +30,7 @@ describe('sha256', function() { describe('more than 64 bytes', function() { it('should be successful', function() { + expect(sha256('訊息摘要演算法第五版（英語：Message-Digest Algorithm 5，縮寫為MD5），是當前電腦領域用於確保資訊傳輸完整一致而廣泛使用的雜湊演算法之一')).to.be('d691014feebf35b3500ef6f6738d0094cac63628a7a018a980a40292a77703d1'); expect(sha256('訊息摘要演算法第五版（英語：Message-Digest Algorithm 5，縮寫為MD5），是當前電腦領域用於確保資訊傳輸完整一致而廣泛使用的雜湊演算法之一（又譯雜湊演算法、摘要演算法等），主流程式語言普遍已有MD5的實作。')).to.be('81a1472ebdeb09406a783d607ff49ee2fde3e9f44ac1cd158ad8d6ad3c4e69fa'); }); }); @@ -39,12 +44,16 @@ describe('sha224', function() { expect(sha224('')).to.be('d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f'); expect(sha224('The quick brown fox jumps over the lazy dog')).to.be('730e109bd7a8a32b1cb9d9a09aa2325d2430587ddbc0c38bad911525'); expect(sha224('The quick brown fox jumps over the lazy dog.')).to.be('619cba8e8e05826e9b8c519c0a5c68f4fb653e8a3d8aa04bb2c8cd4c'); + expect(sha224('0123456780123456780123456780123456780123456780123456780')).to.be('bc4a354d66f3cff4bc6dd6a88fbb0435cede7fd5fe94da0760cb1924'); + expect(sha224('01234567801234567801234567801234567801234567801234567801')).to.be('2f148f757d1295784a7c69bf328b8bf827a536669e132234cd6f50e7'); }); }); describe('more than 64 bytes', function() { it('should be successful', function() { expect(sha224('The MD5 message-digest algorithm is a widely used cryptographic hash function producing a 128-bit (16-byte) hash value, typically expressed in text format as a 32 digit hexadecimal number. MD5 has been utilized in a wide variety of cryptographic applications, and is also commonly used to verify data integrity.')).to.be('4d97e15967391d2e846ea7d21bb480efadbae5868b731e7cc6267006'); + expect(sha224('01234567801234567801234567801234567801234567801234567801234567801234567')).to.be('16ee1b101fe0e0d8dd156d598931ec19d75b0f8dc0a0455733c168c8'); + expect(sha224('012345678012345678012345678012345678012345678012345678012345678012345678')).to.be('04c7a30079c640e440d884cdf0d7ab04fd05501d4498cb21be29ca1f'); }); }); }); @@ -60,6 +69,7 @@ describe('sha224', function() { describe('more than 64 bytes', function() { it('should be successful', function() { + expect(sha224('訊息摘要演算法第五版（英語：Message-Digest Algorithm 5，縮寫為MD5），是當前電腦領域用於確保資訊傳輸完整一致而廣泛使用的雜湊演算法之一')).to.be('0dda421f3f81272418e1313673e9d74b7f2d04efc9c52c69458e12c3'); expect(sha224('訊息摘要演算法第五版（英語：Message-Digest Algorithm 5，縮寫為MD5），是當前電腦領域用於確保資訊傳輸完整一致而廣泛使用的雜湊演算法之一（又譯雜湊演算法、摘要演算法等），主流程式語言普遍已有MD5的實作。')).to.be('a8cb74a54e6dc6ab6110db3915ba08ffe5e1abafaea78538fa12a626'); }); });