@@ -12,31 +12,30 @@ function padEnd(arr,length,val=0){
function rrot(x,shift){
return ((x>>>shift)|(x<<(32-shift)))&MASK;
}
function BLAKE2S(outputLen=32,key=[]){
this._buffer=[];
this._dataLen=0;
this._dataLen=[0,0]; // low, high
this._outputLen=outputLen;
this._state=IV.slice();
this._state[0]^=0x01010000^(key.length<<8)^this._outputLen;
if(key.length>0){this.update(padEnd(key,BLOCK_LEN,0));}
BLAKE2S.prototype.update=function(data){
for(let i=0;i<data.length;i++){
if(this._buffer.length<BLOCK_LEN){
this._buffer.push(data[i]);
this._dataLen++;
else{
if(this._buffer.length==BLOCK_LEN){
this._compress(false);
this._dataLen[0]=(this._dataLen[0]+1)&MASK;
if(this._dataLen[0]<this._buffer.length){this._dataLen[1]++;}
};
BLAKE2S.prototype.digest=function(){
this._buffer=padEnd(this._buffer,BLOCK_LEN,0);
this._compress(true);
@@ -54,14 +53,14 @@ BLAKE2S.prototype._compress=function(las
[12,5,1,15,14,13,4,10,0,7,6,3,9,2,8,11],
[13,11,7,14,12,1,3,9,5,0,15,4,8,6,2,10],
[6,15,14,9,11,3,0,8,12,2,13,7,1,4,10,5],
[10,2,8,4,7,6,1,5,15,11,9,14,3,12,13,0]
];
let v=this._state.concat(IV);
v[12]^=this._dataLen&MASK;
v[13]^=(this._dataLen/0x100000000)&MASK;
v[12]^=this._dataLen[0];
v[13]^=this._dataLen[1];
if(last){v[14]^=MASK;}
let data=bytes2int32s(this._buffer);
for(let i=0;i<10;i++){
let perm=SIGMA[i%10];
this._mix(v,0,4,8,12,data[perm[0]],data[perm[1]]);
@@ -73,13 +72,13 @@ BLAKE2S.prototype._compress=function(las
this._mix(v,1,6,11,12,data[perm[10]],data[perm[11]]);
this._mix(v,2,7,8,13,data[perm[12]],data[perm[13]]);
this._mix(v,3,4,9,14,data[perm[14]],data[perm[15]]);
this._state=this._state.map((x,i)=>x^v[i]^v[i+8]);
BLAKE2S.prototype._mix=function(arr,ia,ib,ic,id,x,y){
let a=arr[ia], b=arr[ib], c=arr[ic], d=arr[id];
a=(a+b+x)&MASK; d=rrot(d^a,16);
c=(c+d)&MASK; b=rrot(b^c,12);
a=(a+b+y)&MASK; d=rrot(d^a,8);
@@ -90,11 +89,20 @@ BLAKE2S.prototype._mix=function(arr,ia,i
function blake2s(data,outputLen=32,key=[]){
let h=new BLAKE2S(outputLen,key);
for(let i=0;i<data.length;i+=BLOCK_LEN){h.update(data.slice(i,i+BLOCK_LEN));}
return h.digest();
let msg=[97,98,99];
console.log(bytes2hex(blake2s(msg,msg.length,0,16))=="aa4938119b1dc7b87cbad0ffd200d0ae");
console.log(bytes2hex(blake2s(msg,msg.length,0,20))=="5ae3b99be29b01834c3b508521ede60438f8de17");
console.log(bytes2hex(blake2s(msg,msg.length,0,28))=="0b033fc226df7abde29f67a05d3dc62cf271ef3dfea4d387407fbd55");
console.log(bytes2hex(blake2s(msg,msg.length))=="508c5e8c327c14e2e1a72ba34eeb452f37458b209ed63a294d999b4c86675982");
let msg=str2utf8("abc");
let longMsg=str2utf8("0123456789.10.456789.20.456789.30.456789.40.456789.50.456789.60.456789.70.456789.80.456789.90.456789");
let key=str2utf8("zoqpiz");
let longKey=str2utf8("zoqpizjutyclcmkamzhhmhvchxjtefjy");
console.log(bytes2hex(blake2s(msg,16))=="aa4938119b1dc7b87cbad0ffd200d0ae");
console.log(bytes2hex(blake2s(msg,20))=="5ae3b99be29b01834c3b508521ede60438f8de17");
console.log(bytes2hex(blake2s(msg,28))=="0b033fc226df7abde29f67a05d3dc62cf271ef3dfea4d387407fbd55");
console.log(bytes2hex(blake2s(msg))=="508c5e8c327c14e2e1a72ba34eeb452f37458b209ed63a294d999b4c86675982");
console.log(bytes2hex(blake2s(longMsg))=="59a44e5e417d07fb382505ee7e67c23e0d476d354abc81899960bcab677beee1");
console.log(bytes2hex(blake2s(msg,32,key))=="0da0b6a54e8f294b60bb25c572700166ddb9d124257ff36f9f43f18b844adf9f");
console.log(bytes2hex(blake2s(msg,32,longKey))=="09ef85c9942bebdeb866c6ade769220fd9b851aead642017f6d59bf7e2a32037");
console.log(bytes2hex(blake2s([]))=="69217a3079908094e11121d042354a7c1f55b6482ca1a51e1b250dfd1ed0eef9");
console.log(bytes2hex(blake2s(longMsg.slice(0,64)))=="70484f89974551454d596350dda8af2aa6f0811b527549b9ecfe7adede063753");
console.log(bytes2hex(blake2s(longMsg.slice(0,65)))=="af14d4f74947bbde734d0e3015c667cc80676efe4349be235be8046e9e45e0ae");
@@ -28,13 +28,12 @@ function bytes2hex(arr){
function str2utf8(s){
let res=[];
let c=s.codePointAt(0);
for(let i=0;c!==undefined;i++,c=s.codePointAt(i)){
console.log(c);
if(c<0x80){res.push(c);}
else if(c<0x800){
res.push(0b11000000|(c>>>6));
res.push(0b10000000|(c&0b111111));
else if(c<0x10000){
Status change: