1
0
mirror of https://github.com/hashcat/hashcat.git synced 2025-02-02 02:41:35 +00:00

Merge pull request #2569 from philsmd/bestcryptV3_pwlen_fix

Fixes a buffer problem in -m 23900 if pw_len is larger than expected
This commit is contained in:
Jens Steube 2020-10-05 12:31:08 +02:00 committed by GitHub
commit 341701ab88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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