1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-22 16:18:09 +00:00

Add rc4_next_16_global() and fix address space of edata buffer in -m 13100 and -m18200

This commit is contained in:
Jens Steube 2021-06-23 08:36:17 +02:00
parent 6e8e44987d
commit b2193e1af4
14 changed files with 257 additions and 190 deletions

View File

@ -267,3 +267,69 @@ DECLSPEC u8 rc4_next_16 (LOCAL_AS u32 *S, const u8 i, const u8 j, const u32 *in,
return b;
}
DECLSPEC u8 rc4_next_16_global (LOCAL_AS u32 *S, const u8 i, const u8 j, GLOBAL_AS const u32 *in, u32 *out)
{
u8 a = i;
u8 b = j;
#ifdef _unroll
#pragma unroll
#endif
for (int k = 0; k < 4; k++)
{
u32 xor4 = 0;
u32 tmp;
u8 idx;
a += 1;
b += GET_KEY8 (S, a);
rc4_swap (S, a, b);
idx = GET_KEY8 (S, a) + GET_KEY8 (S, b);
tmp = GET_KEY8 (S, idx);
xor4 |= tmp << 0;
a += 1;
b += GET_KEY8 (S, a);
rc4_swap (S, a, b);
idx = GET_KEY8 (S, a) + GET_KEY8 (S, b);
tmp = GET_KEY8 (S, idx);
xor4 |= tmp << 8;
a += 1;
b += GET_KEY8 (S, a);
rc4_swap (S, a, b);
idx = GET_KEY8 (S, a) + GET_KEY8 (S, b);
tmp = GET_KEY8 (S, idx);
xor4 |= tmp << 16;
a += 1;
b += GET_KEY8 (S, a);
rc4_swap (S, a, b);
idx = GET_KEY8 (S, a) + GET_KEY8 (S, b);
tmp = GET_KEY8 (S, idx);
xor4 |= tmp << 24;
out[k] = in[k] ^ xor4;
}
return b;
}

View File

@ -10,9 +10,10 @@ DECLSPEC u8 GET_KEY8 (LOCAL_AS u32 *S, const u8 k);
DECLSPEC void SET_KEY8 (LOCAL_AS u32 *S, const u8 k, const u8 v);
DECLSPEC void SET_KEY32 (LOCAL_AS u32 *S, const u8 k, const u32 v);
DECLSPEC void rc4_init_40 (LOCAL_AS u32 *S, const u32 *key);
DECLSPEC void rc4_init_128 (LOCAL_AS u32 *S, const u32 *key);
DECLSPEC void rc4_swap (LOCAL_AS u32 *S, const u8 i, const u8 j);
DECLSPEC u8 rc4_next_16 (LOCAL_AS u32 *S, const u8 i, const u8 j, const u32 *in, u32 *out);
DECLSPEC void rc4_init_40 (LOCAL_AS u32 *S, const u32 *key);
DECLSPEC void rc4_init_128 (LOCAL_AS u32 *S, const u32 *key);
DECLSPEC void rc4_swap (LOCAL_AS u32 *S, const u8 i, const u8 j);
DECLSPEC u8 rc4_next_16 (LOCAL_AS u32 *S, const u8 i, const u8 j, const u32 *in, u32 *out);
DECLSPEC u8 rc4_next_16_global (LOCAL_AS u32 *S, const u8 i, const u8 j, GLOBAL_AS const u32 *in, u32 *out);
#endif // _INC_CIPHER_RC4_H

View File

@ -134,11 +134,11 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
next headers follow the same ASN1 "type-length-data" scheme
*/
j = rc4_next_16 (S, i, j, edata2 + 0, out0); i += 16;
j = rc4_next_16_global (S, i, j, edata2 + 0, out0); i += 16;
if (((out0[2] & 0xff00ffff) != 0x30008163) && ((out0[2] & 0x0000ffff) != 0x00008263)) return 0;
j = rc4_next_16 (S, i, j, edata2 + 4, out1); i += 16;
j = rc4_next_16_global (S, i, j, edata2 + 4, out1); i += 16;
if (((out1[0] & 0x00ffffff) != 0x00000503) && (out1[0] != 0x050307A0)) return 0;
@ -180,10 +180,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
for (edata2_left = edata2_len; edata2_left >= 64; edata2_left -= 64)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
md5_transform (w0, w1, w2, w3, ipad);
}
@ -207,7 +207,7 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
if (edata2_left < 16)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w0, edata2_left & 0xf);
@ -220,8 +220,8 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else if (edata2_left < 32)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w1, edata2_left & 0xf);
@ -234,9 +234,9 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else if (edata2_left < 48)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w2, edata2_left & 0xf);
@ -249,10 +249,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w3, edata2_left & 0xf);

View File

@ -48,11 +48,11 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
next headers follow the same ASN1 "type-length-data" scheme
*/
j = rc4_next_16 (S, i, j, edata2 + 0, out0); i += 16;
j = rc4_next_16_global (S, i, j, edata2 + 0, out0); i += 16;
if (((out0[2] & 0xff00ffff) != 0x30008163) && ((out0[2] & 0x0000ffff) != 0x00008263)) return 0;
j = rc4_next_16 (S, i, j, edata2 + 4, out1); i += 16;
j = rc4_next_16_global (S, i, j, edata2 + 4, out1); i += 16;
if (((out1[0] & 0x00ffffff) != 0x00000503) && (out1[0] != 0x050307A0)) return 0;
@ -93,10 +93,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
for (edata2_left = edata2_len; edata2_left >= 64; edata2_left -= 64)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
md5_hmac_update_64 (&ctx, w0, w1, w2, w3, 64);
}
@ -120,31 +120,31 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
if (edata2_left < 16)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w0, edata2_left & 0xf);
}
else if (edata2_left < 32)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w1, edata2_left & 0xf);
}
else if (edata2_left < 48)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w2, edata2_left & 0xf);
}
else
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w3, edata2_left & 0xf);
}

View File

@ -132,11 +132,11 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
next headers follow the same ASN1 "type-length-data" scheme
*/
j = rc4_next_16 (S, i, j, edata2 + 0, out0); i += 16;
j = rc4_next_16_global (S, i, j, edata2 + 0, out0); i += 16;
if (((out0[2] & 0xff00ffff) != 0x30008163) && ((out0[2] & 0x0000ffff) != 0x00008263)) return 0;
j = rc4_next_16 (S, i, j, edata2 + 4, out1); i += 16;
j = rc4_next_16_global (S, i, j, edata2 + 4, out1); i += 16;
if (((out1[0] & 0x00ffffff) != 0x00000503) && (out1[0] != 0x050307A0)) return 0;
@ -178,10 +178,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
for (edata2_left = edata2_len; edata2_left >= 64; edata2_left -= 64)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
md5_transform (w0, w1, w2, w3, ipad);
}
@ -205,7 +205,7 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
if (edata2_left < 16)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w0, edata2_left & 0xf);
@ -218,8 +218,8 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else if (edata2_left < 32)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w1, edata2_left & 0xf);
@ -232,9 +232,9 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else if (edata2_left < 48)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w2, edata2_left & 0xf);
@ -247,10 +247,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w3, edata2_left & 0xf);

View File

@ -46,11 +46,11 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
next headers follow the same ASN1 "type-length-data" scheme
*/
j = rc4_next_16 (S, i, j, edata2 + 0, out0); i += 16;
j = rc4_next_16_global (S, i, j, edata2 + 0, out0); i += 16;
if (((out0[2] & 0xff00ffff) != 0x30008163) && ((out0[2] & 0x0000ffff) != 0x00008263)) return 0;
j = rc4_next_16 (S, i, j, edata2 + 4, out1); i += 16;
j = rc4_next_16_global (S, i, j, edata2 + 4, out1); i += 16;
if (((out1[0] & 0x00ffffff) != 0x00000503) && (out1[0] != 0x050307A0)) return 0;
@ -91,10 +91,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
for (edata2_left = edata2_len; edata2_left >= 64; edata2_left -= 64)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
md5_hmac_update_64 (&ctx, w0, w1, w2, w3, 64);
}
@ -118,31 +118,31 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
if (edata2_left < 16)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w0, edata2_left & 0xf);
}
else if (edata2_left < 32)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w1, edata2_left & 0xf);
}
else if (edata2_left < 48)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w2, edata2_left & 0xf);
}
else
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w3, edata2_left & 0xf);
}

View File

@ -132,11 +132,11 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
next headers follow the same ASN1 "type-length-data" scheme
*/
j = rc4_next_16 (S, i, j, edata2 + 0, out0); i += 16;
j = rc4_next_16_global (S, i, j, edata2 + 0, out0); i += 16;
if (((out0[2] & 0xff00ffff) != 0x30008163) && ((out0[2] & 0x0000ffff) != 0x00008263)) return 0;
j = rc4_next_16 (S, i, j, edata2 + 4, out1); i += 16;
j = rc4_next_16_global (S, i, j, edata2 + 4, out1); i += 16;
if (((out1[0] & 0x00ffffff) != 0x00000503) && (out1[0] != 0x050307A0)) return 0;
@ -178,10 +178,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
for (edata2_left = edata2_len; edata2_left >= 64; edata2_left -= 64)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
md5_transform (w0, w1, w2, w3, ipad);
}
@ -205,7 +205,7 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
if (edata2_left < 16)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w0, edata2_left & 0xf);
@ -218,8 +218,8 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else if (edata2_left < 32)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w1, edata2_left & 0xf);
@ -232,9 +232,9 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else if (edata2_left < 48)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w2, edata2_left & 0xf);
@ -247,10 +247,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w3, edata2_left & 0xf);

View File

@ -46,11 +46,11 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
next headers follow the same ASN1 "type-length-data" scheme
*/
j = rc4_next_16 (S, i, j, edata2 + 0, out0); i += 16;
j = rc4_next_16_global (S, i, j, edata2 + 0, out0); i += 16;
if (((out0[2] & 0xff00ffff) != 0x30008163) && ((out0[2] & 0x0000ffff) != 0x00008263)) return 0;
j = rc4_next_16 (S, i, j, edata2 + 4, out1); i += 16;
j = rc4_next_16_global (S, i, j, edata2 + 4, out1); i += 16;
if (((out1[0] & 0x00ffffff) != 0x00000503) && (out1[0] != 0x050307A0)) return 0;
@ -91,10 +91,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
for (edata2_left = edata2_len; edata2_left >= 64; edata2_left -= 64)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
md5_hmac_update_64 (&ctx, w0, w1, w2, w3, 64);
}
@ -118,31 +118,31 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
if (edata2_left < 16)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w0, edata2_left & 0xf);
}
else if (edata2_left < 32)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w1, edata2_left & 0xf);
}
else if (edata2_left < 48)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w2, edata2_left & 0xf);
}
else
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w3, edata2_left & 0xf);
}

View File

@ -133,7 +133,7 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
length is on 3 bytes, the first byte is 0x82, and the fourth byte is 0x30 (class=SEQUENCE)
*/
rc4_next_16 (S, 0, 0, edata2 + 0, out0);
rc4_next_16_global (S, 0, 0, edata2 + 0, out0);
if (((out0[2] & 0x00ff80ff) != 0x00300079) &&
((out0[2] & 0xFF00FFFF) != 0x30008179) &&
@ -178,10 +178,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
for (edata2_left = edata2_len; edata2_left >= 64; edata2_left -= 64)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
md5_transform (w0, w1, w2, w3, ipad);
}
@ -205,7 +205,7 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
if (edata2_left < 16)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w0, edata2_left & 0xf);
@ -218,8 +218,8 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else if (edata2_left < 32)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w1, edata2_left & 0xf);
@ -232,9 +232,9 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else if (edata2_left < 48)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w2, edata2_left & 0xf);
@ -247,10 +247,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w3, edata2_left & 0xf);

View File

@ -47,7 +47,7 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
length is on 3 bytes, the first byte is 0x82, and the fourth byte is 0x30 (class=SEQUENCE)
*/
rc4_next_16 (S, 0, 0, edata2 + 0, out0);
rc4_next_16_global (S, 0, 0, edata2 + 0, out0);
if (((out0[2] & 0x00ff80ff) != 0x00300079) &&
((out0[2] & 0xFF00FFFF) != 0x30008179) &&
@ -91,10 +91,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
for (edata2_left = edata2_len; edata2_left >= 64; edata2_left -= 64)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
md5_hmac_update_64 (&ctx, w0, w1, w2, w3, 64);
}
@ -118,31 +118,31 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
if (edata2_left < 16)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w0, edata2_left & 0xf);
}
else if (edata2_left < 32)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w1, edata2_left & 0xf);
}
else if (edata2_left < 48)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w2, edata2_left & 0xf);
}
else
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w3, edata2_left & 0xf);
}

View File

@ -131,7 +131,7 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
length is on 3 bytes, the first byte is 0x82, and the fourth byte is 0x30 (class=SEQUENCE)
*/
rc4_next_16 (S, 0, 0, edata2 + 0, out0);
rc4_next_16_global (S, 0, 0, edata2 + 0, out0);
if (((out0[2] & 0x00ff80ff) != 0x00300079) &&
((out0[2] & 0xFF00FFFF) != 0x30008179) &&
@ -176,10 +176,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
for (edata2_left = edata2_len; edata2_left >= 64; edata2_left -= 64)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
md5_transform (w0, w1, w2, w3, ipad);
}
@ -203,7 +203,7 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
if (edata2_left < 16)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w0, edata2_left & 0xf);
@ -216,8 +216,8 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else if (edata2_left < 32)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w1, edata2_left & 0xf);
@ -230,9 +230,9 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else if (edata2_left < 48)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w2, edata2_left & 0xf);
@ -245,10 +245,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w3, edata2_left & 0xf);

View File

@ -45,7 +45,7 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
length is on 3 bytes, the first byte is 0x82, and the fourth byte is 0x30 (class=SEQUENCE)
*/
rc4_next_16 (S, 0, 0, edata2 + 0, out0);
rc4_next_16_global (S, 0, 0, edata2 + 0, out0);
if (((out0[2] & 0x00ff80ff) != 0x00300079) &&
((out0[2] & 0xFF00FFFF) != 0x30008179) &&
@ -89,10 +89,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
for (edata2_left = edata2_len; edata2_left >= 64; edata2_left -= 64)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
md5_hmac_update_64 (&ctx, w0, w1, w2, w3, 64);
}
@ -116,31 +116,31 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
if (edata2_left < 16)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w0, edata2_left & 0xf);
}
else if (edata2_left < 32)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w1, edata2_left & 0xf);
}
else if (edata2_left < 48)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w2, edata2_left & 0xf);
}
else
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w3, edata2_left & 0xf);
}

View File

@ -131,7 +131,7 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
length is on 3 bytes, the first byte is 0x82, and the fourth byte is 0x30 (class=SEQUENCE)
*/
rc4_next_16 (S, 0, 0, edata2 + 0, out0);
rc4_next_16_global (S, 0, 0, edata2 + 0, out0);
if (((out0[2] & 0x00ff80ff) != 0x00300079) &&
((out0[2] & 0xFF00FFFF) != 0x30008179) &&
@ -176,10 +176,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
for (edata2_left = edata2_len; edata2_left >= 64; edata2_left -= 64)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
md5_transform (w0, w1, w2, w3, ipad);
}
@ -203,7 +203,7 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
if (edata2_left < 16)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w0, edata2_left & 0xf);
@ -216,8 +216,8 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else if (edata2_left < 32)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w1, edata2_left & 0xf);
@ -230,9 +230,9 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else if (edata2_left < 48)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w2, edata2_left & 0xf);
@ -245,10 +245,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
}
else
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w3, edata2_left & 0xf);

View File

@ -45,7 +45,7 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
length is on 3 bytes, the first byte is 0x82, and the fourth byte is 0x30 (class=SEQUENCE)
*/
rc4_next_16 (S, 0, 0, edata2 + 0, out0);
rc4_next_16_global (S, 0, 0, edata2 + 0, out0);
if (((out0[2] & 0x00ff80ff) != 0x00300079) &&
((out0[2] & 0xFF00FFFF) != 0x30008179) &&
@ -89,10 +89,10 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
for (edata2_left = edata2_len; edata2_left >= 64; edata2_left -= 64)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
md5_hmac_update_64 (&ctx, w0, w1, w2, w3, 64);
}
@ -116,31 +116,31 @@ DECLSPEC int decrypt_and_check (LOCAL_AS u32 *S, u32 *data, GLOBAL_AS const u32
if (edata2_left < 16)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w0, edata2_left & 0xf);
}
else if (edata2_left < 32)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w1, edata2_left & 0xf);
}
else if (edata2_left < 48)
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w2, edata2_left & 0xf);
}
else
{
j = rc4_next_16 (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16 (S, i, j, edata2, w3); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w0); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w1); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w2); i += 16; edata2 += 4;
j = rc4_next_16_global (S, i, j, edata2, w3); i += 16; edata2 += 4;
truncate_block_4x4_le_S (w3, edata2_left & 0xf);
}