Fix jslint warnings and refactor small issues.

This commit is contained in:
Kalervo Kujala 2011-11-06 22:17:20 +02:00
parent b321768f59
commit 89a6c4fc88

View File

@ -26,7 +26,6 @@ var ARCFourCipher = (function arcFourCipher() {
var a = this.a, b = this.b, s = this.s; var a = this.a, b = this.b, s = this.s;
var output = new Uint8Array(n); var output = new Uint8Array(n);
for (i = 0; i < n; ++i) { for (i = 0; i < n; ++i) {
var tmp;
a = (a + 1) & 0xFF; a = (a + 1) & 0xFF;
tmp = s[a]; tmp = s[a];
b = (b + tmp) & 0xFF; b = (b + tmp) & 0xFF;
@ -75,8 +74,8 @@ var calculateMD5 = (function calculateMD5() {
padded[i] = data[offset++]; padded[i] = data[offset++];
padded[i++] = 0x80; padded[i++] = 0x80;
n = paddedLength - 8; n = paddedLength - 8;
for (; i < n; ++i) while (i < n)
padded[i] = 0; padded[i++] = 0;
padded[i++] = (length << 3) & 0xFF; padded[i++] = (length << 3) & 0xFF;
padded[i++] = (length >> 5) & 0xFF; padded[i++] = (length >> 5) & 0xFF;
padded[i++] = (length >> 13) & 0xFF; padded[i++] = (length >> 13) & 0xFF;
@ -322,12 +321,12 @@ var AES128Cipher = (function aes128Cipher() {
state[10] = state[2]; state[6] = t; state[2] = u; state[10] = state[2]; state[6] = t; state[2] = u;
t = state[15]; u = state[11]; v = state[7]; state[15] = state[3]; t = state[15]; u = state[11]; v = state[7]; state[15] = state[3];
state[11] = t; state[7] = u; state[3] = v; state[11] = t; state[7] = u; state[3] = v;
// InvSubBytes for (j = 0; j < 16; ++j) {
for (j = 0; j < 16; ++j) // InvSubBytes
state[j] = inv_s[state[j]]; state[j] = inv_s[state[j]];
// AddRoundKey // AddRoundKey
for (j = 0; j < 16; ++j)
state[j] ^= key[j]; state[j] ^= key[j];
}
return state; return state;
} }
@ -471,11 +470,11 @@ var CipherTransformFactory = (function cipherTransformFactory() {
cipher = new ARCFourCipher(encryptionKey); cipher = new ARCFourCipher(encryptionKey);
var checkData = cipher.encryptBlock(calculateMD5(hashData, 0, i)); var checkData = cipher.encryptBlock(calculateMD5(hashData, 0, i));
n = encryptionKey.length; n = encryptionKey.length;
var derrivedKey = new Uint8Array(n), k; var derivedKey = new Uint8Array(n), k;
for (j = 1; j <= 19; ++j) { for (j = 1; j <= 19; ++j) {
for (k = 0; k < n; ++k) for (k = 0; k < n; ++k)
derrivedKey[k] = encryptionKey[k] ^ j; derivedKey[k] = encryptionKey[k] ^ j;
cipher = new ARCFourCipher(derrivedKey); cipher = new ARCFourCipher(derivedKey);
checkData = cipher.encryptBlock(checkData); checkData = cipher.encryptBlock(checkData);
} }
} else { } else {