From 730f41e84b76d3525b5a9b505cea549ab0c2a287 Mon Sep 17 00:00:00 2001 From: "Chen, Yi-Cyuan" Date: Mon, 23 Jan 2017 11:08:27 +0800 Subject: [PATCH] 1. Added AMD support. 2. Fixed ArrayBuffer dosen't work in Webpack. --- .covignore | 2 +- .gitignore | 4 +- CHANGELOG.md | 121 ++++++++++++++++++++++++-------------------- LICENSE.txt | 2 +- README.md | 4 -- bower.json | 2 +- build/sha256.min.js | 13 ++--- package.json | 11 ++-- src/sha256.js | 40 +++++++++------ tests/node-test.js | 38 +++++++++++++- 10 files changed, 143 insertions(+), 94 deletions(-) diff --git a/.covignore b/.covignore index 8c36f6f..c5e2446 100644 --- a/.covignore +++ b/.covignore @@ -1,2 +1,2 @@ +/node_modules/ /tests/ -node_modules/ diff --git a/.gitignore b/.gitignore index 2187be0..856f74c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -node_modules/ -covreporter +/node_modules/ +/covreporter/ diff --git a/CHANGELOG.md b/CHANGELOG.md index a3b9aef..49e8168 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,54 +1,67 @@ -# v0.3.2 / 2016-09-12 - -* Added CommonJS detection. - -# v0.3.1 / 2016-09-08 - -* Added some files to npm package. -* Updated coding style. - -# v0.3.0 / 2015-05-23 - -* Support ArrayBuffer input. - -# v0.2.3 / 2015-02-11 - -* Support byte array input. - -# v0.2.2 / 2015-02-10 - -* Improve performance. - -# v0.2.1 / 2015-02-05 - -* Fixed special length bug. -* Add test cases. - -# v0.2.0 / 2015-02-03 - -* Remove ascii parameter. -* Improve performance. -* Add test cases. - -# v0.1.4 / 2015-01-24 - -* Improve performance. - -# v0.1.3 / 2015-01-09 - -* Improve performance. - -# v0.1.2 / 2015-01-06 - -* Add bower package. -* Fixed JSHint warnings. -* Add travis. -* Add coveralls. - -# v0.1.1 / 2014-07-27 - -* Fixed accents bug - -# v0.1.0 / 2014-01-05 - -* Initial release +# Change Log + +## v0.4.0 / 2017-01-23 +### Added +- AMD support. +### Fixed +- ArrayBuffer dosen't work in Webpack. + +## v0.3.2 / 2016-09-12 +### Added +- CommonJS detection. + +## v0.3.1 / 2016-09-08 +### Added +- some files to npm package. +### Fixed +- coding style. + +## v0.3.0 / 2015-05-23 +### Added +- support for ArrayBuffer input. + +## v0.2.3 / 2015-02-11 +### Added +- support for byte array input. + +## v0.2.2 / 2015-02-10 +### Improved +- performance. + +## v0.2.1 / 2015-02-05 +### Fixed +- special length bug. +### Added +- test cases. + +## v0.2.0 / 2015-02-03 +### Removed +- ascii parameter. +### Improved +- performance. +### Added +- test cases. + +## v0.1.4 / 2015-01-24 +### Improved +- performance. + +## v0.1.3 / 2015-01-09 +### Improved +- performance. + +## v0.1.2 / 2015-01-06 +### Added +- bower package. +- travis. +- coveralls. +### Fixed +- JSHint warnings. + +## v0.1.1 / 2014-07-27 +### Fixed +- accents bug. + +## v0.1.0 / 2014-01-05 +### Added +- initial release. diff --git a/LICENSE.txt b/LICENSE.txt index 95cc191..04498cc 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2014-2016 Chen, Yi-Cyuan +Copyright (c) 2014-2017 Chen, Yi-Cyuan MIT License diff --git a/README.md b/README.md index 32130da..24119fa 100644 --- a/README.md +++ b/README.md @@ -81,10 +81,6 @@ Output e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 182889f925ae4e5cc37118ded6ed87f7bdc7cab5ec5e78faef2e50048999473f -## Benchmark -[UTF8](http://jsperf.com/sha256/66) -[ASCII](http://jsperf.com/sha256/65) - ## License The project is released under the [MIT license](http://www.opensource.org/licenses/MIT). diff --git a/bower.json b/bower.json index bc2c8e7..ee0c43a 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "js-sha256", - "version": "0.3.2", + "version": "0.4.0", "main": ["src/sha256.js"], "ignore": [ "samples", diff --git a/build/sha256.min.js b/build/sha256.min.js index c7b78b5..4163e8b 100644 --- a/build/sha256.min.js +++ b/build/sha256.min.js @@ -1,16 +1,9 @@ /** * [js-sha256]{@link https://github.com/emn178/js-sha256} * - * @version 0.3.2 + * @version 0.4.0 * @author Chen, Yi-Cyuan [emn178@gmail.com] - * @copyright Chen, Yi-Cyuan 2014-2016 + * @copyright Chen, Yi-Cyuan 2014-2017 * @license MIT */ -(function(I){"object"==typeof process&&process.versions&&process.versions.node&&(I=global);var a="0123456789abcdef".split(""),Q=[-2147483648,8388608,32768,128],C=[24,16,8,0],L=[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(D,A){var K="string"!=typeof D;K&&D.constructor==I.ArrayBuffer&&(D=new Uint8Array(D));var m, -n,p,q,r,t,u,v,e,J=!0,O=!1,b,B=0,M=0,P=0,N=D.length,h,d,E,F,G,H;A?(m=3238371032,n=914150663,p=812702999,q=4144912697,r=4290775857,t=1750603025,u=1694076839,v=3204075428):(m=1779033703,n=3144134277,p=1013904242,q=2773480762,r=1359893119,t=2600822924,u=528734635,v=1541459225);e=0;do{c[0]=e;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;if(K)for(b=M;Bb;++B)c[b>>2]|=D[B]<b;++B)e=D.charCodeAt(B),128>e?c[b>>2]|=e< -e?c[b>>2]|=(192|e>>6)<e||57344<=e?c[b>>2]|=(224|e>>12)<>2]|=(240|e>>18)<>2]|=(128|e>>12&63)<>2]|=(128|e>>6&63)<>2]|=(128|e&63)<>2]|=Q[b&3],++B);e=c[16];B>N&&56>b&&(c[15]=P<<3,O=!0);var w=m,k=n,l=p,f=q,x=r,y=t,z=u,g=v;for(b=16;64>b;++b)d=c[b-15],h=(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]+ -h+c[b-7]+d<<0;H=k&l;for(b=0;64>b;b+=4)J?(A?(G=300032,d=c[0]-1413257819,g=d-150054599<<0,f=d+24177077<<0):(G=704751109,d=c[0]-210244248,g=d-1521486534<<0,f=d+143694565<<0),J=!1):(h=(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),G=w&k,E=G^w&l^H,F=x&y^~x&z,d=g+d+F+L[b]+c[b],h+=E,g=f+d<<0,f=d+h<<0),h=(f>>>2|f<<30)^(f>>>13|f<<19)^(f>>>22|f<<10),d=(g>>>6|g<<26)^(g>>>11|g<<21)^(g>>>25|g<<7),H=f&w,E=H^f&k^G,F=g&x^~g&y,d=z+d+F+L[b+1]+c[b+1],h+=E,z=l+d<<0,l=d+h<<0, -h=(l>>>2|l<<30)^(l>>>13|l<<19)^(l>>>22|l<<10),d=(z>>>6|z<<26)^(z>>>11|z<<21)^(z>>>25|z<<7),G=l&f,E=G^l&w^H,F=z&g^~z&x,d=y+d+F+L[b+2]+c[b+2],h+=E,y=k+d<<0,k=d+h<<0,h=(k>>>2|k<<30)^(k>>>13|k<<19)^(k>>>22|k<<10),d=(y>>>6|y<<26)^(y>>>11|y<<21)^(y>>>25|y<<7),H=k&l,E=H^k&f^G,F=y&z^~y&g,d=x+d+F+L[b+3]+c[b+3],h+=E,x=w+d<<0,w=d+h<<0;m=m+w<<0;n=n+k<<0;p=p+l<<0;q=q+f<<0;r=r+x<<0;t=t+y<<0;u=u+z<<0;v=v+g<<0}while(!O);K=a[m>>28&15]+a[m>>24&15]+a[m>>20&15]+a[m>>16&15]+a[m>>12&15]+a[m>>8&15]+a[m>>4&15]+a[m&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];A||(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};!I.JS_SHA256_TEST&&"object"==typeof module&&module.exports?(A.sha256=A,A.sha224=J,module.exports=A):I&&(I.sha256=A,I.sha224=J)})(this); +!function(){"use strict";var e="object"==typeof window?window:{},o=!e.JS_SHA256_NO_NODE_JS&&"object"==typeof process&&process.versions&&process.versions.node;o&&(e=global);var r=!e.JS_SHA256_NO_COMMON_JS&&"object"==typeof module&&module.exports,t="function"==typeof define&&define.amd,n="0123456789abcdef".split(""),s=[-2147483648,8388608,32768,128],f=[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],a=[],c=function(e){return d(e,!0)},d=function(o,r){var t="string"!=typeof o;t&&o.constructor==e.ArrayBuffer&&(o=new Uint8Array(o));var c,d,u,p,l,h,v,_,y,w,A,S,b,O,m,J,N,g,j,C,x,H,M=!0,B=!1,D=0,E=0,U=0,k=o.length;r?(c=3238371032,d=914150663,u=812702999,p=4144912697,l=4290775857,h=1750603025,v=1694076839,_=3204075428):(c=1779033703,d=3144134277,u=1013904242,p=2773480762,l=1359893119,h=2600822924,v=528734635,_=1541459225),y=0;do{if(a[0]=y,a[16]=a[1]=a[2]=a[3]=a[4]=a[5]=a[6]=a[7]=a[8]=a[9]=a[10]=a[11]=a[12]=a[13]=a[14]=a[15]=0,t)for(A=E;k>D&&64>A;++D)a[A>>2]|=o[D]<D&&64>A;++D)w=o.charCodeAt(D),128>w?a[A>>2]|=w<w?(a[A>>2]|=(192|w>>6)<>2]|=(128|63&w)<w||w>=57344?(a[A>>2]|=(224|w>>12)<>2]|=(128|w>>6&63)<>2]|=(128|63&w)<>2]|=(240|w>>18)<>2]|=(128|w>>12&63)<>2]|=(128|w>>6&63)<>2]|=(128|63&w)<>2]|=s[3&A],++D),y=a[16],D>k&&56>A&&(a[15]=U<<3,B=!0);var q=c,z=d,F=u,G=p,I=l,K=h,L=v,P=_;for(S=16;64>S;++S)J=a[S-15],b=(J>>>7|J<<25)^(J>>>18|J<<14)^J>>>3,J=a[S-2],O=(J>>>17|J<<15)^(J>>>19|J<<13)^J>>>10,a[S]=a[S-16]+b+a[S-7]+O<<0;for(H=z&F,S=0;64>S;S+=4)M?(r?(j=300032,J=a[0]-1413257819,P=J-150054599<<0,G=J+24177077<<0):(j=704751109,J=a[0]-210244248,P=J-1521486534<<0,G=J+143694565<<0),M=!1):(b=(q>>>2|q<<30)^(q>>>13|q<<19)^(q>>>22|q<<10),O=(I>>>6|I<<26)^(I>>>11|I<<21)^(I>>>25|I<<7),j=q&z,m=j^q&F^H,g=I&K^~I&L,J=P+O+g+i[S]+a[S],N=b+m,P=G+J<<0,G=J+N<<0),b=(G>>>2|G<<30)^(G>>>13|G<<19)^(G>>>22|G<<10),O=(P>>>6|P<<26)^(P>>>11|P<<21)^(P>>>25|P<<7),C=G&q,m=C^G&z^j,g=P&I^~P&K,J=L+O+g+i[S+1]+a[S+1],N=b+m,L=F+J<<0,F=J+N<<0,b=(F>>>2|F<<30)^(F>>>13|F<<19)^(F>>>22|F<<10),O=(L>>>6|L<<26)^(L>>>11|L<<21)^(L>>>25|L<<7),x=F&G,m=x^F&q^C,g=L&P^~L&I,J=K+O+g+i[S+2]+a[S+2],N=b+m,K=z+J<<0,z=J+N<<0,b=(z>>>2|z<<30)^(z>>>13|z<<19)^(z>>>22|z<<10),O=(K>>>6|K<<26)^(K>>>11|K<<21)^(K>>>25|K<<7),H=z&F,m=H^z&G^x,g=K&L^~K&P,J=I+O+g+i[S+3]+a[S+3],N=b+m,I=q+J<<0,q=J+N<<0;c=c+q<<0,d=d+z<<0,u=u+F<<0,p=p+G<<0,l=l+I<<0,h=h+K<<0,v=v+L<<0,_=_+P<<0}while(!B);var Q=n[c>>28&15]+n[c>>24&15]+n[c>>20&15]+n[c>>16&15]+n[c>>12&15]+n[c>>8&15]+n[c>>4&15]+n[15&c]+n[d>>28&15]+n[d>>24&15]+n[d>>20&15]+n[d>>16&15]+n[d>>12&15]+n[d>>8&15]+n[d>>4&15]+n[15&d]+n[u>>28&15]+n[u>>24&15]+n[u>>20&15]+n[u>>16&15]+n[u>>12&15]+n[u>>8&15]+n[u>>4&15]+n[15&u]+n[p>>28&15]+n[p>>24&15]+n[p>>20&15]+n[p>>16&15]+n[p>>12&15]+n[p>>8&15]+n[p>>4&15]+n[15&p]+n[l>>28&15]+n[l>>24&15]+n[l>>20&15]+n[l>>16&15]+n[l>>12&15]+n[l>>8&15]+n[l>>4&15]+n[15&l]+n[h>>28&15]+n[h>>24&15]+n[h>>20&15]+n[h>>16&15]+n[h>>12&15]+n[h>>8&15]+n[h>>4&15]+n[15&h]+n[v>>28&15]+n[v>>24&15]+n[v>>20&15]+n[v>>16&15]+n[v>>12&15]+n[v>>8&15]+n[v>>4&15]+n[15&v];return r||(Q+=n[_>>28&15]+n[_>>24&15]+n[_>>20&15]+n[_>>16&15]+n[_>>12&15]+n[_>>8&15]+n[_>>4&15]+n[15&_]),Q},u=d;u.sha256=d,u.sha224=c,r?module.exports=u:(e.sha256=d,e.sha224=c,t&&define(function(){return u}))}(); \ No newline at end of file diff --git a/package.json b/package.json index a22adeb..b25550b 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,19 @@ { "name": "js-sha256", - "version": "0.3.2", + "version": "0.4.0", "description": "A simple SHA-256 / SHA-224 hash function for JavaScript supports UTF-8 encoding.", "main": "src/sha256.js", "devDependencies": { - "mocha": "~2.3.4", "expect.js": "~0.3.1", - "jscoverage": "~0.5.9" + "jscoverage": "~0.5.9", + "mocha": "~2.3.4", + "uglifyjs": "~2.4.10" }, "scripts": { "test": "mocha tests/node-test.js -r jscoverage", - "coveralls": "mocha tests/node-test.js -R mocha-lcov-reporter -r jscoverage | coveralls" + "report": "mocha tests/node-test.js -r jscoverage --covout=html", + "coveralls": "mocha tests/node-test.js -R mocha-lcov-reporter -r jscoverage | coveralls", + "build": "uglifyjs src/sha256.js --compress --mangle --comments --output build/sha256.min.js" }, "repository": { "type": "git", diff --git a/src/sha256.js b/src/sha256.js index 5794fea..6d0ac14 100644 --- a/src/sha256.js +++ b/src/sha256.js @@ -1,19 +1,22 @@ /** * [js-sha256]{@link https://github.com/emn178/js-sha256} * - * @version 0.3.2 + * @version 0.4.0 * @author Chen, Yi-Cyuan [emn178@gmail.com] - * @copyright Chen, Yi-Cyuan 2014-2016 + * @copyright Chen, Yi-Cyuan 2014-2017 * @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_SHA256_NO_NODE_JS && typeof process == 'object' && process.versions && process.versions.node; if (NODE_JS) { root = global; } - var COMMON_JS = !root.JS_SHA256_TEST && typeof module == 'object' && module.exports; + var COMMON_JS = !root.JS_SHA256_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]; @@ -69,11 +72,11 @@ blocks[8] = blocks[9] = blocks[10] = blocks[11] = blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0; if (notString) { - for (i = start;index < length && i < 64;++index) { + for (i = start; index < length && i < 64; ++index) { blocks[i >> 2] |= message[index] << SHIFT[i++ & 3]; } } else { - for (i = start;index < length && i < 64;++index) { + for (i = start; index < length && i < 64; ++index) { code = message.charCodeAt(index); if (code < 0x80) { blocks[i >> 2] |= code << SHIFT[i++ & 3]; @@ -106,7 +109,7 @@ } var 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) { // rightrotate t1 = blocks[j - 15]; s0 = ((t1 >>> 7) | (t1 << 25)) ^ ((t1 >>> 18) | (t1 << 14)) ^ (t1 >>> 3); @@ -116,7 +119,7 @@ } bc = b & c; - for (j = 0;j < 64;j += 4) { + for (j = 0; j < 64; j += 4) { if (first) { if (is224) { ab = 300032; @@ -216,13 +219,20 @@ } return hex; }; - + + var exports = sha256; + exports.sha256 = sha256; + exports.sha224 = sha224; + if (COMMON_JS) { - sha256.sha256 = sha256; - sha256.sha224 = sha224; - module.exports = sha256; - } else if (root) { + module.exports = exports; + } else { root.sha256 = sha256; root.sha224 = sha224; + if (AMD) { + define(function () { + return exports; + }); + } } -}(this)); +})(); diff --git a/tests/node-test.js b/tests/node-test.js index 26082a9..2ee464a 100644 --- a/tests/node-test.js +++ b/tests/node-test.js @@ -1,6 +1,7 @@ +// Node.js env +expect = require('expect.js'); sha256 = require('../src/sha256.js').sha256; sha224 = require('../src/sha256.js').sha224; -expect = require('expect.js'); require('./test.js'); delete require.cache[require.resolve('../src/sha256.js')] @@ -8,6 +9,39 @@ delete require.cache[require.resolve('./test.js')] sha256 = null; sha224 = null; -JS_SHA256_TEST = true; +// Webpack browser env +JS_SHA256_NO_NODE_JS = true; +window = global; +sha256 = require('../src/sha256.js').sha256; +sha224 = require('../src/sha256.js').sha224; +require('./test.js'); + +delete require.cache[require.resolve('../src/sha256.js')] +delete require.cache[require.resolve('./test.js')] +sha256 = null; +sha224 = null; + +// browser env +JS_SHA256_NO_NODE_JS = true; +JS_SHA256_NO_COMMON_JS = true; +window = global; require('../src/sha256.js'); require('./test.js'); + +delete require.cache[require.resolve('../src/sha256.js')] +delete require.cache[require.resolve('./test.js')] +sha256 = null; +sha224 = null; + +// browser AMD +JS_SHA256_NO_NODE_JS = true; +JS_SHA256_NO_COMMON_JS = true; +window = global; +define = function (func) { + sha256 = func(); + sha224 = sha256.sha224; + require('./test.js'); +}; +define.amd = true; + +require('../src/sha256.js');