arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-29 11:28:15 +00:00
Code Issues Releases Wiki Activity

Remove Wordload-Profiles from tuningdb, we can simply calculate it

Browse Source
This commit is contained in:
Jens Steube 2016-02-11 14:16:08 +01:00
parent 02a6f2b4a6
commit 2dfe9200d6
4 changed files with 1700 additions and 4956 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6577
hashcat_tuning.hctab
View File

File diff suppressed because it is too large Load Diff

2
include/shared.h
View File

@ -1433,7 +1433,7 @@ void sp_stretch_root (hcstat_table_t *in, hcstat_table_t *out);
void tuning_db_destroy (tuning_db_t *tuning_db); void tuning_db_destroy (tuning_db_t *tuning_db);
tuning_db_t *tuning_db_alloc (FILE *fp); tuning_db_t *tuning_db_alloc (FILE *fp);
tuning_db_t *tuning_db_init (const char *tuning_db_file); tuning_db_t *tuning_db_init (const char *tuning_db_file);
tuning_db_entry_t *tuning_db_search (tuning_db_t *tuning_db, char *device_name, int attack_mode, int hash_type, int workload_profile); tuning_db_entry_t *tuning_db_search (tuning_db_t *tuning_db, char *device_name, int attack_mode, int hash_type);
int bcrypt_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf); int bcrypt_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf);
int cisco4_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf); int cisco4_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf);

23
src/oclHashcat.c
View File

@ -12484,7 +12484,7 @@ int main (int argc, char **argv)
// tuning db // tuning db
tuning_db_entry_t *tuningdb_entry = tuning_db_search (tuning_db, device_param->device_name, attack_mode, hash_mode, workload_profile); tuning_db_entry_t *tuningdb_entry = tuning_db_search (tuning_db, device_param->device_name, attack_mode, hash_mode);
// device_version // device_version
@ -12529,8 +12529,10 @@ int main (int argc, char **argv)
if (opti_type & OPTI_TYPE_USES_BITS_64) if (opti_type & OPTI_TYPE_USES_BITS_64)
{ {
hc_clGetDeviceInfo (data.ocl, device_param->device, CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG, sizeof (vector_width), &vector_width, NULL); hc_clGetDeviceInfo (data.ocl, device_param->device, CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG, sizeof (vector_width), &vector_width, NULL);
} else { }
hc_clGetDeviceInfo (data.ocl, device_param->device, CL_DEVICE_PREFERRED_VECTOR_WIDTH_INT, sizeof (vector_width), &vector_width, NULL); else
{
hc_clGetDeviceInfo (data.ocl, device_param->device, CL_DEVICE_PREFERRED_VECTOR_WIDTH_INT, sizeof (vector_width), &vector_width, NULL);
} }
} }
else else
@ -12779,7 +12781,7 @@ int main (int argc, char **argv)
uint _kernel_accel = kernel_accel; uint _kernel_accel = kernel_accel;
uint _kernel_loops = kernel_loops; uint _kernel_loops = kernel_loops;
tuning_db_entry_t *tuningdb_entry = tuning_db_search (tuning_db, device_param->device_name, attack_mode, hash_mode, workload_profile); tuning_db_entry_t *tuningdb_entry = tuning_db_search (tuning_db, device_param->device_name, attack_mode, hash_mode);
if (kernel_accel_chgd == 0) if (kernel_accel_chgd == 0)
{ {
@ -12791,6 +12793,19 @@ int main (int argc, char **argv)
_kernel_loops = tuningdb_entry->kernel_loops; _kernel_loops = tuningdb_entry->kernel_loops;
} }
if (workload_profile == 1)
{
_kernel_loops = (_kernel_loops > 8) ? _kernel_loops / 8 : 1;
}
else if (workload_profile == 2)
{
_kernel_loops = (_kernel_loops > 4) ? _kernel_loops / 4 : 1;
}
/**
* there's a few algorithm that force a fixed kernel_loop count
*/
if ((opts_type & OPTS_TYPE_PT_BITSLICE) && (attack_mode == ATTACK_MODE_BF)) if ((opts_type & OPTS_TYPE_PT_BITSLICE) && (attack_mode == ATTACK_MODE_BF))
{ {
_kernel_loops = 1024; _kernel_loops = 1024;

54
src/shared.c
View File

@ -4787,11 +4787,6 @@ int sort_by_tuning_db_entry (const void *v1, const void *v2)
if (res3 != 0) return (res3); if (res3 != 0) return (res3);
const int res4 = t1->workload_profile
- t2->workload_profile;
if (res4 != 0) return (res4);
return 0; return 0;
} }
@ -9161,7 +9156,7 @@ tuning_db_t *tuning_db_init (const char *tuning_db_file)
tuning_db->alias_cnt++; tuning_db->alias_cnt++;
} }
else if (token_cnt == 7) else if (token_cnt == 6)
{ {
if ((token_ptr[1][0] != '0') && if ((token_ptr[1][0] != '0') &&
(token_ptr[1][0] != '1') && (token_ptr[1][0] != '1') &&
@ -9175,21 +9170,11 @@ tuning_db_t *tuning_db_init (const char *tuning_db_file)
if ((token_ptr[3][0] != '1') && if ((token_ptr[3][0] != '1') &&
(token_ptr[3][0] != '2') && (token_ptr[3][0] != '2') &&
(token_ptr[3][0] != '3') && (token_ptr[3][0] != '4') &&
(token_ptr[3][0] != '*')) (token_ptr[3][0] != '8') &&
(token_ptr[3][0] != 'N'))
{ {
log_info ("WARNING: Tuning-db: Invalid workload_profile '%c' in Line '%u'", token_ptr[3][0], line_num); log_info ("WARNING: Tuning-db: Invalid vector_width '%c' in Line '%u'", token_ptr[3][0], line_num);
continue;
}
if ((token_ptr[4][0] != '1') &&
(token_ptr[4][0] != '2') &&
(token_ptr[4][0] != '4') &&
(token_ptr[4][0] != '8') &&
(token_ptr[4][0] != 'N'))
{
log_info ("WARNING: Tuning-db: Invalid vector_width '%c' in Line '%u'", token_ptr[4][0], line_num);
continue; continue;
} }
@ -9198,17 +9183,15 @@ tuning_db_t *tuning_db_init (const char *tuning_db_file)
int attack_mode = -1; int attack_mode = -1;
int hash_type = -1; int hash_type = -1;
int workload_profile = -1;
int vector_width = -1; int vector_width = -1;
int kernel_accel = -1; int kernel_accel = -1;
int kernel_loops = -1; int kernel_loops = -1;
if (token_ptr[1][0] != '*') attack_mode = atoi (token_ptr[1]); if (token_ptr[1][0] != '*') attack_mode = atoi (token_ptr[1]);
if (token_ptr[2][0] != '*') hash_type = atoi (token_ptr[2]); if (token_ptr[2][0] != '*') hash_type = atoi (token_ptr[2]);
if (token_ptr[3][0] != '*') workload_profile = atoi (token_ptr[3]); if (token_ptr[3][0] != 'N') vector_width = atoi (token_ptr[3]);
if (token_ptr[4][0] != 'N') vector_width = atoi (token_ptr[4]);
kernel_accel = atoi (token_ptr[5]); kernel_accel = atoi (token_ptr[4]);
if ((kernel_accel < 1) || (kernel_accel > 1024)) if ((kernel_accel < 1) || (kernel_accel > 1024))
{ {
@ -9217,7 +9200,7 @@ tuning_db_t *tuning_db_init (const char *tuning_db_file)
continue; continue;
} }
kernel_loops = atoi (token_ptr[6]); kernel_loops = atoi (token_ptr[5]);
if ((kernel_loops < 1) || (kernel_loops > 1024)) if ((kernel_loops < 1) || (kernel_loops > 1024))
{ {
@ -9231,7 +9214,6 @@ tuning_db_t *tuning_db_init (const char *tuning_db_file)
entry->device_name = mystrdup (device_name); entry->device_name = mystrdup (device_name);
entry->attack_mode = attack_mode; entry->attack_mode = attack_mode;
entry->hash_type = hash_type; entry->hash_type = hash_type;
entry->workload_profile = workload_profile;
entry->vector_width = vector_width; entry->vector_width = vector_width;
entry->kernel_accel = kernel_accel; entry->kernel_accel = kernel_accel;
entry->kernel_loops = kernel_loops; entry->kernel_loops = kernel_loops;
@ -9258,7 +9240,7 @@ tuning_db_t *tuning_db_init (const char *tuning_db_file)
return tuning_db; return tuning_db;
} }
tuning_db_entry_t *tuning_db_search (tuning_db_t *tuning_db, char *device_name, int attack_mode, int hash_type, int workload_profile) tuning_db_entry_t *tuning_db_search (tuning_db_t *tuning_db, char *device_name, int attack_mode, int hash_type)
{ {
static tuning_db_entry_t s; static tuning_db_entry_t s;
@ -9292,21 +9274,19 @@ tuning_db_entry_t *tuning_db_search (tuning_db_t *tuning_db, char *device_name,
// bsearch is not ideal but fast enough // bsearch is not ideal but fast enough
s.device_name = device_name_nospace; s.device_name = device_name_nospace;
s.attack_mode = attack_mode; s.attack_mode = attack_mode;
s.hash_type = hash_type; s.hash_type = hash_type;
s.workload_profile = workload_profile;
tuning_db_entry_t *entry = NULL; tuning_db_entry_t *entry = NULL;
// this will produce all 2^4 combinations required // this will produce all 2^3 combinations required
for (i = 0; i < 16; i++) for (i = 0; i < 8; i++)
{ {
s.device_name = (i & 1) ? "*" : device_name_nospace; s.device_name = (i & 1) ? "*" : device_name_nospace;
s.attack_mode = (i & 2) ? -1 : attack_mode; s.attack_mode = (i & 2) ? -1 : attack_mode;
s.hash_type = (i & 4) ? -1 : hash_type; s.hash_type = (i & 4) ? -1 : hash_type;
s.workload_profile = (i & 8) ? -1 : workload_profile;
entry = bsearch (&s, tuning_db->entry_buf, tuning_db->entry_cnt, sizeof (tuning_db_entry_t), sort_by_tuning_db_entry); entry = bsearch (&s, tuning_db->entry_buf, tuning_db->entry_cnt, sizeof (tuning_db_entry_t), sort_by_tuning_db_entry);