arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-23 07:08:19 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3373 from philsmd/24900_hash_encoding

Browse Source 
better dahua_decode () sanity checks and error detection
This commit is contained in:
Jens Steube 2022-07-12 15:55:55 +02:00 committed by GitHub
commit 599f7eedc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/modules/module_24900.c
View File

@ -49,6 +49,14 @@ const char *module_st_pass (MAYBE_UNUSED const hashconfig_t *hashconfig,
u32 dahua_decode (const u32 in)
{
// chars used (alphabet):
// 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
if ( in < '0') return -1;
if (in > '9' && in < 'A') return -1;
if (in > 'Z' && in < 'a') return -1;
if (in > 'z' ) return -1;
if (in >= 'a')
{
return (in - 61);
@ -57,12 +65,8 @@ u32 dahua_decode (const u32 in)
{
return (in - 55);
}
else
{
return (in - 48);
}
return -1;
return (in - 48);
}
u32 dahua_encode (const u32 in)
@ -110,6 +114,15 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
const u32 d0 = dahua_decode (hash_pos[6]);
const u32 d1 = dahua_decode (hash_pos[7]);
if (a0 == (u32) -1) return (PARSER_HASH_ENCODING);
if (a1 == (u32) -1) return (PARSER_HASH_ENCODING);
if (b0 == (u32) -1) return (PARSER_HASH_ENCODING);
if (b1 == (u32) -1) return (PARSER_HASH_ENCODING);
if (c0 == (u32) -1) return (PARSER_HASH_ENCODING);
if (c1 == (u32) -1) return (PARSER_HASH_ENCODING);
if (d0 == (u32) -1) return (PARSER_HASH_ENCODING);
if (d1 == (u32) -1) return (PARSER_HASH_ENCODING);
digest[0] = (a0 << 0) | (a1 << 8);
digest[1] = (b0 << 0) | (b1 << 8);
digest[2] = (c0 << 0) | (c1 << 8);