george/PrivateBin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ecc' of github.com:sqs/sjcl into srp

Browse Source 
Conflicts:
	config.mk
	sjcl.js
This commit is contained in:
Quinn Slack
2011-04-19 02:42:39 -07:00
parent 909a503be0 54f531d8c2
commit 71c84f1606
14 changed files with 1622 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/ocb2.js
View File

@@ -50,7 +50,8 @@ sjcl.mode.ocb2 = {
/* Encrypt a non-final block */
bi = plaintext.slice(i,i+4);
checksum = xor(checksum, bi);
output = output.concat(xor(delta,prp.encrypt(xor(delta, bi))));
bi = xor(delta,prp.encrypt(xor(delta, bi)));
output.splice(i,0,bi[0],bi[1],bi[2],bi[3]);
delta = times2(delta);
}
@@ -105,7 +106,7 @@ sjcl.mode.ocb2 = {
/* Decrypt a non-final block */
bi = xor(delta, prp.decrypt(xor(delta, ciphertext.slice(i,i+4))));
checksum = xor(checksum, bi);
output = output.concat(bi);
output.splice(i,0,bi[0],bi[1],bi[2],bi[3]);
delta = times2(delta);
}