arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-08-04 21:05:21 +00:00
Code Issues Releases Wiki Activity

We need an esalt to hold the unused IV otherwise the unique salt count becomes incorrect in multihash sitations

Browse Source
This commit is contained in:
jsteube 2016-01-09 21:35:29 +01:00
parent f0a84a2410
commit 3cdee2e06e
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/types.h
View File

@ -31,6 +31,12 @@ typedef struct
} salt_t; } salt_t;
typedef struct
{
uint iv[4];
} rar5_t;
typedef struct typedef struct
{ {
int V; int V;

1
src/oclHashcat.c
View File

@ -9911,6 +9911,7 @@ int main (int argc, char **argv)
case 11900: esalt_size = sizeof (pbkdf2_md5_t); break; case 11900: esalt_size = sizeof (pbkdf2_md5_t); break;
case 12000: esalt_size = sizeof (pbkdf2_sha1_t); break; case 12000: esalt_size = sizeof (pbkdf2_sha1_t); break;
case 12100: esalt_size = sizeof (pbkdf2_sha512_t); break; case 12100: esalt_size = sizeof (pbkdf2_sha512_t); break;
case 13000: esalt_size = sizeof (rar5_t); break;
} }
data.esalt_size = esalt_size; data.esalt_size = esalt_size;

24
src/shared.c
View File

@ -8071,16 +8071,20 @@ void ascii_digest (char out_buf[4096], uint salt_pos, uint digest_pos)
} }
else if (hash_mode == 13000) else if (hash_mode == 13000)
{ {
rar5_t *rar5s = (rar5_t *) data.esalts_buf;
rar5_t *rar5 = &rar5s[salt_pos];
snprintf (out_buf, len-1, "$rar5$16$%08x%08x%08x%08x$%u$%08x%08x%08x%08x$8$%08x%08x", snprintf (out_buf, len-1, "$rar5$16$%08x%08x%08x%08x$%u$%08x%08x%08x%08x$8$%08x%08x",
salt.salt_buf[0], salt.salt_buf[0],
salt.salt_buf[1], salt.salt_buf[1],
salt.salt_buf[2], salt.salt_buf[2],
salt.salt_buf[3], salt.salt_buf[3],
salt.salt_sign[0], salt.salt_sign[0],
salt.salt_buf[4], rar5->iv[0],
salt.salt_buf[5], rar5->iv[1],
salt.salt_buf[6], rar5->iv[2],
salt.salt_buf[7], rar5->iv[3],
byte_swap_32 (digest_buf[0]), byte_swap_32 (digest_buf[0]),
byte_swap_32 (digest_buf[1]) byte_swap_32 (digest_buf[1])
); );
@ -18394,6 +18398,8 @@ int rar5_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf)
salt_t *salt = hash_buf->salt; salt_t *salt = hash_buf->salt;
rar5_t *rar5 = (rar5_t *) hash_buf->esalt;
/** /**
* parse line * parse line
*/ */
@ -18471,12 +18477,12 @@ int rar5_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf)
salt->salt_buf[2] = hex_to_uint (&salt_buf[16]); salt->salt_buf[2] = hex_to_uint (&salt_buf[16]);
salt->salt_buf[3] = hex_to_uint (&salt_buf[24]); salt->salt_buf[3] = hex_to_uint (&salt_buf[24]);
salt->salt_buf[4] = hex_to_uint (&iv[ 0]); rar5->iv[0] = hex_to_uint (&iv[ 0]);
salt->salt_buf[5] = hex_to_uint (&iv[ 8]); rar5->iv[1] = hex_to_uint (&iv[ 8]);
salt->salt_buf[6] = hex_to_uint (&iv[16]); rar5->iv[2] = hex_to_uint (&iv[16]);
salt->salt_buf[7] = hex_to_uint (&iv[24]); rar5->iv[3] = hex_to_uint (&iv[24]);
salt->salt_len = 16 + 16; salt->salt_len = 16;
salt->salt_sign[0] = iterations; salt->salt_sign[0] = iterations;

2
tools/test.pl
View File

@ -6605,8 +6605,6 @@ END_CODE
my $hash = $pbkdf2->PBKDF2 ($salt_buf_bin, $word_buf); my $hash = $pbkdf2->PBKDF2 ($salt_buf_bin, $word_buf);
printf ("%s\n", unpack ("H*", $hash));
my $hash_final = substr ($hash, 0, 8) my $hash_final = substr ($hash, 0, 8)
^ substr ($hash, 8, 8) ^ substr ($hash, 8, 8)
^ substr ($hash, 16, 8) ^ substr ($hash, 16, 8)