1. Added AMD support.

2. Fixed ArrayBuffer dosen't work in Webpack.
Merge pull request #5 from nolsherry/patch-1
2026-08-12 20:32:16 +08:00 · 2017-01-23 11:08:27 +08:00 · 2016-10-20 10:33:10 +08:00 · 2016-10-19 19:57:11 +08:00 · 2016-09-12 20:40:43 +08:00 · 2016-09-08 10:23:01 +08:00
13 changed files with 345 additions and 263 deletions
@@ -1 +1,2 @@
+/node_modules/
 /tests/
@@ -1,2 +1,2 @@
-node_modules/
-covreporter
+/node_modules/
+/covreporter/
@@ -0,0 +1 @@
+covreporter
@@ -1,12 +1,11 @@
 language: node_js
 node_js:
-  - "0.11"
-  - "0.10"
-  - "0.8"
+  - "0.12.15"
+  - "4.5"
+  - "6.5.0"
 before_install:
-  - npm install mocha -g
-  - npm install coveralls -g
-  - npm install mocha-lcov-reporter -g
+  - npm install coveralls
+  - npm install mocha-lcov-reporter
 script: npm run-script coveralls
 branches:
  only:
@@ -1,33 +1,67 @@
-# v0.2.1 / 2015-02-05
+# Change Log

-* Fixed special length bug.
-* Add test cases.
+## v0.4.0 / 2017-01-23
+### Added
+- AMD support.
+### Fixed
+- ArrayBuffer dosen't work in Webpack.

-# v0.2.0 / 2015-02-03
+## v0.3.2 / 2016-09-12
+### Added
+- CommonJS detection.

-* Remove ascii parameter.
-* Improve performance.
-* Add test cases.
+## v0.3.1 / 2016-09-08
+### Added
+- some files to npm package.
+### Fixed
+- coding style.

-# v0.1.4 / 2015-01-24
+## v0.3.0 / 2015-05-23
+### Added
+- support for ArrayBuffer input.

-* Improve performance.
+## v0.2.3 / 2015-02-11
+### Added
+- support for byte array input.

-# v0.1.3 / 2015-01-09
+## v0.2.2 / 2015-02-10
+### Improved
+- performance.

-* Improve performance.
+## v0.2.1 / 2015-02-05
+### Fixed
+- special length bug.
+### Added
+- test cases.

-# v0.1.2 / 2015-01-06
+## v0.2.0 / 2015-02-03
+### Removed
+- ascii parameter.
+### Improved
+- performance.
+### Added
+- test cases.

-* Add bower package.
-* Fixed JSHint warnings.
-* Add travis.
-* Add coveralls.
+## v0.1.4 / 2015-01-24
+### Improved
+- performance.

-# v0.1.1 / 2014-07-27
+## v0.1.3 / 2015-01-09
+### Improved
+- performance.

-* Fixed accents bug
+## v0.1.2 / 2015-01-06
+### Added
+- bower package.
+- travis.
+- coveralls.
+### Fixed
+- JSHint warnings.

-# v0.1.0 / 2014-01-05
+## v0.1.1 / 2014-07-27
+### Fixed
+- accents bug.

-* Initial release
+## v0.1.0 / 2014-01-05
+### Added
+- initial release.
@@ -1,4 +1,6 @@
-Copyright 2014-2015 emn178@gmail.com
+Copyright (c) 2014-2017 Chen, Yi-Cyuan
+
+MIT License

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -1,6 +1,7 @@
 # js-sha256
 [![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)
+[![CDNJS](https://img.shields.io/cdnjs/v/js-sha256.svg)](https://cdnjs.com/libraries/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.

@@ -68,44 +69,21 @@ Output
    72726d8818f693066ceb69afa364218b692e62ea92b385782363780f47529c21
    dfbab71afdf54388af4d55f8bd3de8c9b15e0eb916bf9125f4a959d4

-## Benchmark
-[UTF8](http://jsperf.com/sha256/66)  
-[ASCII](http://jsperf.com/sha256/65)
-
-## Extensions
-### jQuery
-If you prefer jQuery style, you can add following code to add a jQuery extension.
+It also supports byte `Array`, `Uint8Array`, `ArrayBuffer` input:

 Code
 ```JavaScript
-jQuery.sha256 = sha256
-jQuery.sha224 = sha224
+sha256([]);
+sha256(new Uint8Array([211, 212]));
 ```
-And then you could use like this:
-```JavaScript
-$.sha256('message');
-$.sha224('message');
-```
-### Prototype
-If you prefer prototype style, you can add following code to add a prototype extension.
+Output
+
+    e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+    182889f925ae4e5cc37118ded6ed87f7bdc7cab5ec5e78faef2e50048999473f

-Code
-```JavaScript
-String.prototype.sha256 = function() {
-  return sha256(this);
-};
-String.prototype.sha224 = function() {
-  return sha224(this);
-};
-```
-And then you could use like this:
-```JavaScript
-'message'.sha256();
-'message'.sha224();
-```
 ## License
 The project is released under the [MIT license](http://www.opensource.org/licenses/MIT).

 ## Contact
 The project's website is located at https://github.com/emn178/js-sha256  
-Author: emn178@gmail.com
+Author: Chen, Yi-Cyuan (emn178@gmail.com)
@@ -1,7 +1,7 @@
 {
  "name": "js-sha256",
-  "version": "0.2.1",
-  "main": ["build/sha256.min.js"],
+  "version": "0.4.0",
+  "main": ["src/sha256.js"],
  "ignore": [
    "samples",
    "tests"
@@ -1,8 +1,9 @@
-(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;E<L&&64>d;++E)e=B.charCodeAt(E),128>e?b[d>>2]|=e<<D[d++&3]:(2048>e?b[d>>2]|=(192|e>>6)<<D[d++&3]:(55296>e||57344<=e?b[d>>2]|=(224|e>>12)<<D[d++&3]:(e=65536+((e&1023)<<10|B.charCodeAt(++E)&1023),b[d>>2]|=
-(240|e>>18)<<D[d++&3],b[d>>2]|=(128|e>>12&63)<<D[d++&3]),b[d>>2]|=(128|e>>6&63)<<D[d++&3]),b[d>>2]|=(128|e&63)<<D[d++&3]);K+=d-J;J=d-64;E==L&&(b[d>>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);
+/**
+ * [js-sha256]{@link https://github.com/emn178/js-sha256}
+ *
+ * @version 0.4.0
+ * @author Chen, Yi-Cyuan [emn178@gmail.com]
+ * @copyright Chen, Yi-Cyuan 2014-2017
+ * @license MIT
+ */
+!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]<<f[3&A++];else for(A=E;k>D&&64>A;++D)w=o.charCodeAt(D),128>w?a[A>>2]|=w<<f[3&A++]:2048>w?(a[A>>2]|=(192|w>>6)<<f[3&A++],a[A>>2]|=(128|63&w)<<f[3&A++]):55296>w||w>=57344?(a[A>>2]|=(224|w>>12)<<f[3&A++],a[A>>2]|=(128|w>>6&63)<<f[3&A++],a[A>>2]|=(128|63&w)<<f[3&A++]):(w=65536+((1023&w)<<10|1023&o.charCodeAt(++D)),a[A>>2]|=(240|w>>18)<<f[3&A++],a[A>>2]|=(128|w>>12&63)<<f[3&A++],a[A>>2]|=(128|w>>6&63)<<f[3&A++],a[A>>2]|=(128|63&w)<<f[3&A++]);U+=A-E,E=A-64,D==k&&(a[A>>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}))}();
@@ -1,15 +1,19 @@
 {
  "name": "js-sha256",
-  "version": "0.2.1",
+  "version": "0.4.0",
  "description": "A simple SHA-256 / SHA-224 hash function for JavaScript supports UTF-8 encoding.",
  "main": "src/sha256.js",
  "devDependencies": {
    "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",
@@ -26,7 +30,7 @@
    "HMAC"
  ],
  "license": "MIT",
-  "author": "emn178 <emn178@gmail.com>",
+  "author": "Chen, Yi-Cyuan <emn178@gmail.com>",
  "homepage": "https://github.com/emn178/js-sha256",
  "bugs": {
    "url": "https://github.com/emn178/js-sha256/issues"
@@ -1,19 +1,22 @@
-/*
- * js-sha256 v0.2.1
- * https://github.com/emn178/js-sha256
+/**
+ * [js-sha256]{@link https://github.com/emn178/js-sha256}
 *
- * Copyright 2014-2015, emn178@gmail.com
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * @version 0.4.0
+ * @author Chen, Yi-Cyuan [emn178@gmail.com]
+ * @copyright Chen, Yi-Cyuan 2014-2017
+ * @license MIT
 */
-;(function(root, undefined) {
+/*jslint bitwise: true */
+(function () {
  'use strict';

-  var NODE_JS = typeof(module) != 'undefined';
+  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_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];
@@ -28,29 +31,21 @@

  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 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;
+  var sha256 = function (message, is224) {
+    var notString = typeof message != 'string';
+    if (notString && message.constructor == root.ArrayBuffer) {
+      message = new Uint8Array(message);
+    }

-    if(is256) {
-      h0 = 0x6a09e667;
-      h1 = 0xbb67ae85;
-      h2 = 0x3c6ef372;
-      h3 = 0xa54ff53a;
-      h4 = 0x510e527f;
-      h5 = 0x9b05688c;
-      h6 = 0x1f83d9ab;
-      h7 = 0x5be0cd19;
-    } else { // 224
+    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 (is224) {
      h0 = 0xc1059ed8;
      h1 = 0x367cd507;
      h2 = 0x3070dd17;
@@ -59,14 +54,28 @@
      h5 = 0x68581511;
      h6 = 0x64f98fa7;
      h7 = 0xbefa4fa4;
+    } else { // 256
+      h0 = 0x6a09e667;
+      h1 = 0xbb67ae85;
+      h2 = 0x3c6ef372;
+      h3 = 0xa54ff53a;
+      h4 = 0x510e527f;
+      h5 = 0x9b05688c;
+      h6 = 0x1f83d9ab;
+      h7 = 0x5be0cd19;
    }
-    blocks[64] = 0;
+    block = 0;
    do {
-      blocks[0] = blocks[64];
+      blocks[0] = block;
      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;
+      if (notString) {
+        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) {
          code = message.charCodeAt(index);
          if (code < 0x80) {
@@ -86,13 +95,14 @@
            blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
          }
        }
+      }
      bytes += i - start;
      start = i - 64;
      if (index == length) {
        blocks[i >> 2] |= EXTRA[i & 3];
        ++index;
      }
-      blocks[64] = blocks[16];
+      block = blocks[16];
      if (index > length && i < 56) {
        blocks[15] = bytes << 3;
        end = true;
@@ -101,77 +111,64 @@
      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 = blocks[j - 15];
-        tmp1 = (tmp1 >>> 7) | (tmp1 << 25);
-        tmp2 = (tmp2 >>> 18) | (tmp2 << 14);
-        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 ^ (blocks[j - 2] >>> 10);
+        t1 = blocks[j - 15];
+        s0 = ((t1 >>> 7) | (t1 << 25)) ^ ((t1 >>> 18) | (t1 << 14)) ^ (t1 >>> 3);
+        t1 = blocks[j - 2];
+        s1 = ((t1 >>> 17) | (t1 << 15)) ^ ((t1 >>> 19) | (t1 << 13)) ^ (t1 >>> 10);
        blocks[j] = blocks[j - 16] + s0 + blocks[j - 7] + s1 << 0;
      }

      bc = b & c;
      for (j = 0; j < 64; j += 4) {
-        tmp1 = (a >>> 2) | (a << 30);
-        tmp2 = (a >>> 13) | (a << 19);
-        tmp3 = (a >>> 22) | (a << 10);
-        s0 = tmp1 ^ tmp2 ^ tmp3;
-        tmp1 = (e >>> 6) | (e << 26);
-        tmp2 = (e >>> 11) | (e << 21);
-        tmp3 = (e >>> 25) | (e << 7);
-        s1 = tmp1 ^ tmp2 ^ tmp3;
+        if (first) {
+          if (is224) {
+            ab = 300032;
+            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 {
+          s0 = ((a >>> 2) | (a << 30)) ^ ((a >>> 13) | (a << 19)) ^ ((a >>> 22) | (a << 10));
+          s1 = ((e >>> 6) | (e << 26)) ^ ((e >>> 11) | (e << 21)) ^ ((e >>> 25) | (e << 7));
          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;
-        tmp1 = (d >>> 2) | (d << 30);
-        tmp2 = (d >>> 13) | (d << 19);
-        tmp3 = (d >>> 22) | (d << 10);
-        s0 = tmp1 ^ tmp2 ^ tmp3;
-        tmp1 = (h >>> 6) | (h << 26);
-        tmp2 = (h >>> 11) | (h << 21);
-        tmp3 = (h >>> 25) | (h << 7);
-        s1 = tmp1 ^ tmp2 ^ tmp3;
+        }
+        s0 = ((d >>> 2) | (d << 30)) ^ ((d >>> 13) | (d << 19)) ^ ((d >>> 22) | (d << 10));
+        s1 = ((h >>> 6) | (h << 26)) ^ ((h >>> 11) | (h << 21)) ^ ((h >>> 25) | (h << 7));
        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;
-        tmp1 = (c >>> 2) | (c << 30);
-        tmp2 = (c >>> 13) | (c << 19);
-        tmp3 = (c >>> 22) | (c << 10);
-        s0 = tmp1 ^ tmp2 ^ tmp3;
-        tmp1 = (g >>> 6) | (g << 26);
-        tmp2 = (g >>> 11) | (g << 21);
-        tmp3 = (g >>> 25) | (g << 7);
-        s1 = tmp1 ^ tmp2 ^ tmp3;
+        s0 = ((c >>> 2) | (c << 30)) ^ ((c >>> 13) | (c << 19)) ^ ((c >>> 22) | (c << 10));
+        s1 = ((g >>> 6) | (g << 26)) ^ ((g >>> 11) | (g << 21)) ^ ((g >>> 25) | (g << 7));
        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;
-        tmp1 = (b >>> 2) | (b << 30);
-        tmp2 = (b >>> 13) | (b << 19);
-        tmp3 = (b >>> 22) | (b << 10);
-        s0 = tmp1 ^ tmp2 ^ tmp3;
-        tmp1 = (f >>> 6) | (f << 26);
-        tmp2 = (f >>> 11) | (f << 21);
-        tmp3 = (f >>> 25) | (f << 7);
-        s1 = tmp1 ^ tmp2 ^ tmp3;
+        s0 = ((b >>> 2) | (b << 30)) ^ ((b >>> 13) | (b << 19)) ^ ((b >>> 22) | (b << 10));
+        s1 = ((f >>> 6) | (f << 26)) ^ ((f >>> 11) | (f << 21)) ^ ((f >>> 25) | (f << 7));
        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;
      }
@@ -214,7 +211,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] +
@@ -223,12 +220,19 @@
    return hex;
  };

-  if(!root.JS_SHA256_TEST && NODE_JS) {
-    sha256.sha256 = sha256;
-    sha256.sha224 = sha224;
-    module.exports = sha256;
-  } else if(root) {
+  var exports = sha256;
+  exports.sha256 = sha256;
+  exports.sha224 = sha224;
+
+  if (COMMON_JS) {
+    module.exports = exports;
+  } else {
    root.sha256 = sha256;
    root.sha224 = sha224;
+    if (AMD) {
+      define(function () {
+        return exports;
+      });
    }
-}(this));
+  }
+})();
@@ -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');
@@ -1,39 +1,40 @@
+(function (sha256, sha224) {
  describe('sha256', function () {
-  describe('ascii', function() {
-    describe('less than 64 bytes', function() {
-      it('should be successful', function() {
+    context('when ascii', function () {
+      context('and less than 64 bytes', function () {
+        it('should be equal', 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');
        });
      });

-    describe('more than 64 bytes', function() {
-      it('should be successful', function() {
+      context('and more than 64 bytes', function () {
+        it('should be equal', 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');
        });
      });
    });

-  describe('UTF8', function() {
-    describe('less than 64 bytes', function() {
-      it('should be successful', function() {
+    context('when UTF8', function () {
+      context('and less than 64 bytes', function () {
+        it('should be equal', function () {
          expect(sha256('中文')).to.be('72726d8818f693066ceb69afa364218b692e62ea92b385782363780f47529c21');
          expect(sha256('aécio')).to.be('53196d1acfce0c4b264e01e8018c989d571351f59e33f055f76ff15b4f0516c6');
          expect(sha256('𠜎')).to.be('8d10a48685dbc34484696de7ea7434d80a54c1d60100530faccf697463ef19c9');
        });
      });

-    describe('more than 64 bytes', function() {
-      it('should be successful', function() {
+      context('and more than 64 bytes', function () {
+        it('should be equal', function () {
          expect(sha256('訊息摘要演算法第五版（英語：Message-Digest Algorithm 5，縮寫為MD5），是當前電腦領域用於確保資訊傳輸完整一致而廣泛使用的雜湊演算法之一')).to.be('d691014feebf35b3500ef6f6738d0094cac63628a7a018a980a40292a77703d1');
          expect(sha256('訊息摘要演算法第五版（英語：Message-Digest Algorithm 5，縮寫為MD5），是當前電腦領域用於確保資訊傳輸完整一致而廣泛使用的雜湊演算法之一（又譯雜湊演算法、摘要演算法等），主流程式語言普遍已有MD5的實作。')).to.be('81a1472ebdeb09406a783d607ff49ee2fde3e9f44ac1cd158ad8d6ad3c4e69fa');
        });
      });
    });
    
-  describe('special length', function() {
-    it('should be successful', function() {
+    context('when special length', function () {
+      it('should be equal', function () {
        expect(sha256('0123456780123456780123456780123456780123456780123456780')).to.be('5e6b963e2b6444dab8544beab8532850cef2a9d143872a6a5384abe37e61b3db');
        expect(sha256('01234567801234567801234567801234567801234567801234567801')).to.be('85d240a4a03a0710423fc4f701da51e8785c9eaa96d718ab1c7991d6afd60d62');
        expect(sha256('0123456780123456780123456780123456780123456780123456780123456780')).to.be('c3ee464d5620eb2dde3dfda4c7955dbd9e9e2e9b113c13983fc67b0dfd892a53');
@@ -41,44 +42,66 @@ describe('sha256', function() {
        expect(sha256('012345678012345678012345678012345678012345678012345678012345678012345678')).to.be('6fba9e623ae6abf028a1b195748814aa95eebfb22e3ec5e15d2444cd6c48186a');
      });
    });
+
+    context('when Array', function () {
+      it('should be equal', function () {
+        expect(sha256([])).to.be('e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855');
+        expect(sha256([211, 212])).to.be('182889f925ae4e5cc37118ded6ed87f7bdc7cab5ec5e78faef2e50048999473f');
+        expect(sha256([84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101, 114, 32, 116, 104, 101, 32, 108, 97, 122, 121, 32, 100, 111, 103])).to.be('d7a8fbb307d7809469ca9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592');
+        expect(sha256([48, 49, 50, 51, 52, 53, 54, 55, 56, 48, 49, 50, 51, 52, 53, 54, 55, 56, 48, 49, 50, 51, 52, 53, 54, 55, 56, 48, 49, 50, 51, 52, 53, 54, 55, 56, 48, 49, 50, 51, 52, 53, 54, 55, 56, 48, 49, 50, 51, 52, 53, 54, 55, 56, 48, 49, 50, 51, 52, 53, 54, 55, 56, 48, 49, 50, 51, 52, 53, 54, 55])).to.be('74b51c6911f9a8b5e7c499effe7604e43b672166818873c27752c248de434841');
+      });
+    });
+
+    context('when Uint8Array', function () {
+      it('should be equal', function () {
+        expect(sha256(new Uint8Array([]))).to.be('e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855');
+        expect(sha256(new Uint8Array([211, 212]))).to.be('182889f925ae4e5cc37118ded6ed87f7bdc7cab5ec5e78faef2e50048999473f');
+      });
+    });
+
+    context('when ArrayBuffer', function () {
+      it('should be equal', function () {
+        expect(sha256(new ArrayBuffer(0))).to.be('e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855');
+      });
+    });
  });

  describe('sha224', function () {
-  describe('ascii', function() {
-    describe('less than 64 bytes', function() {
-      it('should be successful', function() {
+    context('when ascii', function () {
+      context('and less than 64 bytes', function () {
+        it('should be equal', 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');
        });
      });

-    describe('more than 64 bytes', function() {
-      it('should be successful', function() {
+      context('and more than 64 bytes', function () {
+        it('should be equal', 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');
        });
      });
    });

-  describe('UTF8', function() {
-    describe('less than 64 bytes', function() {
-      it('should be successful', function() {
+    context('when UTF8', function () {
+      context('and less than 64 bytes', function () {
+        it('should be equal', function () {
          expect(sha224('中文')).to.be('dfbab71afdf54388af4d55f8bd3de8c9b15e0eb916bf9125f4a959d4');
          expect(sha224('aécio')).to.be('d12841cafd89c534924a839e62bf35a2b5f3717b7802eb19bd8d8e15');
          expect(sha224('𠜎')).to.be('eaa0129b5509f5701db218fb7076b282e4409da52d06363aa3bdd63d');
        });
      });

-    describe('more than 64 bytes', function() {
-      it('should be successful', function() {
+      context('and more than 64 bytes', function () {
+        it('should be equal', function () {
          expect(sha224('訊息摘要演算法第五版（英語：Message-Digest Algorithm 5，縮寫為MD5），是當前電腦領域用於確保資訊傳輸完整一致而廣泛使用的雜湊演算法之一')).to.be('0dda421f3f81272418e1313673e9d74b7f2d04efc9c52c69458e12c3');
          expect(sha224('訊息摘要演算法第五版（英語：Message-Digest Algorithm 5，縮寫為MD5），是當前電腦領域用於確保資訊傳輸完整一致而廣泛使用的雜湊演算法之一（又譯雜湊演算法、摘要演算法等），主流程式語言普遍已有MD5的實作。')).to.be('a8cb74a54e6dc6ab6110db3915ba08ffe5e1abafaea78538fa12a626');
        });
      });
    });
    
-  describe('special length', function() {
-    it('should be successful', function() {
+    context('when special length', function () {
+      it('should be equal', function () {
        expect(sha224('0123456780123456780123456780123456780123456780123456780')).to.be('bc4a354d66f3cff4bc6dd6a88fbb0435cede7fd5fe94da0760cb1924');
        expect(sha224('01234567801234567801234567801234567801234567801234567801')).to.be('2f148f757d1295784a7c69bf328b8bf827a536669e132234cd6f50e7');
        expect(sha224('0123456780123456780123456780123456780123456780123456780123456780')).to.be('496275a96bf41aa27ce89c3ae0fc63c3a3eab063887a8ea075bd091b');
@@ -87,3 +110,4 @@ describe('sha224', function() {
      });
    });
  });
+})(sha256, sha224);
Author	SHA1	Message	Date
Chen, Yi-Cyuan	730f41e84b	1. Added AMD support. 2. Fixed ArrayBuffer dosen't work in Webpack.	2017-01-23 11:08:27 +08:00
emn178andGitHub	3c278a9dde	Merge pull request #5 from nolsherry/patch-1 Add CDNJS version badge in readme	2016-10-20 10:33:10 +08:00
Sherry ChangandGitHub	64c114b54e	Add CDNJS version badge in readme This will add the badge to show its version on CDNJS and also link to its page on CDNJS!	2016-10-19 19:57:11 +08:00
Chen Yi-Cyuan	0a82ff3825	Added CommonJS detection.	2016-09-12 20:40:43 +08:00
Chen, Yi-Cyuan	61d4076633	* Added some files to npm package. * Updated coding style.	2016-09-08 10:23:01 +08:00
Chen Yi-Cyuan	1ff17fbdd9	Support ArrayBuffer input.	2015-05-23 10:06:36 +08:00
Chen Yi-Cyuan	f73267ad15	Support byte array input	2015-02-12 21:45:00 +08:00
emn178	18457729c8	Improve performance.	2015-02-10 12:00:39 +08:00
emn178	90136f7a05	update js	2015-02-06 10:07:46 +08:00