From 36480b99c12843e0839246ae432a90f9ec72d404 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Tue, 4 Aug 2020 14:49:22 +0200 Subject: [PATCH] Remove unused esalt declaration in -m 12500 --- OpenCL/m12500-optimized.cl | 12 +++--------- OpenCL/m12500-pure.cl | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/OpenCL/m12500-optimized.cl b/OpenCL/m12500-optimized.cl index d3e91121e..4415c9be3 100644 --- a/OpenCL/m12500-optimized.cl +++ b/OpenCL/m12500-optimized.cl @@ -25,19 +25,13 @@ #define MIN(a,b) (((a) < (b)) ? (a) : (b)) -typedef struct pbkdf2_sha1 -{ - u32 salt_buf[64]; - -} pbkdf2_sha1_t; - typedef struct rar3_tmp { u32 dgst[17][5]; } rar3_tmp_t; -KERNEL_FQ void m12500_init (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) +KERNEL_FQ void m12500_init (KERN_ATTR_TMPS (rar3_tmp_t)) { /** * base @@ -54,7 +48,7 @@ KERNEL_FQ void m12500_init (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) tmps[gid].dgst[0][4] = SHA1M_E; } -KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) +KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS (rar3_tmp_t)) { const u64 gid = get_global_id (0); @@ -174,7 +168,7 @@ KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) tmps[gid].dgst[init_pos + 1][4] = dgst[4]; } -KERNEL_FQ void m12500_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) +KERNEL_FQ void m12500_comp (KERN_ATTR_TMPS (rar3_tmp_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); diff --git a/OpenCL/m12500-pure.cl b/OpenCL/m12500-pure.cl index afd5f3cd2..66da61886 100644 --- a/OpenCL/m12500-pure.cl +++ b/OpenCL/m12500-pure.cl @@ -17,12 +17,6 @@ #define ROUNDS 0x40000 -typedef struct pbkdf2_sha1 -{ - u32 salt_buf[64]; - -} pbkdf2_sha1_t; - typedef struct rar3_tmp { u32 dgst[5]; @@ -755,7 +749,7 @@ DECLSPEC void sha1_update_rar29 (sha1_ctx_t *ctx, u32 *w, const int len) } } -KERNEL_FQ void m12500_init (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) +KERNEL_FQ void m12500_init (KERN_ATTR_TMPS (rar3_tmp_t)) { /** * base @@ -843,7 +837,7 @@ KERNEL_FQ void m12500_init (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) tmps[gid].iv[3] = 0; } -KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) +KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS (rar3_tmp_t)) { const u64 gid = get_global_id (0); @@ -957,7 +951,7 @@ KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) } } -KERNEL_FQ void m12500_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) +KERNEL_FQ void m12500_comp (KERN_ATTR_TMPS (rar3_tmp_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0);