js-sha3 0.8.0 → 0.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +9 -0
- package/LICENSE.txt +1 -1
- package/README.md +35 -15
- package/build/sha3.min.js +3 -3
- package/package.json +5 -5
- package/src/sha3.js +35 -38
package/CHANGELOG.md
CHANGED
package/LICENSE.txt
CHANGED
package/README.md
CHANGED
|
@@ -84,26 +84,46 @@ var hash = cshake128.create(256, 'function name', 'customization');
|
|
|
84
84
|
// specify kmac key, output bits and customization when creating
|
|
85
85
|
var hash = kmac128.create('key', 256, 'customization');
|
|
86
86
|
```
|
|
87
|
+
### Node.js
|
|
87
88
|
If you use node.js, you should require the module first:
|
|
88
89
|
```JavaScript
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
90
|
+
const {
|
|
91
|
+
sha3_512,
|
|
92
|
+
sha3_384,
|
|
93
|
+
sha3_256,
|
|
94
|
+
sha3_224,
|
|
95
|
+
keccak512,
|
|
96
|
+
keccak384,
|
|
97
|
+
keccak256,
|
|
98
|
+
keccak224,
|
|
99
|
+
shake128,
|
|
100
|
+
shake256,
|
|
101
|
+
cshake128,
|
|
102
|
+
cshake256,
|
|
103
|
+
kmac128,
|
|
104
|
+
kmac25
|
|
105
|
+
} = require('js-sha3');
|
|
103
106
|
```
|
|
107
|
+
|
|
108
|
+
### TypeScript
|
|
104
109
|
If you use TypeScript, you can import like this:
|
|
105
110
|
```TypeScript
|
|
106
|
-
import {
|
|
111
|
+
import {
|
|
112
|
+
sha3_512,
|
|
113
|
+
sha3_384,
|
|
114
|
+
sha3_256,
|
|
115
|
+
sha3_224,
|
|
116
|
+
keccak512,
|
|
117
|
+
keccak384,
|
|
118
|
+
keccak256,
|
|
119
|
+
keccak224,
|
|
120
|
+
shake128,
|
|
121
|
+
shake256,
|
|
122
|
+
cshake128,
|
|
123
|
+
cshake256,
|
|
124
|
+
kmac128,
|
|
125
|
+
kmac256
|
|
126
|
+
} from 'js-sha3';
|
|
107
127
|
```
|
|
108
128
|
|
|
109
129
|
## Example
|
package/build/sha3.min.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* [js-sha3]{@link https://github.com/emn178/js-sha3}
|
|
3
3
|
*
|
|
4
|
-
* @version 0.
|
|
4
|
+
* @version 0.9.1
|
|
5
5
|
* @author Chen, Yi-Cyuan [emn178@gmail.com]
|
|
6
|
-
* @copyright Chen, Yi-Cyuan 2015-
|
|
6
|
+
* @copyright Chen, Yi-Cyuan 2015-2023
|
|
7
7
|
* @license MIT
|
|
8
8
|
*/
|
|
9
|
-
!function(){"use strict";function t(t,e,r){this.blocks=[],this.s=[],this.padding=e,this.outputBits=r,this.reset=!0,this.finalized=!1,this.block=0,this.start=0,this.blockCount=1600-(t<<1)>>5,this.byteCount=this.blockCount<<2,this.outputBlocks=r>>5,this.extraBytes=(31&r)>>3;for(var n=0;n<50;++n)this.s[n]=0}function e(e,r,n){t.call(this,e,r,n)}var r="input is invalid type",n="object"==typeof window,i=n?window:{};i.JS_SHA3_NO_WINDOW&&(n=!1);var o=!n&&"object"==typeof self;!i.JS_SHA3_NO_NODE_JS&&"object"==typeof process&&process.versions&&process.versions.node?i=global:o&&(i=self);var a=!i.JS_SHA3_NO_COMMON_JS&&"object"==typeof module&&module.exports,s="function"==typeof define&&define.amd,u=!i.JS_SHA3_NO_ARRAY_BUFFER&&"undefined"!=typeof ArrayBuffer,f="0123456789abcdef".split(""),c=[4,1024,262144,67108864],h=[0,8,16,24],p=[1,0,32898,0,32906,2147483648,2147516416,2147483648,32907,0,2147483649,0,2147516545,2147483648,32777,2147483648,138,0,136,0,2147516425,0,2147483658,0,2147516555,0,139,2147483648,32905,2147483648,32771,2147483648,32770,2147483648,128,2147483648,32778,0,2147483658,2147483648,2147516545,2147483648,32896,2147483648,2147483649,0,2147516424,2147483648],d=[224,256,384,512],l=[128,256],y=["hex","buffer","arrayBuffer","array","digest"],b={128:168,256:136};!i.JS_SHA3_NO_NODE_JS&&Array.isArray||(Array.isArray=function(t){return"[object Array]"===Object.prototype.toString.call(t)}),!u||!i.JS_SHA3_NO_ARRAY_BUFFER_IS_VIEW&&ArrayBuffer.isView||(ArrayBuffer.isView=function(t){return"object"==typeof t&&t.buffer&&t.buffer.constructor===ArrayBuffer});for(var A=function(e,r,n){return function(i){return new t(e,r,e).update(i)[n]()}},
|
|
9
|
+
!function(){"use strict";function t(t,e,r){this.blocks=[],this.s=[],this.padding=e,this.outputBits=r,this.reset=!0,this.finalized=!1,this.block=0,this.start=0,this.blockCount=1600-(t<<1)>>5,this.byteCount=this.blockCount<<2,this.outputBlocks=r>>5,this.extraBytes=(31&r)>>3;for(var n=0;n<50;++n)this.s[n]=0}function e(e,r,n){t.call(this,e,r,n)}var r="input is invalid type",n="object"==typeof window,i=n?window:{};i.JS_SHA3_NO_WINDOW&&(n=!1);var o=!n&&"object"==typeof self;!i.JS_SHA3_NO_NODE_JS&&"object"==typeof process&&process.versions&&process.versions.node?i=global:o&&(i=self);var a=!i.JS_SHA3_NO_COMMON_JS&&"object"==typeof module&&module.exports,s="function"==typeof define&&define.amd,u=!i.JS_SHA3_NO_ARRAY_BUFFER&&"undefined"!=typeof ArrayBuffer,f="0123456789abcdef".split(""),c=[4,1024,262144,67108864],h=[0,8,16,24],p=[1,0,32898,0,32906,2147483648,2147516416,2147483648,32907,0,2147483649,0,2147516545,2147483648,32777,2147483648,138,0,136,0,2147516425,0,2147483658,0,2147516555,0,139,2147483648,32905,2147483648,32771,2147483648,32770,2147483648,128,2147483648,32778,0,2147483658,2147483648,2147516545,2147483648,32896,2147483648,2147483649,0,2147516424,2147483648],d=[224,256,384,512],l=[128,256],y=["hex","buffer","arrayBuffer","array","digest"],b={128:168,256:136};!i.JS_SHA3_NO_NODE_JS&&Array.isArray||(Array.isArray=function(t){return"[object Array]"===Object.prototype.toString.call(t)}),!u||!i.JS_SHA3_NO_ARRAY_BUFFER_IS_VIEW&&ArrayBuffer.isView||(ArrayBuffer.isView=function(t){return"object"==typeof t&&t.buffer&&t.buffer.constructor===ArrayBuffer});for(var v=function(t){var e,n=typeof t;if("string"!==n){if("object"!==n)throw new Error(r);if(null===t)throw new Error(r);if(u&&t.constructor===ArrayBuffer)t=new Uint8Array(t);else if(!(Array.isArray(t)||u&&ArrayBuffer.isView(t)))throw new Error(r);e=!0}return[t,e]},A=function(t){return 0===v(t)[0].length},g=function(e,r,n){return function(i){return new t(e,r,e).update(i)[n]()}},B=function(e,r,n){return function(i,o){return new t(e,r,o).update(i)[n]()}},w=function(t,e,r){return function(e,n,i,o){return x["cshake"+t].update(e,n,i,o)[r]()}},_=function(t,e,r){return function(e,n,i,o){return x["kmac"+t].update(e,n,i,o)[r]()}},k=function(t,e,r,n){for(var i=0;i<y.length;++i){var o=y[i];t[o]=e(r,n,o)}return t},S=function(e,r){var n=g(e,r,"hex");return n.create=function(){return new t(e,r,e)},n.update=function(t){return n.create().update(t)},k(n,g,e,r)},C=[{name:"keccak",padding:[1,256,65536,16777216],bits:d,createMethod:S},{name:"sha3",padding:[6,1536,393216,100663296],bits:d,createMethod:S},{name:"shake",padding:[31,7936,2031616,520093696],bits:l,createMethod:function(e,r){var n=B(e,r,"hex");return n.create=function(n){return new t(e,r,n)},n.update=function(t,e){return n.create(e).update(t)},k(n,B,e,r)}},{name:"cshake",padding:c,bits:l,createMethod:function(e,r){var n=b[e],i=w(e,0,"hex");return i.create=function(i,o,a){return A(o)&&A(a)?x["shake"+e].create(i):new t(e,r,i).bytepad([o,a],n)},i.update=function(t,e,r,n){return i.create(e,r,n).update(t)},k(i,w,e,r)}},{name:"kmac",padding:c,bits:l,createMethod:function(t,r){var n=b[t],i=_(t,0,"hex");return i.create=function(i,o,a){return new e(t,r,o).bytepad(["KMAC",a],n).bytepad([i],n)},i.update=function(t,e,r,n){return i.create(t,r,n).update(e)},k(i,_,t,r)}}],x={},m=[],O=0;O<C.length;++O)for(var z=C[O],N=z.bits,E=0;E<N.length;++E){var J=z.name+"_"+N[E];if(m.push(J),x[J]=z.createMethod(N[E],z.padding),"sha3"!==z.name){var M=z.name+N[E];m.push(M),x[M]=x[J]}}t.prototype.update=function(t){if(this.finalized)throw new Error("finalize already called");var e=v(t);t=e[0];for(var r,n,i=e[1],o=this.blocks,a=this.byteCount,s=t.length,u=this.blockCount,f=0,c=this.s;f<s;){if(this.reset)for(this.reset=!1,o[0]=this.block,r=1;r<u+1;++r)o[r]=0;if(i)for(r=this.start;f<s&&r<a;++f)o[r>>2]|=t[f]<<h[3&r++];else for(r=this.start;f<s&&r<a;++f)(n=t.charCodeAt(f))<128?o[r>>2]|=n<<h[3&r++]:n<2048?(o[r>>2]|=(192|n>>6)<<h[3&r++],o[r>>2]|=(128|63&n)<<h[3&r++]):n<55296||n>=57344?(o[r>>2]|=(224|n>>12)<<h[3&r++],o[r>>2]|=(128|n>>6&63)<<h[3&r++],o[r>>2]|=(128|63&n)<<h[3&r++]):(n=65536+((1023&n)<<10|1023&t.charCodeAt(++f)),o[r>>2]|=(240|n>>18)<<h[3&r++],o[r>>2]|=(128|n>>12&63)<<h[3&r++],o[r>>2]|=(128|n>>6&63)<<h[3&r++],o[r>>2]|=(128|63&n)<<h[3&r++]);if(this.lastByteIndex=r,r>=a){for(this.start=r-a,this.block=o[u],r=0;r<u;++r)c[r]^=o[r];j(c),this.reset=!0}else this.start=r}return this},t.prototype.encode=function(t,e){var r=255&t,n=1,i=[r];for(r=255&(t>>=8);r>0;)i.unshift(r),r=255&(t>>=8),++n;return e?i.push(n):i.unshift(n),this.update(i),i.length},t.prototype.encodeString=function(t){var e=v(t);t=e[0];var r=e[1],n=0,i=t.length;if(r)n=i;else for(var o=0;o<t.length;++o){var a=t.charCodeAt(o);a<128?n+=1:a<2048?n+=2:a<55296||a>=57344?n+=3:(a=65536+((1023&a)<<10|1023&t.charCodeAt(++o)),n+=4)}return n+=this.encode(8*n),this.update(t),n},t.prototype.bytepad=function(t,e){for(var r=this.encode(e),n=0;n<t.length;++n)r+=this.encodeString(t[n]);var i=(e-r%e)%e,o=[];return o.length=i,this.update(o),this},t.prototype.finalize=function(){if(!this.finalized){this.finalized=!0;var t=this.blocks,e=this.lastByteIndex,r=this.blockCount,n=this.s;if(t[e>>2]|=this.padding[3&e],this.lastByteIndex===this.byteCount)for(t[0]=t[r],e=1;e<r+1;++e)t[e]=0;for(t[r-1]|=2147483648,e=0;e<r;++e)n[e]^=t[e];j(n)}},t.prototype.toString=t.prototype.hex=function(){this.finalize();for(var t,e=this.blockCount,r=this.s,n=this.outputBlocks,i=this.extraBytes,o=0,a=0,s="";a<n;){for(o=0;o<e&&a<n;++o,++a)t=r[o],s+=f[t>>4&15]+f[15&t]+f[t>>12&15]+f[t>>8&15]+f[t>>20&15]+f[t>>16&15]+f[t>>28&15]+f[t>>24&15];a%e==0&&(j(r),o=0)}return i&&(t=r[o],s+=f[t>>4&15]+f[15&t],i>1&&(s+=f[t>>12&15]+f[t>>8&15]),i>2&&(s+=f[t>>20&15]+f[t>>16&15])),s},t.prototype.arrayBuffer=function(){this.finalize();var t,e=this.blockCount,r=this.s,n=this.outputBlocks,i=this.extraBytes,o=0,a=0,s=this.outputBits>>3;t=i?new ArrayBuffer(n+1<<2):new ArrayBuffer(s);for(var u=new Uint32Array(t);a<n;){for(o=0;o<e&&a<n;++o,++a)u[a]=r[o];a%e==0&&j(r)}return i&&(u[o]=r[o],t=t.slice(0,s)),t},t.prototype.buffer=t.prototype.arrayBuffer,t.prototype.digest=t.prototype.array=function(){this.finalize();for(var t,e,r=this.blockCount,n=this.s,i=this.outputBlocks,o=this.extraBytes,a=0,s=0,u=[];s<i;){for(a=0;a<r&&s<i;++a,++s)t=s<<2,e=n[a],u[t]=255&e,u[t+1]=e>>8&255,u[t+2]=e>>16&255,u[t+3]=e>>24&255;s%r==0&&j(n)}return o&&(t=s<<2,e=n[a],u[t]=255&e,o>1&&(u[t+1]=e>>8&255),o>2&&(u[t+2]=e>>16&255)),u},(e.prototype=new t).finalize=function(){return this.encode(this.outputBits,!0),t.prototype.finalize.call(this)};var j=function(t){var e,r,n,i,o,a,s,u,f,c,h,d,l,y,b,v,A,g,B,w,_,k,S,C,x,m,O,z,N,E,J,M,j,H,I,R,F,U,V,D,W,Y,K,q,G,L,P,Q,T,X,Z,$,tt,et,rt,nt,it,ot,at,st,ut,ft,ct;for(n=0;n<48;n+=2)i=t[0]^t[10]^t[20]^t[30]^t[40],o=t[1]^t[11]^t[21]^t[31]^t[41],a=t[2]^t[12]^t[22]^t[32]^t[42],s=t[3]^t[13]^t[23]^t[33]^t[43],u=t[4]^t[14]^t[24]^t[34]^t[44],f=t[5]^t[15]^t[25]^t[35]^t[45],c=t[6]^t[16]^t[26]^t[36]^t[46],h=t[7]^t[17]^t[27]^t[37]^t[47],e=(d=t[8]^t[18]^t[28]^t[38]^t[48])^(a<<1|s>>>31),r=(l=t[9]^t[19]^t[29]^t[39]^t[49])^(s<<1|a>>>31),t[0]^=e,t[1]^=r,t[10]^=e,t[11]^=r,t[20]^=e,t[21]^=r,t[30]^=e,t[31]^=r,t[40]^=e,t[41]^=r,e=i^(u<<1|f>>>31),r=o^(f<<1|u>>>31),t[2]^=e,t[3]^=r,t[12]^=e,t[13]^=r,t[22]^=e,t[23]^=r,t[32]^=e,t[33]^=r,t[42]^=e,t[43]^=r,e=a^(c<<1|h>>>31),r=s^(h<<1|c>>>31),t[4]^=e,t[5]^=r,t[14]^=e,t[15]^=r,t[24]^=e,t[25]^=r,t[34]^=e,t[35]^=r,t[44]^=e,t[45]^=r,e=u^(d<<1|l>>>31),r=f^(l<<1|d>>>31),t[6]^=e,t[7]^=r,t[16]^=e,t[17]^=r,t[26]^=e,t[27]^=r,t[36]^=e,t[37]^=r,t[46]^=e,t[47]^=r,e=c^(i<<1|o>>>31),r=h^(o<<1|i>>>31),t[8]^=e,t[9]^=r,t[18]^=e,t[19]^=r,t[28]^=e,t[29]^=r,t[38]^=e,t[39]^=r,t[48]^=e,t[49]^=r,y=t[0],b=t[1],L=t[11]<<4|t[10]>>>28,P=t[10]<<4|t[11]>>>28,z=t[20]<<3|t[21]>>>29,N=t[21]<<3|t[20]>>>29,st=t[31]<<9|t[30]>>>23,ut=t[30]<<9|t[31]>>>23,Y=t[40]<<18|t[41]>>>14,K=t[41]<<18|t[40]>>>14,H=t[2]<<1|t[3]>>>31,I=t[3]<<1|t[2]>>>31,v=t[13]<<12|t[12]>>>20,A=t[12]<<12|t[13]>>>20,Q=t[22]<<10|t[23]>>>22,T=t[23]<<10|t[22]>>>22,E=t[33]<<13|t[32]>>>19,J=t[32]<<13|t[33]>>>19,ft=t[42]<<2|t[43]>>>30,ct=t[43]<<2|t[42]>>>30,et=t[5]<<30|t[4]>>>2,rt=t[4]<<30|t[5]>>>2,R=t[14]<<6|t[15]>>>26,F=t[15]<<6|t[14]>>>26,g=t[25]<<11|t[24]>>>21,B=t[24]<<11|t[25]>>>21,X=t[34]<<15|t[35]>>>17,Z=t[35]<<15|t[34]>>>17,M=t[45]<<29|t[44]>>>3,j=t[44]<<29|t[45]>>>3,C=t[6]<<28|t[7]>>>4,x=t[7]<<28|t[6]>>>4,nt=t[17]<<23|t[16]>>>9,it=t[16]<<23|t[17]>>>9,U=t[26]<<25|t[27]>>>7,V=t[27]<<25|t[26]>>>7,w=t[36]<<21|t[37]>>>11,_=t[37]<<21|t[36]>>>11,$=t[47]<<24|t[46]>>>8,tt=t[46]<<24|t[47]>>>8,q=t[8]<<27|t[9]>>>5,G=t[9]<<27|t[8]>>>5,m=t[18]<<20|t[19]>>>12,O=t[19]<<20|t[18]>>>12,ot=t[29]<<7|t[28]>>>25,at=t[28]<<7|t[29]>>>25,D=t[38]<<8|t[39]>>>24,W=t[39]<<8|t[38]>>>24,k=t[48]<<14|t[49]>>>18,S=t[49]<<14|t[48]>>>18,t[0]=y^~v&g,t[1]=b^~A&B,t[10]=C^~m&z,t[11]=x^~O&N,t[20]=H^~R&U,t[21]=I^~F&V,t[30]=q^~L&Q,t[31]=G^~P&T,t[40]=et^~nt&ot,t[41]=rt^~it&at,t[2]=v^~g&w,t[3]=A^~B&_,t[12]=m^~z&E,t[13]=O^~N&J,t[22]=R^~U&D,t[23]=F^~V&W,t[32]=L^~Q&X,t[33]=P^~T&Z,t[42]=nt^~ot&st,t[43]=it^~at&ut,t[4]=g^~w&k,t[5]=B^~_&S,t[14]=z^~E&M,t[15]=N^~J&j,t[24]=U^~D&Y,t[25]=V^~W&K,t[34]=Q^~X&$,t[35]=T^~Z&tt,t[44]=ot^~st&ft,t[45]=at^~ut&ct,t[6]=w^~k&y,t[7]=_^~S&b,t[16]=E^~M&C,t[17]=J^~j&x,t[26]=D^~Y&H,t[27]=W^~K&I,t[36]=X^~$&q,t[37]=Z^~tt&G,t[46]=st^~ft&et,t[47]=ut^~ct&rt,t[8]=k^~y&v,t[9]=S^~b&A,t[18]=M^~C&m,t[19]=j^~x&O,t[28]=Y^~H&R,t[29]=K^~I&F,t[38]=$^~q&L,t[39]=tt^~G&P,t[48]=ft^~et&nt,t[49]=ct^~rt&it,t[0]^=p[n],t[1]^=p[n+1]};if(a)module.exports=x;else{for(O=0;O<m.length;++O)i[m[O]]=x[m[O]];s&&define(function(){return x})}}();
|
package/package.json
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "js-sha3",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.9.1",
|
|
4
4
|
"description": "A simple SHA-3 / Keccak / Shake hash function for JavaScript supports UTF-8 encoding.",
|
|
5
5
|
"main": "src/sha3.js",
|
|
6
6
|
"devDependencies": {
|
|
7
7
|
"expect.js": "~0.3.1",
|
|
8
|
-
"mocha": "~2.
|
|
9
|
-
"nyc": "^
|
|
10
|
-
"
|
|
11
|
-
"
|
|
8
|
+
"mocha": "~10.2.0",
|
|
9
|
+
"nyc": "^15.1.0",
|
|
10
|
+
"tiny-worker": "^2.3.0",
|
|
11
|
+
"uglify-js": "^3.1.9"
|
|
12
12
|
},
|
|
13
13
|
"scripts": {
|
|
14
14
|
"test": "nyc mocha tests/node-test.js",
|
package/src/sha3.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* [js-sha3]{@link https://github.com/emn178/js-sha3}
|
|
3
3
|
*
|
|
4
|
-
* @version 0.
|
|
4
|
+
* @version 0.9.1
|
|
5
5
|
* @author Chen, Yi-Cyuan [emn178@gmail.com]
|
|
6
|
-
* @copyright Chen, Yi-Cyuan 2015-
|
|
6
|
+
* @copyright Chen, Yi-Cyuan 2015-2023
|
|
7
7
|
* @license MIT
|
|
8
8
|
*/
|
|
9
9
|
/*jslint bitwise: true */
|
|
@@ -58,6 +58,31 @@
|
|
|
58
58
|
};
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
+
var formatMessage = function (message) {
|
|
62
|
+
var notString, type = typeof message;
|
|
63
|
+
if (type !== 'string') {
|
|
64
|
+
if (type === 'object') {
|
|
65
|
+
if (message === null) {
|
|
66
|
+
throw new Error(INPUT_ERROR);
|
|
67
|
+
} else if (ARRAY_BUFFER && message.constructor === ArrayBuffer) {
|
|
68
|
+
message = new Uint8Array(message);
|
|
69
|
+
} else if (!Array.isArray(message)) {
|
|
70
|
+
if (!ARRAY_BUFFER || !ArrayBuffer.isView(message)) {
|
|
71
|
+
throw new Error(INPUT_ERROR);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
} else {
|
|
75
|
+
throw new Error(INPUT_ERROR);
|
|
76
|
+
}
|
|
77
|
+
notString = true;
|
|
78
|
+
}
|
|
79
|
+
return [message, notString];
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
var empty = function (message) {
|
|
83
|
+
return formatMessage(message)[0].length === 0;
|
|
84
|
+
};
|
|
85
|
+
|
|
61
86
|
var createOutputMethod = function (bits, padding, outputType) {
|
|
62
87
|
return function (message) {
|
|
63
88
|
return new Keccak(bits, padding, bits).update(message)[outputType]();
|
|
@@ -116,7 +141,7 @@
|
|
|
116
141
|
var w = CSHAKE_BYTEPAD[bits];
|
|
117
142
|
var method = createCshakeOutputMethod(bits, padding, 'hex');
|
|
118
143
|
method.create = function (outputBits, n, s) {
|
|
119
|
-
if (
|
|
144
|
+
if (empty(n) && empty(s)) {
|
|
120
145
|
return methods['shake' + bits].create(outputBits);
|
|
121
146
|
} else {
|
|
122
147
|
return new Keccak(bits, padding, outputBits).bytepad([n, s], w);
|
|
@@ -188,23 +213,9 @@
|
|
|
188
213
|
if (this.finalized) {
|
|
189
214
|
throw new Error(FINALIZE_ERROR);
|
|
190
215
|
}
|
|
191
|
-
var
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
if (message === null) {
|
|
195
|
-
throw new Error(INPUT_ERROR);
|
|
196
|
-
} else if (ARRAY_BUFFER && message.constructor === ArrayBuffer) {
|
|
197
|
-
message = new Uint8Array(message);
|
|
198
|
-
} else if (!Array.isArray(message)) {
|
|
199
|
-
if (!ARRAY_BUFFER || !ArrayBuffer.isView(message)) {
|
|
200
|
-
throw new Error(INPUT_ERROR);
|
|
201
|
-
}
|
|
202
|
-
}
|
|
203
|
-
} else {
|
|
204
|
-
throw new Error(INPUT_ERROR);
|
|
205
|
-
}
|
|
206
|
-
notString = true;
|
|
207
|
-
}
|
|
216
|
+
var result = formatMessage(message);
|
|
217
|
+
message = result[0];
|
|
218
|
+
var notString = result[1];
|
|
208
219
|
var blocks = this.blocks, byteCount = this.byteCount, length = message.length,
|
|
209
220
|
blockCount = this.blockCount, index = 0, s = this.s, i, code;
|
|
210
221
|
|
|
@@ -278,23 +289,9 @@
|
|
|
278
289
|
};
|
|
279
290
|
|
|
280
291
|
Keccak.prototype.encodeString = function (str) {
|
|
281
|
-
var
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
if (str === null) {
|
|
285
|
-
throw new Error(INPUT_ERROR);
|
|
286
|
-
} else if (ARRAY_BUFFER && str.constructor === ArrayBuffer) {
|
|
287
|
-
str = new Uint8Array(str);
|
|
288
|
-
} else if (!Array.isArray(str)) {
|
|
289
|
-
if (!ARRAY_BUFFER || !ArrayBuffer.isView(str)) {
|
|
290
|
-
throw new Error(INPUT_ERROR);
|
|
291
|
-
}
|
|
292
|
-
}
|
|
293
|
-
} else {
|
|
294
|
-
throw new Error(INPUT_ERROR);
|
|
295
|
-
}
|
|
296
|
-
notString = true;
|
|
297
|
-
}
|
|
292
|
+
var result = formatMessage(str);
|
|
293
|
+
str = result[0];
|
|
294
|
+
var notString = result[1];
|
|
298
295
|
var bytes = 0, length = str.length;
|
|
299
296
|
if (notString) {
|
|
300
297
|
bytes = length;
|
|
@@ -323,7 +320,7 @@
|
|
|
323
320
|
for (var i = 0; i < strs.length; ++i) {
|
|
324
321
|
bytes += this.encodeString(strs[i]);
|
|
325
322
|
}
|
|
326
|
-
var paddingBytes = w - bytes % w;
|
|
323
|
+
var paddingBytes = (w - bytes % w) % w;
|
|
327
324
|
var zeros = [];
|
|
328
325
|
zeros.length = paddingBytes;
|
|
329
326
|
this.update(zeros);
|