From 18457729c8a011da4a6e39e0426dfdf320e36fb7 Mon Sep 17 00:00:00 2001 From: emn178 Date: Tue, 10 Feb 2015 12:00:39 +0800 Subject: [PATCH] Improve performance. --- CHANGELOG.md | 4 +++ bower.json | 2 +- build/sha256.min.js | 16 ++++++------ package.json | 2 +- src/sha256.js | 62 +++++++++++++++++++++------------------------ 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 950d337..f9960c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v0.2.2 / 2015-02-10 + +* Improve performance. + # v0.2.1 / 2015-02-05 * Fixed special length bug. diff --git a/bower.json b/bower.json index fab985a..8d2a6d9 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "js-sha256", - "version": "0.2.1", + "version": "0.2.2", "main": ["build/sha256.min.js"], "ignore": [ "samples", diff --git a/build/sha256.min.js b/build/sha256.min.js index 73302c2..c19ce61 100644 --- a/build/sha256.min.js +++ b/build/sha256.min.js @@ -1,8 +1,8 @@ -(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);b[64]=b[16];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); +(function(B,P){var I="undefined"!=typeof module;I&&(B=global);var a="0123456789abcdef".split(""),O=[-2147483648,8388608,32768,128],F=[24,16,8,0],K=[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],c=[],J=function(a){return A(a,!0)},A=function(A,B){var f,n,p,q,r,t,u,v,g,I=!0,J=!1,b,G=0,L=0,M=0,N=A.length,e,d,C,D,E,H;B?(f=3238371032,n=914150663,p=812702999,q=4144912697, +r=4290775857,t=1750603025,u=1694076839,v=3204075428):(f=1779033703,n=3144134277,p=1013904242,q=2773480762,r=1359893119,t=2600822924,u=528734635,v=1541459225);g=0;do{c[0]=g;c[16]=c[1]=c[2]=c[3]=c[4]=c[5]=c[6]=c[7]=c[8]=c[9]=c[10]=c[11]=c[12]=c[13]=c[14]=c[15]=0;for(b=L;Gb;++G)g=A.charCodeAt(G),128>g?c[b>>2]|=g<g?c[b>>2]|=(192|g>>6)<g||57344<=g?c[b>>2]|=(224|g>>12)<>2]|=(240|g>>18)<>2]|= +(128|g>>12&63)<>2]|=(128|g>>6&63)<>2]|=(128|g&63)<>2]|=O[b&3],++G);g=c[16];G>N&&56>b&&(c[15]=M<<3,J=!0);var w=f,l=n,m=p,h=q,x=r,y=t,z=u,k=v;for(b=16;64>b;++b)d=c[b-15],e=(d>>>7|d<<25)^(d>>>18|d<<14)^d>>>3,d=c[b-2],d=(d>>>17|d<<15)^(d>>>19|d<<13)^d>>>10,c[b]=c[b-16]+e+c[b-7]+d<<0;H=l&m;for(b=0;64>b;b+=4)I?(B?(E=300032,d=c[0]-1413257819,k=d-150054599<<0,h=d+24177077<<0):(E=704751109,d=c[0]-210244248,k=d-1521486534<<0,h=d+143694565<<0), +I=!1):(e=(w>>>2|w<<30)^(w>>>13|w<<19)^(w>>>22|w<<10),d=(x>>>6|x<<26)^(x>>>11|x<<21)^(x>>>25|x<<7),E=w&l,C=E^w&m^H,D=x&y^~x&z,d=k+d+D+K[b]+c[b],e+=C,k=h+d<<0,h=d+e<<0),e=(h>>>2|h<<30)^(h>>>13|h<<19)^(h>>>22|h<<10),d=(k>>>6|k<<26)^(k>>>11|k<<21)^(k>>>25|k<<7),H=h&w,C=H^h&l^E,D=k&x^~k&y,d=z+d+D+K[b+1]+c[b+1],e+=C,z=m+d<<0,m=d+e<<0,e=(m>>>2|m<<30)^(m>>>13|m<<19)^(m>>>22|m<<10),d=(z>>>6|z<<26)^(z>>>11|z<<21)^(z>>>25|z<<7),E=m&h,C=E^m&w^H,D=z&k^~z&x,d=y+d+D+K[b+2]+c[b+2],e+=C,y=l+d<<0,l=d+e<<0,e=(l>>>2| +l<<30)^(l>>>13|l<<19)^(l>>>22|l<<10),d=(y>>>6|y<<26)^(y>>>11|y<<21)^(y>>>25|y<<7),H=l&m,C=H^l&h^E,D=y&z^~y&k,d=x+d+D+K[b+3]+c[b+3],e+=C,x=w+d<<0,w=d+e<<0;f=f+w<<0;n=n+l<<0;p=p+m<<0;q=q+h<<0;r=r+x<<0;t=t+y<<0;u=u+z<<0;v=v+k<<0}while(!J);f=a[f>>28&15]+a[f>>24&15]+a[f>>20&15]+a[f>>16&15]+a[f>>12&15]+a[f>>8&15]+a[f>>4&15]+a[f&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];B||(f+=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 f};!B.JS_SHA256_TEST&&I?(A.sha256= +A,A.sha224=J,module.exports=A):B&&(B.sha256=A,B.sha224=J)})(this); \ No newline at end of file diff --git a/package.json b/package.json index 05080a1..a9f58bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "js-sha256", - "version": "0.2.1", + "version": "0.2.2", "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 b1404d5..0e9d675 100644 --- a/src/sha256.js +++ b/src/sha256.js @@ -1,5 +1,5 @@ /* - * js-sha256 v0.2.1 + * js-sha256 v0.2.2 * https://github.com/emn178/js-sha256 * * Copyright 2014-2015, emn178@gmail.com @@ -28,29 +28,16 @@ var blocks = []; - var sha256 = function(message) { - return sha2(message, true); - }; - var sha224 = function(message) { - return sha2(message, false); + return sha256(message, true); }; - var sha2 = function(message, is256) { + var sha256 = function(message, is224) { var h0, h1, h2, h3, h4, h5, h6, h7, block, code, first = true, end = false, i, j, index = 0, start = 0, bytes = 0, length = message.length, s0, s1, maj, t1, t2, ch, ab, da, cd, bc; - if(is256) { - h0 = 0x6a09e667; - h1 = 0xbb67ae85; - h2 = 0x3c6ef372; - h3 = 0xa54ff53a; - h4 = 0x510e527f; - h5 = 0x9b05688c; - h6 = 0x1f83d9ab; - h7 = 0x5be0cd19; - } else { // 224 + if(is224) { h0 = 0xc1059ed8; h1 = 0x367cd507; h2 = 0x3070dd17; @@ -59,6 +46,15 @@ h5 = 0x68581511; h6 = 0x64f98fa7; h7 = 0xbefa4fa4; + } else { // 256 + h0 = 0x6a09e667; + h1 = 0xbb67ae85; + h2 = 0x3c6ef372; + h3 = 0xa54ff53a; + h4 = 0x510e527f; + h5 = 0x9b05688c; + h6 = 0x1f83d9ab; + h7 = 0x5be0cd19; } block = 0; do { @@ -111,16 +107,16 @@ bc = b & c; for(j = 0;j < 64;j += 4) { if(first) { - if(is256) { - ab = 704751109; - t1 = blocks[0] - 210244248 << 0; - h = t1 - 1521486534 << 0; - d = t1 + 143694565 << 0; - } else { + if(is224) { ab = 300032; - t1 = blocks[0] - 1413257819 << 0; + t1 = blocks[0] - 1413257819; h = t1 - 150054599 << 0; d = t1 + 24177077 << 0; + } else { + ab = 704751109; + t1 = blocks[0] - 210244248; + h = t1 - 1521486534 << 0; + d = t1 + 143694565 << 0; } first = false; } else { @@ -129,8 +125,8 @@ ab = a & b; maj = ab ^ (a & c) ^ bc; ch = (e & f) ^ (~e & g); - t1 = h + s1 + ch + K[j] + blocks[j] << 0; - t2 = s0 + maj << 0; + t1 = h + s1 + ch + K[j] + blocks[j]; + t2 = s0 + maj; h = d + t1 << 0; d = t1 + t2 << 0; } @@ -139,8 +135,8 @@ da = d & a; maj = da ^ (d & b) ^ ab; ch = (h & e) ^ (~h & f); - t1 = g + s1 + ch + K[j + 1] + blocks[j + 1] << 0; - t2 = s0 + maj << 0; + t1 = g + s1 + ch + K[j + 1] + blocks[j + 1]; + t2 = s0 + maj; g = c + t1 << 0; c = t1 + t2 << 0; s0 = ((c >>> 2) | (c << 30)) ^ ((c >>> 13) | (c << 19)) ^ ((c >>> 22) | (c << 10)); @@ -148,8 +144,8 @@ cd = c & d; maj = cd ^ (c & a) ^ da; ch = (g & h) ^ (~g & e); - t1 = f + s1 + ch + K[j + 2] + blocks[j + 2] << 0; - t2 = s0 + maj << 0; + t1 = f + s1 + ch + K[j + 2] + blocks[j + 2]; + t2 = s0 + maj; f = b + t1 << 0; b = t1 + t2 << 0; s0 = ((b >>> 2) | (b << 30)) ^ ((b >>> 13) | (b << 19)) ^ ((b >>> 22) | (b << 10)); @@ -157,8 +153,8 @@ bc = b & c; maj = bc ^ (b & d) ^ cd; ch = (f & g) ^ (~f & h); - t1 = e + s1 + ch + K[j + 3] + blocks[j + 3] << 0; - t2 = s0 + maj << 0; + t1 = e + s1 + ch + K[j + 3] + blocks[j + 3]; + t2 = s0 + maj; e = a + t1 << 0; a = t1 + t2 << 0; } @@ -201,7 +197,7 @@ 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(!is224) { 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] +