RC4: Update -m 97x0 and -m 104x0 to new RC4 crypto library code, improving performance by 20% or more
This commit is contained in:
@@ -13,6 +13,7 @@
|
||||
#include "inc_common.cl"
|
||||
#include "inc_simd.cl"
|
||||
#include "inc_hash_md5.cl"
|
||||
#include "inc_cipher_rc4.cl"
|
||||
#endif
|
||||
|
||||
typedef struct oldoffice01
|
||||
@@ -24,129 +25,6 @@ typedef struct oldoffice01
|
||||
|
||||
} oldoffice01_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
u8 S[256];
|
||||
|
||||
u32 wtf_its_faster;
|
||||
|
||||
} RC4_KEY;
|
||||
|
||||
DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j)
|
||||
{
|
||||
u8 tmp;
|
||||
|
||||
tmp = rc4_key->S[i];
|
||||
rc4_key->S[i] = rc4_key->S[j];
|
||||
rc4_key->S[j] = tmp;
|
||||
}
|
||||
|
||||
DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data)
|
||||
{
|
||||
u32 v = 0x03020100;
|
||||
u32 a = 0x04040404;
|
||||
|
||||
LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S;
|
||||
|
||||
#ifdef _unroll
|
||||
#pragma unroll
|
||||
#endif
|
||||
for (u32 i = 0; i < 64; i++)
|
||||
{
|
||||
*ptr++ = v; v += a;
|
||||
}
|
||||
|
||||
u32 j = 0;
|
||||
|
||||
for (u32 i = 0; i < 16; i++)
|
||||
{
|
||||
u32 idx = i * 16;
|
||||
|
||||
u32 v;
|
||||
|
||||
v = data[0];
|
||||
|
||||
j += rc4_key->S[idx] + (v >> 0); swap (rc4_key, idx, j); idx++;
|
||||
j += rc4_key->S[idx] + (v >> 8); swap (rc4_key, idx, j); idx++;
|
||||
j += rc4_key->S[idx] + (v >> 16); swap (rc4_key, idx, j); idx++;
|
||||
j += rc4_key->S[idx] + (v >> 24); swap (rc4_key, idx, j); idx++;
|
||||
|
||||
v = data[1];
|
||||
|
||||
j += rc4_key->S[idx] + (v >> 0); swap (rc4_key, idx, j); idx++;
|
||||
j += rc4_key->S[idx] + (v >> 8); swap (rc4_key, idx, j); idx++;
|
||||
j += rc4_key->S[idx] + (v >> 16); swap (rc4_key, idx, j); idx++;
|
||||
j += rc4_key->S[idx] + (v >> 24); swap (rc4_key, idx, j); idx++;
|
||||
|
||||
v = data[2];
|
||||
|
||||
j += rc4_key->S[idx] + (v >> 0); swap (rc4_key, idx, j); idx++;
|
||||
j += rc4_key->S[idx] + (v >> 8); swap (rc4_key, idx, j); idx++;
|
||||
j += rc4_key->S[idx] + (v >> 16); swap (rc4_key, idx, j); idx++;
|
||||
j += rc4_key->S[idx] + (v >> 24); swap (rc4_key, idx, j); idx++;
|
||||
|
||||
v = data[3];
|
||||
|
||||
j += rc4_key->S[idx] + (v >> 0); swap (rc4_key, idx, j); idx++;
|
||||
j += rc4_key->S[idx] + (v >> 8); swap (rc4_key, idx, j); idx++;
|
||||
j += rc4_key->S[idx] + (v >> 16); swap (rc4_key, idx, j); idx++;
|
||||
j += rc4_key->S[idx] + (v >> 24); swap (rc4_key, idx, j); idx++;
|
||||
}
|
||||
}
|
||||
|
||||
DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out)
|
||||
{
|
||||
#ifdef _unroll
|
||||
#pragma unroll
|
||||
#endif
|
||||
for (u32 k = 0; k < 4; k++)
|
||||
{
|
||||
u32 xor4 = 0;
|
||||
|
||||
u8 idx;
|
||||
|
||||
i += 1;
|
||||
j += rc4_key->S[i];
|
||||
|
||||
swap (rc4_key, i, j);
|
||||
|
||||
idx = rc4_key->S[i] + rc4_key->S[j];
|
||||
|
||||
xor4 |= rc4_key->S[idx] << 0;
|
||||
|
||||
i += 1;
|
||||
j += rc4_key->S[i];
|
||||
|
||||
swap (rc4_key, i, j);
|
||||
|
||||
idx = rc4_key->S[i] + rc4_key->S[j];
|
||||
|
||||
xor4 |= rc4_key->S[idx] << 8;
|
||||
|
||||
i += 1;
|
||||
j += rc4_key->S[i];
|
||||
|
||||
swap (rc4_key, i, j);
|
||||
|
||||
idx = rc4_key->S[i] + rc4_key->S[j];
|
||||
|
||||
xor4 |= rc4_key->S[idx] << 16;
|
||||
|
||||
i += 1;
|
||||
j += rc4_key->S[i];
|
||||
|
||||
swap (rc4_key, i, j);
|
||||
|
||||
idx = rc4_key->S[i] + rc4_key->S[j];
|
||||
|
||||
xor4 |= rc4_key->S[idx] << 24;
|
||||
|
||||
out[k] = in[k] ^ xor4;
|
||||
}
|
||||
|
||||
return j;
|
||||
}
|
||||
|
||||
KERNEL_FQ void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t))
|
||||
{
|
||||
/**
|
||||
@@ -181,9 +59,7 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t))
|
||||
* shared
|
||||
*/
|
||||
|
||||
LOCAL_VK RC4_KEY rc4_keys[64];
|
||||
|
||||
LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid];
|
||||
LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE];
|
||||
|
||||
/**
|
||||
* esalt
|
||||
@@ -287,11 +163,11 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t))
|
||||
|
||||
// now the RC4 part
|
||||
|
||||
rc4_init_16 (rc4_key, digest);
|
||||
rc4_init_128 (S, digest);
|
||||
|
||||
u32 out[4];
|
||||
|
||||
u8 j = rc4_next_16 (rc4_key, 0, 0, encryptedVerifier, out);
|
||||
u8 j = rc4_next_16 (S, 0, 0, encryptedVerifier, out);
|
||||
|
||||
w0[0] = out[0];
|
||||
w0[1] = out[1];
|
||||
@@ -317,7 +193,7 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t))
|
||||
|
||||
md5_transform (w0, w1, w2, w3, digest);
|
||||
|
||||
rc4_next_16 (rc4_key, 16, j, digest, out);
|
||||
rc4_next_16 (S, 16, j, digest, out);
|
||||
|
||||
COMPARE_M_SIMD (out[0], out[1], out[2], out[3]);
|
||||
}
|
||||
@@ -365,9 +241,7 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t))
|
||||
* shared
|
||||
*/
|
||||
|
||||
LOCAL_VK RC4_KEY rc4_keys[64];
|
||||
|
||||
LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid];
|
||||
LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE];
|
||||
|
||||
/**
|
||||
* esalt
|
||||
@@ -483,11 +357,11 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t))
|
||||
|
||||
// now the RC4 part
|
||||
|
||||
rc4_init_16 (rc4_key, digest);
|
||||
rc4_init_128 (S, digest);
|
||||
|
||||
u32 out[4];
|
||||
|
||||
u8 j = rc4_next_16 (rc4_key, 0, 0, encryptedVerifier, out);
|
||||
u8 j = rc4_next_16 (S, 0, 0, encryptedVerifier, out);
|
||||
|
||||
w0[0] = out[0];
|
||||
w0[1] = out[1];
|
||||
@@ -513,7 +387,7 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t))
|
||||
|
||||
md5_transform (w0, w1, w2, w3, digest);
|
||||
|
||||
rc4_next_16 (rc4_key, 16, j, digest, out);
|
||||
rc4_next_16 (S, 16, j, digest, out);
|
||||
|
||||
COMPARE_S_SIMD (out[0], out[1], out[2], out[3]);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user