From 7e5356126c444e943095f82303ff12c3f7bce412 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Tue, 7 May 2019 12:22:37 +0200 Subject: [PATCH] Fix more use of LOCAL_VK and LOCAL_AS --- OpenCL/m07500_a0-optimized.cl | 6 +++--- OpenCL/m07500_a0-pure.cl | 6 +++--- OpenCL/m07500_a1-optimized.cl | 6 +++--- OpenCL/m07500_a1-pure.cl | 6 +++--- OpenCL/m07500_a3-optimized.cl | 10 +++++----- OpenCL/m07500_a3-pure.cl | 6 +++--- OpenCL/m09000-pure.cl | 16 ++++++++-------- OpenCL/m09700_a0-optimized.cl | 6 +++--- OpenCL/m09700_a1-optimized.cl | 6 +++--- OpenCL/m09700_a3-optimized.cl | 6 +++--- OpenCL/m09710_a0-optimized.cl | 6 +++--- OpenCL/m09710_a1-optimized.cl | 6 +++--- OpenCL/m09710_a3-optimized.cl | 6 +++--- OpenCL/m09800_a0-optimized.cl | 6 +++--- OpenCL/m09800_a1-optimized.cl | 6 +++--- OpenCL/m09800_a3-optimized.cl | 6 +++--- OpenCL/m09810_a0-optimized.cl | 6 +++--- OpenCL/m09810_a1-optimized.cl | 6 +++--- OpenCL/m09810_a3-optimized.cl | 6 +++--- OpenCL/m10400_a0-optimized.cl | 6 +++--- OpenCL/m10400_a1-optimized.cl | 6 +++--- OpenCL/m10400_a3-optimized.cl | 6 +++--- OpenCL/m10410_a0-optimized.cl | 6 +++--- OpenCL/m10410_a1-optimized.cl | 6 +++--- OpenCL/m10410_a3-optimized.cl | 6 +++--- OpenCL/m10500-pure.cl | 4 ++-- OpenCL/m13100_a0-optimized.cl | 6 +++--- OpenCL/m13100_a0-pure.cl | 6 +++--- OpenCL/m13100_a1-optimized.cl | 6 +++--- OpenCL/m13100_a1-pure.cl | 6 +++--- OpenCL/m13100_a3-optimized.cl | 10 +++++----- OpenCL/m13100_a3-pure.cl | 6 +++--- OpenCL/m18200_a0-optimized.cl | 6 +++--- OpenCL/m18200_a0-pure.cl | 6 +++--- OpenCL/m18200_a1-optimized.cl | 6 +++--- OpenCL/m18200_a1-pure.cl | 6 +++--- OpenCL/m18200_a3-optimized.cl | 10 +++++----- OpenCL/m18200_a3-pure.cl | 6 +++--- OpenCL/m18600-pure.cl | 8 ++++---- 39 files changed, 128 insertions(+), 128 deletions(-) diff --git a/OpenCL/m07500_a0-optimized.cl b/OpenCL/m07500_a0-optimized.cl index cffd768b1..60c658a0a 100644 --- a/OpenCL/m07500_a0-optimized.cl +++ b/OpenCL/m07500_a0-optimized.cl @@ -50,7 +50,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -453,7 +453,7 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * loop @@ -559,7 +559,7 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * loop diff --git a/OpenCL/m07500_a0-pure.cl b/OpenCL/m07500_a0-pure.cl index 7bdf81668..a26f705c1 100644 --- a/OpenCL/m07500_a0-pure.cl +++ b/OpenCL/m07500_a0-pure.cl @@ -49,7 +49,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -298,7 +298,7 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_RULES_ESALT (krb5pa_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -369,7 +369,7 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_RULES_ESALT (krb5pa_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m07500_a1-optimized.cl b/OpenCL/m07500_a1-optimized.cl index 4bf1a6a05..ddcc7a51a 100644 --- a/OpenCL/m07500_a1-optimized.cl +++ b/OpenCL/m07500_a1-optimized.cl @@ -48,7 +48,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -451,7 +451,7 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * loop @@ -607,7 +607,7 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * loop diff --git a/OpenCL/m07500_a1-pure.cl b/OpenCL/m07500_a1-pure.cl index e6d11bf6d..4a812ac9e 100644 --- a/OpenCL/m07500_a1-pure.cl +++ b/OpenCL/m07500_a1-pure.cl @@ -47,7 +47,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -294,7 +294,7 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_ESALT (krb5pa_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -363,7 +363,7 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_ESALT (krb5pa_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m07500_a3-optimized.cl b/OpenCL/m07500_a3-optimized.cl index f8c6d73b9..68e154486 100644 --- a/OpenCL/m07500_a3-optimized.cl +++ b/OpenCL/m07500_a3-optimized.cl @@ -48,7 +48,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -530,7 +530,7 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m07500 (rc4_key, 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, gid_max); } @@ -582,7 +582,7 @@ KERNEL_FQ void m07500_m08 (KERN_ATTR_ESALT (krb5pa_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m07500 (rc4_key, 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, gid_max); } @@ -638,7 +638,7 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m07500 (rc4_key, 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, gid_max); } @@ -690,7 +690,7 @@ KERNEL_FQ void m07500_s08 (KERN_ATTR_ESALT (krb5pa_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m07500 (rc4_key, 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, gid_max); } diff --git a/OpenCL/m07500_a3-pure.cl b/OpenCL/m07500_a3-pure.cl index 4e1257620..e6a6c4b01 100644 --- a/OpenCL/m07500_a3-pure.cl +++ b/OpenCL/m07500_a3-pure.cl @@ -47,7 +47,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -315,7 +315,7 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -409,7 +409,7 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m09000-pure.cl b/OpenCL/m09000-pure.cl index 6959ad6b6..591cdc0cf 100644 --- a/OpenCL/m09000-pure.cl +++ b/OpenCL/m09000-pure.cl @@ -476,10 +476,10 @@ KERNEL_FQ void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m09 LOCAL_VK u32 S2_all[FIXED_LOCAL_SIZE][256]; LOCAL_VK u32 S3_all[FIXED_LOCAL_SIZE][256]; - LOCAL_VK u32 *S0 = S0_all[lid]; - LOCAL_VK u32 *S1 = S1_all[lid]; - LOCAL_VK u32 *S2 = S2_all[lid]; - LOCAL_VK u32 *S3 = S3_all[lid]; + LOCAL_AS u32 *S0 = S0_all[lid]; + LOCAL_AS u32 *S1 = S1_all[lid]; + LOCAL_AS u32 *S2 = S2_all[lid]; + LOCAL_AS u32 *S3 = S3_all[lid]; for (u32 i = 0; i < 256; i++) { @@ -607,10 +607,10 @@ KERNEL_FQ void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m09 LOCAL_VK u32 S2_all[FIXED_LOCAL_SIZE][256]; LOCAL_VK u32 S3_all[FIXED_LOCAL_SIZE][256]; - LOCAL_VK u32 *S0 = S0_all[lid]; - LOCAL_VK u32 *S1 = S1_all[lid]; - LOCAL_VK u32 *S2 = S2_all[lid]; - LOCAL_VK u32 *S3 = S3_all[lid]; + LOCAL_AS u32 *S0 = S0_all[lid]; + LOCAL_AS u32 *S1 = S1_all[lid]; + LOCAL_AS u32 *S2 = S2_all[lid]; + LOCAL_AS u32 *S3 = S3_all[lid]; for (u32 i = 0; i < 256; i++) { diff --git a/OpenCL/m09700_a0-optimized.cl b/OpenCL/m09700_a0-optimized.cl index c92fbb483..dbbbf4b55 100644 --- a/OpenCL/m09700_a0-optimized.cl +++ b/OpenCL/m09700_a0-optimized.cl @@ -48,7 +48,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -529,7 +529,7 @@ KERNEL_FQ void m09700_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -716,7 +716,7 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt diff --git a/OpenCL/m09700_a1-optimized.cl b/OpenCL/m09700_a1-optimized.cl index e404894d0..1c3a59809 100644 --- a/OpenCL/m09700_a1-optimized.cl +++ b/OpenCL/m09700_a1-optimized.cl @@ -46,7 +46,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -527,7 +527,7 @@ KERNEL_FQ void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -772,7 +772,7 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt diff --git a/OpenCL/m09700_a3-optimized.cl b/OpenCL/m09700_a3-optimized.cl index 82d6d308e..032b6f5eb 100644 --- a/OpenCL/m09700_a3-optimized.cl +++ b/OpenCL/m09700_a3-optimized.cl @@ -43,7 +43,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -157,7 +157,7 @@ DECLSPEC void m09700m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u3 * shared */ - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -563,7 +563,7 @@ DECLSPEC void m09700s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u3 * shared */ - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt diff --git a/OpenCL/m09710_a0-optimized.cl b/OpenCL/m09710_a0-optimized.cl index a819ab28b..4359393f5 100644 --- a/OpenCL/m09710_a0-optimized.cl +++ b/OpenCL/m09710_a0-optimized.cl @@ -48,7 +48,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -185,7 +185,7 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -323,7 +323,7 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt diff --git a/OpenCL/m09710_a1-optimized.cl b/OpenCL/m09710_a1-optimized.cl index 5bf2afb72..fa905ed7c 100644 --- a/OpenCL/m09710_a1-optimized.cl +++ b/OpenCL/m09710_a1-optimized.cl @@ -46,7 +46,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -183,7 +183,7 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -367,7 +367,7 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt diff --git a/OpenCL/m09710_a3-optimized.cl b/OpenCL/m09710_a3-optimized.cl index 9def38990..ae9bd0383 100644 --- a/OpenCL/m09710_a3-optimized.cl +++ b/OpenCL/m09710_a3-optimized.cl @@ -46,7 +46,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -160,7 +160,7 @@ DECLSPEC void m09710m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u3 * shared */ - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -269,7 +269,7 @@ DECLSPEC void m09710s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u3 * shared */ - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt diff --git a/OpenCL/m09800_a0-optimized.cl b/OpenCL/m09800_a0-optimized.cl index 7b5847753..ffa5c1388 100644 --- a/OpenCL/m09800_a0-optimized.cl +++ b/OpenCL/m09800_a0-optimized.cl @@ -48,7 +48,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -185,7 +185,7 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -385,7 +385,7 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt diff --git a/OpenCL/m09800_a1-optimized.cl b/OpenCL/m09800_a1-optimized.cl index d78f9f799..07bfb15ca 100644 --- a/OpenCL/m09800_a1-optimized.cl +++ b/OpenCL/m09800_a1-optimized.cl @@ -46,7 +46,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -183,7 +183,7 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -433,7 +433,7 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt diff --git a/OpenCL/m09800_a3-optimized.cl b/OpenCL/m09800_a3-optimized.cl index 60c77499e..303b177a8 100644 --- a/OpenCL/m09800_a3-optimized.cl +++ b/OpenCL/m09800_a3-optimized.cl @@ -43,7 +43,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -157,7 +157,7 @@ DECLSPEC void m09800m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u3 * shared */ - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -325,7 +325,7 @@ DECLSPEC void m09800s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u3 * shared */ - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt diff --git a/OpenCL/m09810_a0-optimized.cl b/OpenCL/m09810_a0-optimized.cl index 7d68831f8..5db2264a6 100644 --- a/OpenCL/m09810_a0-optimized.cl +++ b/OpenCL/m09810_a0-optimized.cl @@ -48,7 +48,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -185,7 +185,7 @@ KERNEL_FQ void m09810_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -310,7 +310,7 @@ KERNEL_FQ void m09810_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt diff --git a/OpenCL/m09810_a1-optimized.cl b/OpenCL/m09810_a1-optimized.cl index a94225f9f..69ecab5c3 100644 --- a/OpenCL/m09810_a1-optimized.cl +++ b/OpenCL/m09810_a1-optimized.cl @@ -46,7 +46,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -183,7 +183,7 @@ KERNEL_FQ void m09810_m04 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -354,7 +354,7 @@ KERNEL_FQ void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt diff --git a/OpenCL/m09810_a3-optimized.cl b/OpenCL/m09810_a3-optimized.cl index c4dbe0a54..495adc734 100644 --- a/OpenCL/m09810_a3-optimized.cl +++ b/OpenCL/m09810_a3-optimized.cl @@ -46,7 +46,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -160,7 +160,7 @@ DECLSPEC void m09810m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u3 * shared */ - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -254,7 +254,7 @@ DECLSPEC void m09810s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u3 * shared */ - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt diff --git a/OpenCL/m10400_a0-optimized.cl b/OpenCL/m10400_a0-optimized.cl index 8460b1d5b..55332396a 100644 --- a/OpenCL/m10400_a0-optimized.cl +++ b/OpenCL/m10400_a0-optimized.cl @@ -72,7 +72,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -194,7 +194,7 @@ KERNEL_FQ void m10400_m04 (KERN_ATTR_RULES_ESALT (pdf_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf @@ -370,7 +370,7 @@ KERNEL_FQ void m10400_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf diff --git a/OpenCL/m10400_a1-optimized.cl b/OpenCL/m10400_a1-optimized.cl index 15337df7f..c10d184ca 100644 --- a/OpenCL/m10400_a1-optimized.cl +++ b/OpenCL/m10400_a1-optimized.cl @@ -70,7 +70,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -192,7 +192,7 @@ KERNEL_FQ void m10400_m04 (KERN_ATTR_ESALT (pdf_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf @@ -428,7 +428,7 @@ KERNEL_FQ void m10400_s04 (KERN_ATTR_ESALT (pdf_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf diff --git a/OpenCL/m10400_a3-optimized.cl b/OpenCL/m10400_a3-optimized.cl index dcc1e12f6..49eaac162 100644 --- a/OpenCL/m10400_a3-optimized.cl +++ b/OpenCL/m10400_a3-optimized.cl @@ -70,7 +70,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -169,7 +169,7 @@ DECLSPEC void m10400m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u3 * shared */ - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf @@ -335,7 +335,7 @@ DECLSPEC void m10400s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u3 * shared */ - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf diff --git a/OpenCL/m10410_a0-optimized.cl b/OpenCL/m10410_a0-optimized.cl index db2aec224..d91c72621 100644 --- a/OpenCL/m10410_a0-optimized.cl +++ b/OpenCL/m10410_a0-optimized.cl @@ -72,7 +72,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -193,7 +193,7 @@ KERNEL_FQ void m10410_m04 (KERN_ATTR_RULES_ESALT (pdf_t)) */ LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * loop @@ -265,7 +265,7 @@ KERNEL_FQ void m10410_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) */ LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * digest diff --git a/OpenCL/m10410_a1-optimized.cl b/OpenCL/m10410_a1-optimized.cl index 4ba60e88c..8e9c1fef6 100644 --- a/OpenCL/m10410_a1-optimized.cl +++ b/OpenCL/m10410_a1-optimized.cl @@ -70,7 +70,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -192,7 +192,7 @@ KERNEL_FQ void m10410_m04 (KERN_ATTR_ESALT (pdf_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf @@ -334,7 +334,7 @@ KERNEL_FQ void m10410_s04 (KERN_ATTR_ESALT (pdf_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf diff --git a/OpenCL/m10410_a3-optimized.cl b/OpenCL/m10410_a3-optimized.cl index 30d26f4d9..cef243a5c 100644 --- a/OpenCL/m10410_a3-optimized.cl +++ b/OpenCL/m10410_a3-optimized.cl @@ -70,7 +70,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -169,7 +169,7 @@ DECLSPEC void m10410m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u3 * shared */ - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * loop @@ -212,7 +212,7 @@ DECLSPEC void m10410s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u3 * shared */ - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * digest diff --git a/OpenCL/m10500-pure.cl b/OpenCL/m10500-pure.cl index 2ba76ba62..51ee73127 100644 --- a/OpenCL/m10500-pure.cl +++ b/OpenCL/m10500-pure.cl @@ -76,7 +76,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -379,7 +379,7 @@ KERNEL_FQ void m10500_loop (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * loop diff --git a/OpenCL/m13100_a0-optimized.cl b/OpenCL/m13100_a0-optimized.cl index a98b0e95d..b9465f730 100644 --- a/OpenCL/m13100_a0-optimized.cl +++ b/OpenCL/m13100_a0-optimized.cl @@ -49,7 +49,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -612,7 +612,7 @@ KERNEL_FQ void m13100_m04 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -710,7 +710,7 @@ KERNEL_FQ void m13100_s04 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt diff --git a/OpenCL/m13100_a0-pure.cl b/OpenCL/m13100_a0-pure.cl index 1ce743e85..7a41226ef 100644 --- a/OpenCL/m13100_a0-pure.cl +++ b/OpenCL/m13100_a0-pure.cl @@ -48,7 +48,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -406,7 +406,7 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_RULES_ESALT (krb5tgs_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -468,7 +468,7 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_RULES_ESALT (krb5tgs_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m13100_a1-optimized.cl b/OpenCL/m13100_a1-optimized.cl index 406980f20..a548a7bf1 100644 --- a/OpenCL/m13100_a1-optimized.cl +++ b/OpenCL/m13100_a1-optimized.cl @@ -47,7 +47,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -609,7 +609,7 @@ KERNEL_FQ void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -756,7 +756,7 @@ KERNEL_FQ void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt diff --git a/OpenCL/m13100_a1-pure.cl b/OpenCL/m13100_a1-pure.cl index 907a274b1..a8d0098b3 100644 --- a/OpenCL/m13100_a1-pure.cl +++ b/OpenCL/m13100_a1-pure.cl @@ -46,7 +46,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -402,7 +402,7 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_ESALT (krb5tgs_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -462,7 +462,7 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_ESALT (krb5tgs_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m13100_a3-optimized.cl b/OpenCL/m13100_a3-optimized.cl index b8c27d187..6079988b0 100644 --- a/OpenCL/m13100_a3-optimized.cl +++ b/OpenCL/m13100_a3-optimized.cl @@ -47,7 +47,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -679,7 +679,7 @@ KERNEL_FQ void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m13100 (rc4_key, 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, gid_max); } @@ -731,7 +731,7 @@ KERNEL_FQ void m13100_m08 (KERN_ATTR_ESALT (krb5tgs_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m13100 (rc4_key, 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, gid_max); } @@ -787,7 +787,7 @@ KERNEL_FQ void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m13100 (rc4_key, 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, gid_max); } @@ -839,7 +839,7 @@ KERNEL_FQ void m13100_s08 (KERN_ATTR_ESALT (krb5tgs_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m13100 (rc4_key, 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, gid_max); } diff --git a/OpenCL/m13100_a3-pure.cl b/OpenCL/m13100_a3-pure.cl index d8751b9b3..25e60e0c5 100644 --- a/OpenCL/m13100_a3-pure.cl +++ b/OpenCL/m13100_a3-pure.cl @@ -46,7 +46,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -411,7 +411,7 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -484,7 +484,7 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m18200_a0-optimized.cl b/OpenCL/m18200_a0-optimized.cl index e980572b3..3791d2058 100644 --- a/OpenCL/m18200_a0-optimized.cl +++ b/OpenCL/m18200_a0-optimized.cl @@ -49,7 +49,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -610,7 +610,7 @@ KERNEL_FQ void m18200_m04 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -708,7 +708,7 @@ KERNEL_FQ void m18200_s04 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt diff --git a/OpenCL/m18200_a0-pure.cl b/OpenCL/m18200_a0-pure.cl index 49b1f127b..ba15f1908 100644 --- a/OpenCL/m18200_a0-pure.cl +++ b/OpenCL/m18200_a0-pure.cl @@ -48,7 +48,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -404,7 +404,7 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_RULES_ESALT (krb5asrep_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -466,7 +466,7 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_RULES_ESALT (krb5asrep_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m18200_a1-optimized.cl b/OpenCL/m18200_a1-optimized.cl index 1fdfd2d8f..e66367c08 100644 --- a/OpenCL/m18200_a1-optimized.cl +++ b/OpenCL/m18200_a1-optimized.cl @@ -47,7 +47,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -607,7 +607,7 @@ KERNEL_FQ void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -754,7 +754,7 @@ KERNEL_FQ void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt diff --git a/OpenCL/m18200_a1-pure.cl b/OpenCL/m18200_a1-pure.cl index 08ee938fd..3817e1e8a 100644 --- a/OpenCL/m18200_a1-pure.cl +++ b/OpenCL/m18200_a1-pure.cl @@ -46,7 +46,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -400,7 +400,7 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_ESALT (krb5asrep_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -460,7 +460,7 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_ESALT (krb5asrep_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m18200_a3-optimized.cl b/OpenCL/m18200_a3-optimized.cl index 0a196d2b9..dce8dacf6 100644 --- a/OpenCL/m18200_a3-optimized.cl +++ b/OpenCL/m18200_a3-optimized.cl @@ -47,7 +47,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -677,7 +677,7 @@ KERNEL_FQ void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m18200 (rc4_key, 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, gid_max); } @@ -729,7 +729,7 @@ KERNEL_FQ void m18200_m08 (KERN_ATTR_ESALT (krb5asrep_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m18200 (rc4_key, 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, gid_max); } @@ -785,7 +785,7 @@ KERNEL_FQ void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m18200 (rc4_key, 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, gid_max); } @@ -837,7 +837,7 @@ KERNEL_FQ void m18200_s08 (KERN_ATTR_ESALT (krb5asrep_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m18200 (rc4_key, 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, gid_max); } diff --git a/OpenCL/m18200_a3-pure.cl b/OpenCL/m18200_a3-pure.cl index b7ce0ec97..015cd4f36 100644 --- a/OpenCL/m18200_a3-pure.cl +++ b/OpenCL/m18200_a3-pure.cl @@ -46,7 +46,7 @@ DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) u32 v = 0x03020100; u32 a = 0x04040404; - LOCAL_VK u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -409,7 +409,7 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -482,7 +482,7 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) LOCAL_VK RC4_KEY rc4_keys[64]; - LOCAL_VK RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m18600-pure.cl b/OpenCL/m18600-pure.cl index 9d03c013c..930b85f59 100644 --- a/OpenCL/m18600-pure.cl +++ b/OpenCL/m18600-pure.cl @@ -621,10 +621,10 @@ KERNEL_FQ void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m18 LOCAL_VK u32 S2_all[FIXED_LOCAL_SIZE][256]; LOCAL_VK u32 S3_all[FIXED_LOCAL_SIZE][256]; - LOCAL_VK u32 *S0 = S0_all[lid]; - LOCAL_VK u32 *S1 = S1_all[lid]; - LOCAL_VK u32 *S2 = S2_all[lid]; - LOCAL_VK u32 *S3 = S3_all[lid]; + LOCAL_AS u32 *S0 = S0_all[lid]; + LOCAL_AS u32 *S1 = S1_all[lid]; + LOCAL_AS u32 *S2 = S2_all[lid]; + LOCAL_AS u32 *S3 = S3_all[lid]; for (u32 i = 0; i < 256; i++) {