arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-23 07:08:19 +00:00
Code Issues Releases Wiki Activity

PDF: Update -m 10400 and -m 10410 to new RC4 crypto library code, improving performance by 20% or more

Browse Source
This commit is contained in:
Jens Steube 2021-05-30 14:35:28 +02:00
parent 3192f55707
commit 58467e0869
5 changed files with 73 additions and 428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
OpenCL/m10400_a0-optimized.cl
View File

@ -15,6 +15,7 @@
#include "inc_rp_optimized.cl" #include "inc_rp_optimized.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_md5.cl" #include "inc_hash_md5.cl"
#include "inc_cipher_rc4.cl"
#endif #endif
CONSTANT_VK u32a padding[8] = CONSTANT_VK u32a padding[8] =
@ -50,115 +51,7 @@ typedef struct pdf
} pdf_t; } pdf_t;
typedef struct KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m04 (KERN_ATTR_RULES_ESALT (pdf_t))
{
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[i] = v; v += a;
}
const u32 d0 = data[0] >> 0;
const u32 d1 = data[0] >> 8;
const u32 d2 = data[0] >> 16;
const u32 d3 = data[0] >> 24;
const u32 d4 = data[1] >> 0;
u32 j = 0;
#ifdef _unroll
#pragma unroll
#endif
for (u32 i = 0; i < 255; i += 5)
{
j += rc4_key->S[i + 0] + d0; swap (rc4_key, i + 0, j);
j += rc4_key->S[i + 1] + d1; swap (rc4_key, i + 1, j);
j += rc4_key->S[i + 2] + d2; swap (rc4_key, i + 2, j);
j += rc4_key->S[i + 3] + d3; swap (rc4_key, i + 3, j);
j += rc4_key->S[i + 4] + d4; swap (rc4_key, i + 4, j);
}
j += rc4_key->S[255] + d0; swap (rc4_key, 255, j);
}
DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, CONSTANT_AS u32a *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 m10400_m04 (KERN_ATTR_RULES_ESALT (pdf_t))
{ {
/** /**
* modifier * modifier
@ -192,9 +85,7 @@ KERNEL_FQ void m10400_m04 (KERN_ATTR_RULES_ESALT (pdf_t))
* shared * shared
*/ */
LOCAL_VK RC4_KEY rc4_keys[64]; LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE];
LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid];
/** /**
* U_buf * U_buf
@ -316,25 +207,25 @@ KERNEL_FQ void m10400_m04 (KERN_ATTR_RULES_ESALT (pdf_t))
digest[2] = 0; digest[2] = 0;
digest[3] = 0; digest[3] = 0;
rc4_init_16 (rc4_key, digest); rc4_init_16 (S, digest);
u32 out[4]; u32 out[4];
rc4_next_16 (rc4_key, 0, 0, padding, out); rc4_next_16 (S, 0, 0, padding, out);
COMPARE_M_SIMD (out[0], out[1], out[2], out[3]); COMPARE_M_SIMD (out[0], out[1], out[2], out[3]);
} }
} }
KERNEL_FQ void m10400_m08 (KERN_ATTR_RULES_ESALT (pdf_t)) KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m08 (KERN_ATTR_RULES_ESALT (pdf_t))
{ {
} }
KERNEL_FQ void m10400_m16 (KERN_ATTR_RULES_ESALT (pdf_t)) KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m16 (KERN_ATTR_RULES_ESALT (pdf_t))
{ {
} }
KERNEL_FQ void m10400_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s04 (KERN_ATTR_RULES_ESALT (pdf_t))
{ {
/** /**
* modifier * modifier
@ -368,9 +259,7 @@ KERNEL_FQ void m10400_s04 (KERN_ATTR_RULES_ESALT (pdf_t))
* shared * shared
*/ */
LOCAL_VK RC4_KEY rc4_keys[64]; LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE];
LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid];
/** /**
* U_buf * U_buf
@ -504,20 +393,20 @@ KERNEL_FQ void m10400_s04 (KERN_ATTR_RULES_ESALT (pdf_t))
digest[2] = 0; digest[2] = 0;
digest[3] = 0; digest[3] = 0;
rc4_init_16 (rc4_key, digest); rc4_init_16 (S, digest);
u32 out[4]; u32 out[4];
rc4_next_16 (rc4_key, 0, 0, padding, out); rc4_next_16 (S, 0, 0, padding, out);
COMPARE_S_SIMD (out[0], out[1], out[2], out[3]); COMPARE_S_SIMD (out[0], out[1], out[2], out[3]);
} }
} }
KERNEL_FQ void m10400_s08 (KERN_ATTR_RULES_ESALT (pdf_t)) KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s08 (KERN_ATTR_RULES_ESALT (pdf_t))
{ {
} }
KERNEL_FQ void m10400_s16 (KERN_ATTR_RULES_ESALT (pdf_t)) KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s16 (KERN_ATTR_RULES_ESALT (pdf_t))
{ {
} }

137
OpenCL/m10400_a1-optimized.cl
View File

@ -13,6 +13,7 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_md5.cl" #include "inc_hash_md5.cl"
#include "inc_cipher_rc4.cl"
#endif #endif
CONSTANT_VK u32a padding[8] = CONSTANT_VK u32a padding[8] =
@ -48,115 +49,7 @@ typedef struct pdf
} pdf_t; } pdf_t;
typedef struct KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m04 (KERN_ATTR_ESALT (pdf_t))
{
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[i] = v; v += a;
}
const u32 d0 = data[0] >> 0;
const u32 d1 = data[0] >> 8;
const u32 d2 = data[0] >> 16;
const u32 d3 = data[0] >> 24;
const u32 d4 = data[1] >> 0;
u32 j = 0;
#ifdef _unroll
#pragma unroll
#endif
for (u32 i = 0; i < 255; i += 5)
{
j += rc4_key->S[i + 0] + d0; swap (rc4_key, i + 0, j);
j += rc4_key->S[i + 1] + d1; swap (rc4_key, i + 1, j);
j += rc4_key->S[i + 2] + d2; swap (rc4_key, i + 2, j);
j += rc4_key->S[i + 3] + d3; swap (rc4_key, i + 3, j);
j += rc4_key->S[i + 4] + d4; swap (rc4_key, i + 4, j);
}
j += rc4_key->S[255] + d0; swap (rc4_key, 255, j);
}
DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, CONSTANT_AS u32a *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 m10400_m04 (KERN_ATTR_ESALT (pdf_t))
{ {
/** /**
* modifier * modifier
@ -190,9 +83,7 @@ KERNEL_FQ void m10400_m04 (KERN_ATTR_ESALT (pdf_t))
* shared * shared
*/ */
LOCAL_VK RC4_KEY rc4_keys[64]; LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE];
LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid];
/** /**
* U_buf * U_buf
@ -374,25 +265,25 @@ KERNEL_FQ void m10400_m04 (KERN_ATTR_ESALT (pdf_t))
digest[2] = 0; digest[2] = 0;
digest[3] = 0; digest[3] = 0;
rc4_init_16 (rc4_key, digest); rc4_init_16 (S, digest);
u32 out[4]; u32 out[4];
rc4_next_16 (rc4_key, 0, 0, padding, out); rc4_next_16 (S, 0, 0, padding, out);
COMPARE_M_SIMD (out[0], out[1], out[2], out[3]); COMPARE_M_SIMD (out[0], out[1], out[2], out[3]);
} }
} }
KERNEL_FQ void m10400_m08 (KERN_ATTR_ESALT (pdf_t)) KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m08 (KERN_ATTR_ESALT (pdf_t))
{ {
} }
KERNEL_FQ void m10400_m16 (KERN_ATTR_ESALT (pdf_t)) KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m16 (KERN_ATTR_ESALT (pdf_t))
{ {
} }
KERNEL_FQ void m10400_s04 (KERN_ATTR_ESALT (pdf_t)) KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s04 (KERN_ATTR_ESALT (pdf_t))
{ {
/** /**
* modifier * modifier
@ -426,9 +317,7 @@ KERNEL_FQ void m10400_s04 (KERN_ATTR_ESALT (pdf_t))
* shared * shared
*/ */
LOCAL_VK RC4_KEY rc4_keys[64]; LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE];
LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid];
/** /**
* U_buf * U_buf
@ -622,20 +511,20 @@ KERNEL_FQ void m10400_s04 (KERN_ATTR_ESALT (pdf_t))
digest[2] = 0; digest[2] = 0;
digest[3] = 0; digest[3] = 0;
rc4_init_16 (rc4_key, digest); rc4_init_16 (S, digest);
u32 out[4]; u32 out[4];
rc4_next_16 (rc4_key, 0, 0, padding, out); rc4_next_16 (S, 0, 0, padding, out);
COMPARE_S_SIMD (out[0], out[1], out[2], out[3]); COMPARE_S_SIMD (out[0], out[1], out[2], out[3]);
} }
} }
KERNEL_FQ void m10400_s08 (KERN_ATTR_ESALT (pdf_t)) KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s08 (KERN_ATTR_ESALT (pdf_t))
{ {
} }
KERNEL_FQ void m10400_s16 (KERN_ATTR_ESALT (pdf_t)) KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s16 (KERN_ATTR_ESALT (pdf_t))
{ {
} }

167
OpenCL/m10400_a3-optimized.cl
View File

@ -13,6 +13,7 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_md5.cl" #include "inc_hash_md5.cl"
#include "inc_cipher_rc4.cl"
#endif #endif
CONSTANT_VK u32a padding[8] = CONSTANT_VK u32a padding[8] =
@ -48,115 +49,7 @@ typedef struct pdf
} pdf_t; } pdf_t;
typedef struct DECLSPEC void m10400m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (pdf_t))
{
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[i] = v; v += a;
}
const u32 d0 = data[0] >> 0;
const u32 d1 = data[0] >> 8;
const u32 d2 = data[0] >> 16;
const u32 d3 = data[0] >> 24;
const u32 d4 = data[1] >> 0;
u32 j = 0;
#ifdef _unroll
#pragma unroll
#endif
for (u32 i = 0; i < 255; i += 5)
{
j += rc4_key->S[i + 0] + d0; swap (rc4_key, i + 0, j);
j += rc4_key->S[i + 1] + d1; swap (rc4_key, i + 1, j);
j += rc4_key->S[i + 2] + d2; swap (rc4_key, i + 2, j);
j += rc4_key->S[i + 3] + d3; swap (rc4_key, i + 3, j);
j += rc4_key->S[i + 4] + d4; swap (rc4_key, i + 4, j);
}
j += rc4_key->S[255] + d0; swap (rc4_key, 255, j);
}
DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, CONSTANT_AS u32a *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;
}
DECLSPEC void m10400m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (pdf_t))
{ {
/** /**
* modifier * modifier
@ -165,12 +58,6 @@ DECLSPEC void m10400m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u3
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
const u64 lid = get_local_id (0); const u64 lid = get_local_id (0);
/**
* shared
*/
LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid];
/** /**
* U_buf * U_buf
*/ */
@ -312,17 +199,17 @@ DECLSPEC void m10400m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u3
digest[2] = 0; digest[2] = 0;
digest[3] = 0; digest[3] = 0;
rc4_init_16 (rc4_key, digest); rc4_init_16 (S, digest);
u32 out[4]; u32 out[4];
rc4_next_16 (rc4_key, 0, 0, padding, out); rc4_next_16 (S, 0, 0, padding, out);
COMPARE_M_SIMD (out[0], out[1], out[2], out[3]); COMPARE_M_SIMD (out[0], out[1], out[2], out[3]);
} }
} }
DECLSPEC void m10400s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (pdf_t)) DECLSPEC void m10400s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (pdf_t))
{ {
/** /**
* modifier * modifier
@ -331,12 +218,6 @@ DECLSPEC void m10400s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u3
const u64 gid = get_global_id (0); const u64 gid = get_global_id (0);
const u64 lid = get_local_id (0); const u64 lid = get_local_id (0);
/**
* shared
*/
LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid];
/** /**
* U_buf * U_buf
*/ */
@ -490,17 +371,17 @@ DECLSPEC void m10400s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u3
digest[2] = 0; digest[2] = 0;
digest[3] = 0; digest[3] = 0;
rc4_init_16 (rc4_key, digest); rc4_init_16 (S, digest);
u32 out[4]; u32 out[4];
rc4_next_16 (rc4_key, 0, 0, padding, out); rc4_next_16 (S, 0, 0, padding, out);
COMPARE_S_SIMD (out[0], out[1], out[2], out[3]); COMPARE_S_SIMD (out[0], out[1], out[2], out[3]);
} }
} }
KERNEL_FQ void m10400_m04 (KERN_ATTR_ESALT (pdf_t)) KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m04 (KERN_ATTR_ESALT (pdf_t))
{ {
/** /**
* base * base
@ -544,12 +425,12 @@ KERNEL_FQ void m10400_m04 (KERN_ATTR_ESALT (pdf_t))
* main * main
*/ */
LOCAL_VK RC4_KEY rc4_keys[64]; LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE];
m10400m (rc4_keys, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); m10400m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max);
} }
KERNEL_FQ void m10400_m08 (KERN_ATTR_ESALT (pdf_t)) KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m08 (KERN_ATTR_ESALT (pdf_t))
{ {
/** /**
* base * base
@ -593,12 +474,12 @@ KERNEL_FQ void m10400_m08 (KERN_ATTR_ESALT (pdf_t))
* main * main
*/ */
LOCAL_VK RC4_KEY rc4_keys[64]; LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE];
m10400m (rc4_keys, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); m10400m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max);
} }
KERNEL_FQ void m10400_m16 (KERN_ATTR_ESALT (pdf_t)) KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m16 (KERN_ATTR_ESALT (pdf_t))
{ {
/** /**
* base * base
@ -642,12 +523,12 @@ KERNEL_FQ void m10400_m16 (KERN_ATTR_ESALT (pdf_t))
* main * main
*/ */
LOCAL_VK RC4_KEY rc4_keys[64]; LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE];
m10400m (rc4_keys, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); m10400m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max);
} }
KERNEL_FQ void m10400_s04 (KERN_ATTR_ESALT (pdf_t)) KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s04 (KERN_ATTR_ESALT (pdf_t))
{ {
/** /**
* base * base
@ -691,12 +572,12 @@ KERNEL_FQ void m10400_s04 (KERN_ATTR_ESALT (pdf_t))
* main * main
*/ */
LOCAL_VK RC4_KEY rc4_keys[64]; LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE];
m10400s (rc4_keys, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); m10400s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max);
} }
KERNEL_FQ void m10400_s08 (KERN_ATTR_ESALT (pdf_t)) KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s08 (KERN_ATTR_ESALT (pdf_t))
{ {
/** /**
* base * base
@ -740,9 +621,9 @@ KERNEL_FQ void m10400_s08 (KERN_ATTR_ESALT (pdf_t))
* main * main
*/ */
LOCAL_VK RC4_KEY rc4_keys[64]; LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE];
m10400s (rc4_keys, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); m10400s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max);
} }
KERNEL_FQ void m10400_s16 (KERN_ATTR_ESALT (pdf_t)) KERNEL_FQ void m10400_s16 (KERN_ATTR_ESALT (pdf_t))
@ -789,7 +670,7 @@ KERNEL_FQ void m10400_s16 (KERN_ATTR_ESALT (pdf_t))
* main * main
*/ */
LOCAL_VK RC4_KEY rc4_keys[64]; LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE];
m10400s (rc4_keys, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); m10400s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max);
} }

2
docs/changes.txt
View File

@ -30,7 +30,7 @@
- AES Crypt Plugin: Reduced max password length from 256 to 128 which improved performance by 22% - AES Crypt Plugin: Reduced max password length from 256 to 128 which improved performance by 22%
- RAR3-p (Compressed): Fix workaround in unrar library in AES constant table generation to enable multi-threading support - RAR3-p (Compressed): Fix workaround in unrar library in AES constant table generation to enable multi-threading support
- CRC32: Prevent decompression of data used in CRC32 calculation on host. This leads to false negatives with TrueCrypt/VeraCrypt keyfiles - CRC32: Prevent decompression of data used in CRC32 calculation on host. This leads to false negatives with TrueCrypt/VeraCrypt keyfiles
- PDF: Update -m 10410 to new RC4 crypto library code, improving performance by 22% - 32%. - PDF: Update -m 10400 and -m 10410 to new RC4 crypto library code, improving performance by 20% or more
## ##
## Technical ## Technical

58
src/modules/module_10400.c
View File

@ -68,29 +68,29 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
{ {
char *jit_build_options = NULL; char *jit_build_options = NULL;
// Extra treatment for Apple systems u32 native_threads = 0;
if (device_param->opencl_platform_vendor_id == VENDOR_ID_APPLE)
if (device_param->opencl_device_type & CL_DEVICE_TYPE_CPU)
{ {
return jit_build_options; native_threads = 1;
}
else if (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU)
{
if (device_param->opencl_device_vendor_id == VENDOR_ID_INTEL_SDK)
{
native_threads = 8;
}
else if (device_param->opencl_device_vendor_id == VENDOR_ID_AMD)
{
native_threads = 64;
}
else
{
native_threads = 32;
}
} }
// Intel CPU hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u -D _unroll", native_threads);
if ((device_param->opencl_device_vendor_id == VENDOR_ID_INTEL_SDK) && (device_param->opencl_device_type & CL_DEVICE_TYPE_CPU))
{
hc_asprintf (&jit_build_options, "-D _unroll");
}
// NVIDIA GPU
if (device_param->opencl_device_vendor_id == VENDOR_ID_NV)
{
hc_asprintf (&jit_build_options, "-D _unroll");
}
// ROCM
if ((device_param->opencl_device_vendor_id == VENDOR_ID_AMD) && (device_param->has_vperm == true))
{
hc_asprintf (&jit_build_options, "-D _unroll");
}
return jit_build_options; return jit_build_options;
} }
@ -102,20 +102,6 @@ u64 module_esalt_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED
return esalt_size; return esalt_size;
} }
u32 module_kernel_threads_min (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
{
const u32 kernel_threads_min = 64; // RC4
return kernel_threads_min;
}
u32 module_kernel_threads_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
{
const u32 kernel_threads_max = 64; // RC4
return kernel_threads_max;
}
u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
{ {
const u32 pw_max = 32; // https://www.pdflib.com/knowledge-base/pdf-password-security/encryption/ const u32 pw_max = 32; // https://www.pdflib.com/knowledge-base/pdf-password-security/encryption/
@ -385,8 +371,8 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_kernel_accel_min = MODULE_DEFAULT; module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
module_ctx->module_kernel_loops_max = MODULE_DEFAULT; module_ctx->module_kernel_loops_max = MODULE_DEFAULT;
module_ctx->module_kernel_loops_min = MODULE_DEFAULT; module_ctx->module_kernel_loops_min = MODULE_DEFAULT;
module_ctx->module_kernel_threads_max = module_kernel_threads_max; module_ctx->module_kernel_threads_max = MODULE_DEFAULT;
module_ctx->module_kernel_threads_min = module_kernel_threads_min; module_ctx->module_kernel_threads_min = MODULE_DEFAULT;
module_ctx->module_kern_type = module_kern_type; module_ctx->module_kern_type = module_kern_type;
module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_kern_type_dynamic = MODULE_DEFAULT;
module_ctx->module_opti_type = module_opti_type; module_ctx->module_opti_type = module_opti_type;