Merge branch 'master' into fix_18400_metal

1 year ago · 25a91542b7
parent ba6a9c2d3c 506ab658c5
commit 25a91542b7
2 changed files with 2 additions and 1 deletions
--- 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);

--- a/docs/changes.txt
+++ b/docs/changes.txt
@ -52,6 +52,7 @@
 - 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
+- Fixed build failed for 18600 with Apple Metal
 - Fixed incompatible pointer types (salt1 and salt2 buf) in 31700 a3 kernel
 - Fixed incompatible pointer types (salt1 and salt2 buf) in 3730 a3 kernel
 - Handle signed/unsigned PDF permission P value for all PDF hash-modes