CryptoJS Changeset - 64020ac8e211

Changeset - 64020ac8e211

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Laman - 5 years ago 2019-07-05 13:46:34

added key stretching with PBKDF2

3 files changed with 29 insertions and 8 deletions:

src/blake.js

src/chacha.js

src/main.js

0 comments (0 inline, 0 general)

src/blake.js

➞

Show inline comments

 // https://tools.ietf.org/html/rfc7693
 import {MASK,int32s2bytes,bytes2int32s,zeroPad} from "./util.js";
 const BLOCK_LEN=64;
 const IV=[0x6A09E667,0xBB67AE85,0x3C6EF372,0xA54FF53A,0x510E527F,0x9B05688C,0x1F83D9AB,0x5BE0CD19];
 function rrot(x,shift){
 	return ((x>>>shift)|(x<<(32-shift)))&MASK;
+}
 /**
  * @param {number} outputLen output length in bytes, 1<=x<=32
  * @param {Array} key byte array, 0<=key.length<=32
  * @returns {BLAKE2S}
  */
 export function BLAKE2S(outputLen=32,key=[]){
 	this._buffer=[];
 	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(zeroPad(key,BLOCK_LEN));}
+}
 BLAKE2S.prototype.update=function(data){
 	for(let i=0;i<data.length;i++){
 		if(this._buffer.length==BLOCK_LEN){
 			this._compress(false);
 			this._buffer=[];
+		}
 		this._buffer.push(data[i]);
 		this._dataLen[0]=(this._dataLen[0]+1)&MASK;
 		if(this._dataLen[0]<this._buffer.length){this._dataLen[1]++;}
+	}
 };
 BLAKE2S.prototype.digest=function(){
 	this._buffer=zeroPad(this._buffer,BLOCK_LEN);
 	this._compress(true);
 	return int32s2bytes(this._state).slice(0,this._outputLen);
 };
 BLAKE2S.prototype._compress=function(last){
 	const SIGMA=[
 		[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15],
 		[14,10,4,8,9,15,13,6,1,12,0,2,11,7,5,3],
 		[11,8,12,0,5,2,15,13,10,14,3,6,7,1,9,4],
 		[7,9,3,1,13,12,11,14,2,6,5,10,4,0,15,8],
 		[9,0,5,7,2,4,10,15,14,1,11,12,6,8,3,13],
 		[2,12,6,10,0,11,8,3,4,13,7,5,15,14,1,9],
 		[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[0];
 	v[13]^=this._dataLen[1];
 	if(last){v[14]^=MASK;}
 	let data=bytes2int32s(this._buffer);

src/chacha.js

➞

Show inline comments

 // https://tools.ietf.org/html/rfc7539
 import {MASK,int32s2bytes,bytes2int32s,zeroPad} from "./util.js";
 function lrot(x,shift){
 	return (x<<shift|x>>>(32-shift))&MASK;
+}
 function createNonce(){
+export function createNonce(){
 	let nonce=new Uint8Array(12);
 	window.crypto.getRandomValues(nonce);
 	return Array.from(nonce);
+}
 /**
  * A Chacha20 cipher class.
  * @param {Array} key Array of bytes (integers: 0<=x<256). Short keys are padded to 32B, long keys are silently truncated.
  * @param {Array} nonce optional. If present, it must be an Array of bytes (integers: 0<=x<256). Short nonces are padded to 12B, long nonces are silently truncated.
  */
 export function Chacha20(key,nonce){
 	if(nonce===undefined){
 		nonce=createNonce();
+	}
 	this._nonce=zeroPad(nonce,12);
 	nonce=bytes2int32s(this._nonce);
 	key=bytes2int32s(zeroPad(key,32));
 	this._state=[
 x61707865,0x3320646e,0x79622d32,0x6b206574,
 		key[0],key[1],key[2],key[3],
 		key[4],key[5],key[6],key[7],
 ,nonce[0],nonce[1],nonce[2]
 	];
 	this._buffer=[];
+}
 Chacha20.prototype.setPos=function(pos){
 	this._state[12]=pos;
 	this._buffer=[];
+}
 Chacha20.prototype.getByte=function(){
 	if(this._buffer.length==0){
 		this._buffer=int32s2bytes(this._computeBlock());
 		this._incrementPos();
+	}
 	return this._buffer.shift();
 };
 Chacha20.prototype.getNonce=function(){
 	return this._nonce.concat();
 };
 Chacha20.prototype._quarterRound=function(arr,ia,ib,ic,id){
 	let a=arr[ia], b=arr[ib], c=arr[ic], d=arr[id];
 	a=(a+b)&MASK; d=lrot(d^a,16);
 	c=(c+d)&MASK; b=lrot(b^c,12);

src/main.js

➞

Show inline comments

 import * as util from "./util.js";
 import {blake2s} from "./blake.js";
 import {pbkdf2} from "./pbkdf2.js";
 import {Chacha20,encrypt as _encrypt,decrypt as _decrypt} from "./chacha.js";
+import {createNonce,Chacha20,encrypt as _encrypt,decrypt as _decrypt} from "./chacha.js";
 const VERSION=1;
 function encrypt(s,password){
 	let bs=util.str2utf8(s);
 	let pass=util.str2utf8(password);
 	let noncedCiphertext=_encrypt(bs,pass);
 	let signature=blake2s([VERSION].concat(noncedCiphertext),16,pass);
 	let arr=[VERSION].concat(signature,noncedCiphertext);
 	let salt=createNonce();
 	let [iters,key]=stretchKey(pass,salt);
 	let noncedCiphertext=_encrypt(bs,key,salt);
 	let payload=[iters].concat(noncedCiphertext);
 	let signature=blake2s([VERSION].concat(payload),16,pass);
 	let arr=[VERSION].concat(signature,payload);
 	return util.bytes2base64(arr);
+}
 function decrypt(s,password){
 	let pass=util.str2utf8(password);
 	let arr=util.base642bytes(s);
 	let version=arr[0];
 	let signature=arr.slice(1,17);
 	let noncedCiphertext=arr.slice(17);
 	let check=blake2s([version].concat(noncedCiphertext),16,pass);
 	let iters=arr[17];
 	let salt=arr.slice(18,30);
 	let noncedCiphertext=arr.slice(18);
 	let check=blake2s([version].concat([iters],noncedCiphertext),16,pass);
 	if(!signature.every((b,i)=>b===check[i])){return false;}
 	if(version>VERSION){return false;}
 	let plainbytes=_decrypt(noncedCiphertext,pass);
 	let key=pbkdf2(pass,salt,1<<iters,32);
 	let plainbytes=_decrypt(noncedCiphertext,key);
 	return util.utf82str(plainbytes);
+}
 function stretchKey(password,salt){
 	let start=Date.now(); // ms
 	let i,key;
 	for(i=0;i<256;i++){
 		key=pbkdf2(password,salt,1<<i,32);
 		if(Date.now()-start>=500){break;}
+	}
 	return [i,key];
+}
 export default {util,blake2s,pbkdf2,Chacha20,encrypt,decrypt};
 // export for tests running on Node
 if(typeof module!=='undefined'&&module.hasOwnProperty('exports')){
 	module.exports.util=util;
 	module.exports.blake2s=blake2s;
 	module.exports.pbkdf2=pbkdf2;
 	module.exports.Chacha20=Chacha20;
 	module.exports.encrypt=_encrypt;
 	module.exports.decrypt=_decrypt;
+}

0 comments (0 inline, 0 general)