Support byte array input

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 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.

README.md

@@ -68,6 +68,18 @@ Output
     72726d8818f693066ceb69afa364218b692e62ea92b385782363780f47529c21
     dfbab71afdf54388af4d55f8bd3de8c9b15e0eb916bf9125f4a959d4
 
+It also supports byte Array or Uint8Array input:
+
+Code
+```JavaScript
+sha256([]);
+sha256(new Uint8Array([211, 212]));
+```
+Output
+
+    e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+    182889f925ae4e5cc37118ded6ed87f7bdc7cab5ec5e78faef2e50048999473f
+
 ## Benchmark
 [UTF8](http://jsperf.com/sha256/66)  
 [ASCII](http://jsperf.com/sha256/65)

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "js-sha256",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "main": ["build/sha256.min.js"],
   "ignore": [
     "samples",

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,
+(function(C,P){var J="undefined"!=typeof module;J&&(C=global);var H="undefined"!=typeof Uint8Array,a="0123456789abcdef".split(""),O=[-2147483648,8388608,32768,128],D=[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,
-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,
+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=[];Array.prototype.__ARRAY__=!0;H&&(Uint8Array.prototype.__ARRAY__=!0);var H=function(a){return A(a,!0)},A=function(A,C){var f,n,p,q,r,
-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]|=
+t,u,v,g,H=!0,J=!1,b,B=0,L=0,N=0,M=A.length,e,d,E,F,G,I;C?(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;if(A.__ARRAY__)for(b=L;B<M&&64>b;++B)c[b>>2]|=A[B]<<D[b++&3];else for(b=L;B<M&&64>b;++B)g=A.charCodeAt(B),128>g?c[b>>2]|=g<<D[b++&3]:
-(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|
+(2048>g?c[b>>2]|=(192|g>>6)<<D[b++&3]:(55296>g||57344<=g?c[b>>2]|=(224|g>>12)<<D[b++&3]:(g=65536+((g&1023)<<10|A.charCodeAt(++B)&1023),c[b>>2]|=(240|g>>18)<<D[b++&3],c[b>>2]|=(128|g>>12&63)<<D[b++&3]),c[b>>2]|=(128|g>>6&63)<<D[b++&3]),c[b>>2]|=(128|g&63)<<D[b++&3]);N+=b-L;L=b-64;B==M&&(c[b>>2]|=O[b&3],++B);g=c[16];B>M&&56>b&&(c[15]=N<<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-
-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>>>
+16]+e+c[b-7]+d<<0;I=l&m;for(b=0;64>b;b+=4)H?(C?(G=300032,d=c[0]-1413257819,k=d-150054599<<0,h=d+24177077<<0):(G=704751109,d=c[0]-210244248,k=d-1521486534<<0,h=d+143694565<<0),H=!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),G=w&l,E=G^w&m^I,F=x&y^~x&z,d=k+d+F+K[b]+c[b],e+=E,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),I=h&w,E=I^h&l^G,F=k&x^~k&y,d=z+d+F+K[b+1]+c[b+1],e+=E,z=m+d<<0,m=d+e<<
-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]+
+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),G=m&h,E=G^m&w^I,F=z&k^~z&x,d=y+d+F+K[b+2]+c[b+2],e+=E,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),I=l&m,E=I^l&h^G,F=y&z^~y&k,d=x+d+F+K[b+3]+c[b+3],e+=E,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[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,
+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>>
-C.sha224=N,module.exports=C):B&&(B.sha256=C,B.sha224=N)})(this);
+12&15]+a[u>>8&15]+a[u>>4&15]+a[u&15];C||(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};!C.JS_SHA256_TEST&&J?(A.sha256=A,A.sha224=H,module.exports=A):C&&(C.sha256=A,C.sha224=H)})(this);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-sha256",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "A simple SHA-256 / SHA-224 hash function for JavaScript supports UTF-8 encoding.",
   "main": "src/sha256.js",
   "devDependencies": {

src/sha256.js

@@ -1,5 +1,5 @@
 /*
- * js-sha256 v0.2.1
+ * js-sha256 v0.2.3
  * https://github.com/emn178/js-sha256
  *
  * Copyright 2014-2015, emn178@gmail.com
@@ -14,6 +14,7 @@
   if(NODE_JS) {
     root = global;
   }
+  var TYPED_ARRAY = typeof(Uint8Array) != 'undefined';
   var HEX_CHARS = '0123456789abcdef'.split('');
   var EXTRA = [-2147483648, 8388608, 32768, 128];
   var SHIFT = [24, 16, 8, 0];
@@ -28,29 +29,21 @@
 
   var blocks = [];
 
-  var sha256 = function(message) {
+  Array.prototype.__ARRAY__ = true;
-    return sha2(message, true);
+  if(TYPED_ARRAY) {
-  };
+    Uint8Array.prototype.__ARRAY__ = 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, code, end = false,
+    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, tmp1, tmp2, tmp3, maj, t1, t2, ch, ab, da, cd, bc;
+        s0, s1, maj, t1, t2, ch, ab, da, cd, bc;
 
-    if(is256) {
+    if(is224) {
-      h0 = 0x6a09e667;
-      h1 = 0xbb67ae85;
-      h2 = 0x3c6ef372;
-      h3 = 0xa54ff53a;
-      h4 = 0x510e527f;
-      h5 = 0x9b05688c;
-      h6 = 0x1f83d9ab;
-      h7 = 0x5be0cd19;
-    } else { // 224
       h0 = 0xc1059ed8;
       h1 = 0x367cd507;
       h2 = 0x3070dd17;
@@ -59,31 +52,46 @@
       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;
-      for (i = start;index < length && i < 64; ++index) {
+      if(message.__ARRAY__) {
-        code = message.charCodeAt(index);
+        for (i = start;index < length && i < 64; ++index) {
-        if (code < 0x80) {
+          blocks[i >> 2] |= message[index] << SHIFT[i++ & 3];
-          blocks[i >> 2] |= code << SHIFT[i++ & 3];
+        }
-        } else if (code < 0x800) {
+      } else {
-          blocks[i >> 2] |= (0xc0 | (code >> 6)) << SHIFT[i++ & 3];
+        for (i = start;index < length && i < 64; ++index) {
-          blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
+          code = message.charCodeAt(index);
-        } else if (code < 0xd800 || code >= 0xe000) {
+          if (code < 0x80) {
-          blocks[i >> 2] |= (0xe0 | (code >> 12)) << SHIFT[i++ & 3];
+            blocks[i >> 2] |= code << SHIFT[i++ & 3];
-          blocks[i >> 2] |= (0x80 | ((code >> 6) & 0x3f)) << SHIFT[i++ & 3];
+          } else if (code < 0x800) {
-          blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
+            blocks[i >> 2] |= (0xc0 | (code >> 6)) << SHIFT[i++ & 3];
-        } else {
+            blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
-          code = 0x10000 + (((code & 0x3ff) << 10) | (message.charCodeAt(++index) & 0x3ff));
+          } else if (code < 0xd800 || code >= 0xe000) {
-          blocks[i >> 2] |= (0xf0 | (code >> 18)) << SHIFT[i++ & 3];
+            blocks[i >> 2] |= (0xe0 | (code >> 12)) << 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 >> 6) & 0x3f)) << SHIFT[i++ & 3];
+            blocks[i >> 2] |= (0x80 | (code & 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];
+          }
         }
       }
       bytes += i - start;
@@ -92,7 +100,7 @@
         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 +109,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];
+        t1 = blocks[j - 15];
-        tmp1 = (tmp1 >>> 7) | (tmp1 << 25);
+        s0 = ((t1 >>> 7) | (t1 << 25)) ^ ((t1 >>> 18) | (t1 << 14)) ^ (t1 >>> 3);
-        tmp2 = (tmp2 >>> 18) | (tmp2 << 14);
+        t1 = blocks[j - 2];
-        s0 = tmp1 ^ tmp2 ^ (blocks[j - 15] >>> 3);
+        s1 = ((t1 >>> 17) | (t1 << 15)) ^ ((t1 >>> 19) | (t1 << 13)) ^ (t1 >>> 10);
-        tmp1 = tmp2 = blocks[j - 2];
-        tmp1 = (tmp1 >>> 17) | (tmp1 << 15);
-        tmp2 = (tmp2 >>> 19) | (tmp2 << 13);
-        s1 = tmp1 ^ tmp2 ^ (blocks[j - 2] >>> 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);
+        if(first) {
-        tmp2 = (a >>> 13) | (a << 19);
+          if(is224) {
-        tmp3 = (a >>> 22) | (a << 10);
+            ab = 300032;
-        s0 = tmp1 ^ tmp2 ^ tmp3;
+            t1 = blocks[0] - 1413257819;
-        tmp1 = (e >>> 6) | (e << 26);
+            h = t1 - 150054599 << 0;
-        tmp2 = (e >>> 11) | (e << 21);
+            d = t1 + 24177077 << 0;
-        tmp3 = (e >>> 25) | (e << 7);
+          } else {
-        s1 = tmp1 ^ tmp2 ^ tmp3;
+            ab = 704751109;
-        ab = a & b;
+            t1 = blocks[0] - 210244248;
-        maj = ab ^ (a & c) ^ bc;
+            h = t1 - 1521486534 << 0;
-        ch = (e & f) ^ (~e & g);
+            d = t1 + 143694565 << 0;
-        t1 = h + s1 + ch + K[j] + blocks[j] << 0;
+          }
-        t2 = s0 + maj << 0;
+          first = false;
-        h = d + t1 << 0;
+        } else {
-        d = t1 + t2 << 0;
+          s0 = ((a >>> 2) | (a << 30)) ^ ((a >>> 13) | (a << 19)) ^ ((a >>> 22) | (a << 10));
-        tmp1 = (d >>> 2) | (d << 30);
+          s1 = ((e >>> 6) | (e << 26)) ^ ((e >>> 11) | (e << 21)) ^ ((e >>> 25) | (e << 7));
-        tmp2 = (d >>> 13) | (d << 19);
+          ab = a & b;
-        tmp3 = (d >>> 22) | (d << 10);
+          maj = ab ^ (a & c) ^ bc;
-        s0 = tmp1 ^ tmp2 ^ tmp3;
+          ch = (e & f) ^ (~e & g);
-        tmp1 = (h >>> 6) | (h << 26);
+          t1 = h + s1 + ch + K[j] + blocks[j];
-        tmp2 = (h >>> 11) | (h << 21);
+          t2 = s0 + maj;
-        tmp3 = (h >>> 25) | (h << 7);
+          h = d + t1 << 0;
-        s1 = tmp1 ^ tmp2 ^ tmp3;
+          d = t1 + t2 << 0;
+        }
+        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;
+        t1 = g + s1 + ch + K[j + 1] + blocks[j + 1];
-        t2 = s0 + maj << 0;
+        t2 = s0 + maj;
         g = c + t1 << 0;
         c = t1 + t2 << 0;
-        tmp1 = (c >>> 2) | (c << 30);
+        s0 = ((c >>> 2) | (c << 30)) ^ ((c >>> 13) | (c << 19)) ^ ((c >>> 22) | (c << 10));
-        tmp2 = (c >>> 13) | (c << 19);
+        s1 = ((g >>> 6) | (g << 26)) ^ ((g >>> 11) | (g << 21)) ^ ((g >>> 25) | (g << 7));
-        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;
         cd = c & d;
         maj = cd ^ (c & a) ^ da;
         ch = (g & h) ^ (~g & e);
-        t1 = f + s1 + ch + K[j + 2] + blocks[j + 2] << 0;
+        t1 = f + s1 + ch + K[j + 2] + blocks[j + 2];
-        t2 = s0 + maj << 0;
+        t2 = s0 + maj;
         f = b + t1 << 0;
         b = t1 + t2 << 0;
-        tmp1 = (b >>> 2) | (b << 30);
+        s0 = ((b >>> 2) | (b << 30)) ^ ((b >>> 13) | (b << 19)) ^ ((b >>> 22) | (b << 10));
-        tmp2 = (b >>> 13) | (b << 19);
+        s1 = ((f >>> 6) | (f << 26)) ^ ((f >>> 11) | (f << 21)) ^ ((f >>> 25) | (f << 7));
-        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;
         bc = b & c;
         maj = bc ^ (b & d) ^ cd;
         ch = (f & g) ^ (~f & h);
-        t1 = e + s1 + ch + K[j + 3] + blocks[j + 3] << 0;
+        t1 = e + s1 + ch + K[j + 3] + blocks[j + 3];
-        t2 = s0 + maj << 0;
+        t2 = s0 + maj;
         e = a + t1 << 0;
         a = t1 + t2 << 0;
       }
@@ -214,7 +209,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] +

tests/test.js

@@ -41,6 +41,24 @@ describe('sha256', function() {
       expect(sha256('012345678012345678012345678012345678012345678012345678012345678012345678')).to.be('6fba9e623ae6abf028a1b195748814aa95eebfb22e3ec5e15d2444cd6c48186a');
     });
   });
+
+  describe('Array', function() {
+    describe('Array', function() {
+      it('should be successful', 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');
+      });
+    });
+
+    describe('Uint8Array', function() {
+      it('should be successful', function() {
+        expect(sha256(new Uint8Array([]))).to.be('e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855');
+        expect(sha256(new Uint8Array([211, 212]))).to.be('182889f925ae4e5cc37118ded6ed87f7bdc7cab5ec5e78faef2e50048999473f');
+      });
+    });
+  });
 });
 
 describe('sha224', function() {