From 5564319fdc1badc2561f74f2f340d5459e31ad96 Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Tue, 11 Apr 2023 18:10:25 +0200 Subject: [PATCH 1/4] Fixed incompatible pointer types (salt1 and salt2 buf) in 3730 a3 kernel --- OpenCL/m03730_a3-pure.cl | 8 ++++---- docs/changes.txt | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenCL/m03730_a3-pure.cl b/OpenCL/m03730_a3-pure.cl index 58f8b4410..903512e24 100644 --- a/OpenCL/m03730_a3-pure.cl +++ b/OpenCL/m03730_a3-pure.cl @@ -80,7 +80,7 @@ KERNEL_FQ void m03730_mxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t)) const u32 salt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt1_len; - u32 s[64] = { 0 }; + u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { @@ -89,7 +89,7 @@ KERNEL_FQ void m03730_mxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t)) const u32 salt_len2 = esalt_bufs[DIGESTS_OFFSET_HOST].salt2_len; - u32 s2[64] = { 0 }; + u32x s2[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len2; i += 4, idx += 1) { @@ -232,7 +232,7 @@ KERNEL_FQ void m03730_sxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t)) const u32 salt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt1_len; - u32 s[64] = { 0 }; + u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { @@ -241,7 +241,7 @@ KERNEL_FQ void m03730_sxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t)) const u32 salt_len2 = esalt_bufs[DIGESTS_OFFSET_HOST].salt2_len; - u32 s2[64] = { 0 }; + u32x s2[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len2; i += 4, idx += 1) { diff --git a/docs/changes.txt b/docs/changes.txt index 448e026ac..9d081b15c 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -45,6 +45,7 @@ - Skip chained generated rules that exceed the maximum number of function calls - Fixed incorrect plaintext check for 25400 and 26610. Increased plaintext check to 32 bytes to prevent false positives. - Fixed bug in --stdout that caused certain rules to malfunction +- Fixed incompatible pointer types (salt1 and salt2 buf) in 3730 a3 kernel ## ## Technical From bad9a0ca6303c30672d79f8ad3725c8cc1fdb9ad Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Tue, 11 Apr 2023 18:26:54 +0200 Subject: [PATCH 2/4] Fixed incompatible pointer types (salt1 and salt2 buf) in 31700 a3 kernel --- OpenCL/m31700_a3-pure.cl | 8 ++++---- docs/changes.txt | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenCL/m31700_a3-pure.cl b/OpenCL/m31700_a3-pure.cl index 18e0ee510..9a9db3047 100644 --- a/OpenCL/m31700_a3-pure.cl +++ b/OpenCL/m31700_a3-pure.cl @@ -80,7 +80,7 @@ KERNEL_FQ void m31700_mxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t)) const u32 salt1_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt1_len; - u32 salt1_buf[64] = { 0 }; + u32x salt1_buf[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt1_len; i += 4, idx += 1) { @@ -89,7 +89,7 @@ KERNEL_FQ void m31700_mxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t)) const u32 salt2_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt2_len; - u32 salt2_buf[64] = { 0 }; + u32x salt2_buf[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt2_len; i += 4, idx += 1) { @@ -245,7 +245,7 @@ KERNEL_FQ void m31700_sxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t)) const u32 salt1_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt1_len; - u32 salt1_buf[64] = { 0 }; + u32x salt1_buf[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt1_len; i += 4, idx += 1) { @@ -254,7 +254,7 @@ KERNEL_FQ void m31700_sxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t)) const u32 salt2_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt2_len; - u32 salt2_buf[64] = { 0 }; + u32x salt2_buf[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt2_len; i += 4, idx += 1) { diff --git a/docs/changes.txt b/docs/changes.txt index 448e026ac..8cdb5fe92 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -45,6 +45,7 @@ - Skip chained generated rules that exceed the maximum number of function calls - Fixed incorrect plaintext check for 25400 and 26610. Increased plaintext check to 32 bytes to prevent false positives. - Fixed bug in --stdout that caused certain rules to malfunction +- Fixed incompatible pointer types (salt1 and salt2 buf) in 31700 a3 kernel ## ## Technical From a4c9f3bda946aa7ec172b858aa3ff1d0372badee Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Tue, 11 Apr 2023 18:39:57 +0200 Subject: [PATCH 3/4] Fixed build failed for 18400 with Apple Metal --- OpenCL/m18400-pure.cl | 2 +- docs/changes.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenCL/m18400-pure.cl b/OpenCL/m18400-pure.cl index c3f2931f5..36c1411f1 100644 --- a/OpenCL/m18400-pure.cl +++ b/OpenCL/m18400-pure.cl @@ -391,7 +391,7 @@ KERNEL_FQ void m18400_comp (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) if (remaining64) { - u32 *pt_remaining = pt + (encrypted_len64 / 4); + PRIVATE_AS u32 *pt_remaining = pt + (encrypted_len64 / 4); truncate_block_16x4_be_S (pt_remaining + 0, pt_remaining + 4, pt_remaining + 8, pt_remaining + 12, remaining64); diff --git a/docs/changes.txt b/docs/changes.txt index 448e026ac..d73a5c55c 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -45,6 +45,7 @@ - Skip chained generated rules that exceed the maximum number of function calls - Fixed incorrect plaintext check for 25400 and 26610. Increased plaintext check to 32 bytes to prevent false positives. - Fixed bug in --stdout that caused certain rules to malfunction +- Fixed build failed for 18400 with Apple Metal ## ## Technical From 43b3bba611449512c4bdf97e5aa27b30359d804b Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Tue, 11 Apr 2023 18:41:26 +0200 Subject: [PATCH 4/4] Fixed build failed for 18600 with Apple Metal --- OpenCL/m18600-pure.cl | 2 +- docs/changes.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenCL/m18600-pure.cl b/OpenCL/m18600-pure.cl index 8618025fb..6280e0a57 100644 --- a/OpenCL/m18600-pure.cl +++ b/OpenCL/m18600-pure.cl @@ -797,7 +797,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE_COMP) m18600_comp (KERN_ATTR_ if (remaining64) { - u32 *pt_remaining = pt + (encrypted_len64 / 4); + PRIVATE_AS u32 *pt_remaining = pt + (encrypted_len64 / 4); truncate_block_16x4_be_S (pt_remaining + 0, pt_remaining + 4, pt_remaining + 8, pt_remaining + 12, remaining64); diff --git a/docs/changes.txt b/docs/changes.txt index 448e026ac..ae6e5f074 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -45,6 +45,7 @@ - Skip chained generated rules that exceed the maximum number of function calls - Fixed incorrect plaintext check for 25400 and 26610. Increased plaintext check to 32 bytes to prevent false positives. - Fixed bug in --stdout that caused certain rules to malfunction +- Fixed build failed for 18600 with Apple Metal ## ## Technical