arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-05-07 09:29:11 +00:00
Code Issues Releases Wiki Activity

Fixed a buffer overflow in module_hash_decode() of -m 15500

Browse Source
This commit is contained in:
Jens Steube 2020-06-03 12:51:38 +02:00
parent 1e469a96a4
commit 09b2bb0ad7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/module_15500.c
View File

@ -197,9 +197,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
// alias // alias
const u8 *alias_pos = token.buf[6]; memcpy ((char *) jks_sha1->alias, (const char *) token.buf[6], token.len[6]);
strncpy ((char *) jks_sha1->alias, (const char *) alias_pos, 64);
// fake salt // fake salt
@ -237,6 +235,10 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
u8 *der = (u8 *) jks_sha1->der; u8 *der = (u8 *) jks_sha1->der;
char alias[65] = { 0 };
memcpy (alias, (char *) jks_sha1->alias, 64);
const int line_len = snprintf (line_buf, line_size, "%s*%08X%08X%08X%08X%08X*%08X%08X%08X%08X%08X*%s*%02X*%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X*%s", const int line_len = snprintf (line_buf, line_size, "%s*%08X%08X%08X%08X%08X*%08X%08X%08X%08X%08X*%s*%02X*%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X*%s",
SIGNATURE_JKS_SHA1, SIGNATURE_JKS_SHA1,
byte_swap_32 (jks_sha1->checksum[0]), byte_swap_32 (jks_sha1->checksum[0]),
@ -265,7 +267,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
der[17], der[17],
der[18], der[18],
der[19], der[19],
(char *) jks_sha1->alias alias
); );
return line_len; return line_len;