Merge pull request #2569 from philsmd/bestcryptV3_pwlen_fix

Fixes a buffer problem in -m 23900 if pw_len is larger than expected
4 years ago · 341701ab88
parent 0db82afa0e 8f1aeeed9d
commit 341701ab88
1 changed files with 2 additions and 2 deletions
--- a/OpenCL/m23900-pure.cl
+++ b/OpenCL/m23900-pure.cl
@ -35,7 +35,7 @@ KERNEL_FQ void m23900_init (KERN_ATTR_TMPS_ESALT (bestcrypt_tmp_t, bestcrypt_t))

  if (gid >= gid_max) return;

-  const int salt_pw_len = 8 + pws[gid].pw_len;
+  const int salt_pw_len = 8 + MIN (pws[gid].pw_len, 56);

  u32 comb[16];

@ -109,7 +109,7 @@ KERNEL_FQ void m23900_loop (KERN_ATTR_TMPS_ESALT (bestcrypt_tmp_t, bestcrypt_t))

  if (gid >= gid_max) return;

-  const int salt_pw_len = 8 + pws[gid].pw_len;
+  const int salt_pw_len = 8 + MIN (pws[gid].pw_len, 56);

  u32 salt_pw_buf[32 + 1]; // 8 + 56 + 64 = 128 bytes