1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-26 09:58:16 +00:00

Merge pull request #3374 from philsmd/26200_hash_encoding

improved hash sanity checks for -m 26200 = OpenEdge
This commit is contained in:
Jens Steube 2022-07-14 21:11:44 +02:00 committed by GitHub
commit 854707a6a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -109,7 +109,27 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
const u8 *hash_pos = (u8 *) token.buf[0];
const u32 hash_len = token.len[0];
memcpy ((u8 *)digest, hash_pos, hash_len);
/*
* Check encoding:
*/
for (u32 i = 0; i < hash_len; i++)
{
// chars used (alphabet):
// ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
const u8 c = hash_pos[i];
if ( c < 'A') return (PARSER_HASH_ENCODING);
if (c > 'Z' && c < 'a') return (PARSER_HASH_ENCODING);
if (c > 'z' ) return (PARSER_HASH_ENCODING);
}
/*
* digest:
*/
memcpy ((u8 *) digest, hash_pos, hash_len);
return (PARSER_OK);
}