arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-26 09:58:16 +00:00
Code Issues Releases Wiki Activity

Move more hash-mode dependant configuration into hashconfig

Browse Source
This commit is contained in:
jsteube 2016-09-12 10:50:08 +02:00
parent e25224a940
commit 2678592484
3 changed files with 68 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/interface.h
View File

@ -1669,6 +1669,7 @@ int hashconfig_init (hashconfig_t *hashconfig, const uint hash_
void hashconfig_destroy (hashconfig_t *hashconfig);
uint hashconfig_general_pw_min (hashconfig_t *hashconfig);
uint hashconfig_general_pw_max (hashconfig_t *hashconfig);
void hashconfig_general_defaults (hashconfig_t *hashconfig, salt_t *salts_buf, const int salts_cnt, void *esalts_buf, char *optional_param1);
void hashconfig_benchmark_defaults (hashconfig_t *hashconfig, salt_t *salt, void *esalt);
char *hashconfig_benchmark_mask (hashconfig_t *hashconfig);

73
src/hashcat.c
View File

@ -6815,77 +6815,12 @@ int main (int argc, char **argv)
local_free (hashes_buf);
/**
* special modification not set from parser
*/
char *optional_param1 = NULL;
switch (hashconfig->hash_mode)
{
case 6211: salts_buf->truecrypt_mdlen = 1 * 512; break;
case 6212: salts_buf->truecrypt_mdlen = 2 * 512; break;
case 6213: salts_buf->truecrypt_mdlen = 3 * 512; break;
case 6221: salts_buf->truecrypt_mdlen = 1 * 512; break;
case 6222: salts_buf->truecrypt_mdlen = 2 * 512; break;
case 6223: salts_buf->truecrypt_mdlen = 3 * 512; break;
case 6231: salts_buf->truecrypt_mdlen = 1 * 512; break;
case 6232: salts_buf->truecrypt_mdlen = 2 * 512; break;
case 6233: salts_buf->truecrypt_mdlen = 3 * 512; break;
case 6241: salts_buf->truecrypt_mdlen = 1 * 512; break;
case 6242: salts_buf->truecrypt_mdlen = 2 * 512; break;
case 6243: salts_buf->truecrypt_mdlen = 3 * 512; break;
case 13711: salts_buf->truecrypt_mdlen = 1 * 512; break;
case 13712: salts_buf->truecrypt_mdlen = 2 * 512; break;
case 13713: salts_buf->truecrypt_mdlen = 3 * 512; break;
case 13721: salts_buf->truecrypt_mdlen = 1 * 512; break;
case 13722: salts_buf->truecrypt_mdlen = 2 * 512; break;
case 13723: salts_buf->truecrypt_mdlen = 3 * 512; break;
case 13731: salts_buf->truecrypt_mdlen = 1 * 512; break;
case 13732: salts_buf->truecrypt_mdlen = 2 * 512; break;
case 13733: salts_buf->truecrypt_mdlen = 3 * 512; break;
case 13741: salts_buf->truecrypt_mdlen = 1 * 512; break;
case 13742: salts_buf->truecrypt_mdlen = 2 * 512; break;
case 13743: salts_buf->truecrypt_mdlen = 3 * 512; break;
case 13751: salts_buf->truecrypt_mdlen = 1 * 512; break;
case 13752: salts_buf->truecrypt_mdlen = 2 * 512; break;
case 13753: salts_buf->truecrypt_mdlen = 3 * 512; break;
case 13761: salts_buf->truecrypt_mdlen = 1 * 512; break;
case 13762: salts_buf->truecrypt_mdlen = 2 * 512; break;
case 13763: salts_buf->truecrypt_mdlen = 3 * 512; break;
}
if (truecrypt_keyfiles) optional_param1 = truecrypt_keyfiles;
if (veracrypt_keyfiles) optional_param1 = veracrypt_keyfiles;
if (truecrypt_keyfiles)
{
uint *keyfile_buf = ((tc_t *) esalts_buf)->keyfile_buf;
char *keyfiles = mystrdup (truecrypt_keyfiles);
char *keyfile = strtok (keyfiles, ",");
do
{
cpu_crc32 (keyfile, (u8 *) keyfile_buf);
} while ((keyfile = strtok (NULL, ",")) != NULL);
free (keyfiles);
}
if (veracrypt_keyfiles)
{
uint *keyfile_buf = ((tc_t *) esalts_buf)->keyfile_buf;
char *keyfiles = mystrdup (veracrypt_keyfiles);
char *keyfile = strtok (keyfiles, ",");
do
{
cpu_crc32 (keyfile, (u8 *) keyfile_buf);
} while ((keyfile = strtok (NULL, ",")) != NULL);
free (keyfiles);
}
hashconfig_general_defaults (hashconfig, salts_buf, salts_cnt, esalts_buf, optional_param1);
data.digests_cnt = digests_cnt;
data.digests_done = digests_done;

63
src/interface.c
View File

@ -19952,6 +19952,69 @@ uint hashconfig_general_pw_max (hashconfig_t *hashconfig)
return pw_max;
}
void hashconfig_general_defaults (hashconfig_t *hashconfig, salt_t *salts_buf, const int salts_cnt, void *esalts_buf, char *optional_param1)
{
/**
* special modification not set from parser
*/
for (int salts_pos = 0; salts_pos < salts_cnt; salts_pos++)
{
switch (hashconfig->hash_mode)
{
case 6211: salts_buf[salts_pos].truecrypt_mdlen = 1 * 512; break;
case 6212: salts_buf[salts_pos].truecrypt_mdlen = 2 * 512; break;
case 6213: salts_buf[salts_pos].truecrypt_mdlen = 3 * 512; break;
case 6221: salts_buf[salts_pos].truecrypt_mdlen = 1 * 512; break;
case 6222: salts_buf[salts_pos].truecrypt_mdlen = 2 * 512; break;
case 6223: salts_buf[salts_pos].truecrypt_mdlen = 3 * 512; break;
case 6231: salts_buf[salts_pos].truecrypt_mdlen = 1 * 512; break;
case 6232: salts_buf[salts_pos].truecrypt_mdlen = 2 * 512; break;
case 6233: salts_buf[salts_pos].truecrypt_mdlen = 3 * 512; break;
case 6241: salts_buf[salts_pos].truecrypt_mdlen = 1 * 512; break;
case 6242: salts_buf[salts_pos].truecrypt_mdlen = 2 * 512; break;
case 6243: salts_buf[salts_pos].truecrypt_mdlen = 3 * 512; break;
case 13711: salts_buf[salts_pos].truecrypt_mdlen = 1 * 512; break;
case 13712: salts_buf[salts_pos].truecrypt_mdlen = 2 * 512; break;
case 13713: salts_buf[salts_pos].truecrypt_mdlen = 3 * 512; break;
case 13721: salts_buf[salts_pos].truecrypt_mdlen = 1 * 512; break;
case 13722: salts_buf[salts_pos].truecrypt_mdlen = 2 * 512; break;
case 13723: salts_buf[salts_pos].truecrypt_mdlen = 3 * 512; break;
case 13731: salts_buf[salts_pos].truecrypt_mdlen = 1 * 512; break;
case 13732: salts_buf[salts_pos].truecrypt_mdlen = 2 * 512; break;
case 13733: salts_buf[salts_pos].truecrypt_mdlen = 3 * 512; break;
case 13741: salts_buf[salts_pos].truecrypt_mdlen = 1 * 512; break;
case 13742: salts_buf[salts_pos].truecrypt_mdlen = 2 * 512; break;
case 13743: salts_buf[salts_pos].truecrypt_mdlen = 3 * 512; break;
case 13751: salts_buf[salts_pos].truecrypt_mdlen = 1 * 512; break;
case 13752: salts_buf[salts_pos].truecrypt_mdlen = 2 * 512; break;
case 13753: salts_buf[salts_pos].truecrypt_mdlen = 3 * 512; break;
case 13761: salts_buf[salts_pos].truecrypt_mdlen = 1 * 512; break;
case 13762: salts_buf[salts_pos].truecrypt_mdlen = 2 * 512; break;
case 13763: salts_buf[salts_pos].truecrypt_mdlen = 3 * 512; break;
}
}
if (optional_param1)
{
char *tcvc_keyfiles = (char *) optional_param1;
uint *keyfile_buf = ((tc_t *) esalts_buf)->keyfile_buf;
char *keyfiles = mystrdup (tcvc_keyfiles);
char *keyfile = strtok (keyfiles, ",");
do
{
cpu_crc32 (keyfile, (u8 *) keyfile_buf);
} while ((keyfile = strtok (NULL, ",")) != NULL);
free (keyfiles);
}
}
void hashconfig_benchmark_defaults (hashconfig_t *hashconfig, salt_t *salt, void *esalt)
{
if (hashconfig->is_salted)