Fixing minor definitions.

pull/311/head
Francois Gaudreault 8 years ago
parent 1e1d310f45
commit 96e60bfb05

@ -691,8 +691,8 @@ extern hc_thread_mutex_t mux_display;
#define DISPLAY_LEN_MAX_13300 1 + 12 + 1 + 40 #define DISPLAY_LEN_MAX_13300 1 + 12 + 1 + 40
#define DISPLAY_LEN_MIN_13400 1 + 7 + 1 + 1 + 1 + 1 + 1 + 1 + 32 + 1 + 64 + 1 + 32 + 1 + 64 + 1 + 1 + 1 + 1 #define DISPLAY_LEN_MIN_13400 1 + 7 + 1 + 1 + 1 + 1 + 1 + 1 + 32 + 1 + 64 + 1 + 32 + 1 + 64 + 1 + 1 + 1 + 1
#define DISPLAY_LEN_MAX_13400 1 + 7 + 1 + 1 + 10 + 1 + 3 + 1 + 64 + 1 + 64 + 1 + 32 + 1 + 64 + 1 + 4 + 1 + 600000 + 1 + 2 + 1 + 64 #define DISPLAY_LEN_MAX_13400 1 + 7 + 1 + 1 + 10 + 1 + 3 + 1 + 64 + 1 + 64 + 1 + 32 + 1 + 64 + 1 + 4 + 1 + 600000 + 1 + 2 + 1 + 64
#define DISPLAY_LEN_MIN_13500 40 + 1 + 16 * 2 #define DISPLAY_LEN_MIN_13500 40 + 1 + 32
#define DISPLAY_LEN_MAX_13500 40 + 1 + 512 * 2 #define DISPLAY_LEN_MAX_13500 40 + 1 + 1024
#define DISPLAY_LEN_MIN_11 32 + 1 + 16 #define DISPLAY_LEN_MIN_11 32 + 1 + 16
#define DISPLAY_LEN_MAX_11 32 + 1 + 32 #define DISPLAY_LEN_MAX_11 32 + 1 + 32

@ -268,6 +268,7 @@ static uint default_benchmark_algorithms[NUM_DEFAULT_BENCHMARK_ALGORITHMS] =
8700, 8700,
9100, 9100,
133, 133,
13500,
11600, 11600,
12500, 12500,
13000, 13000,
@ -300,7 +301,6 @@ static uint default_benchmark_algorithms[NUM_DEFAULT_BENCHMARK_ALGORITHMS] =
11300, 11300,
12700, 12700,
13400, 13400,
13500,
125 125
}; };
@ -10295,15 +10295,13 @@ int main (int argc, char **argv)
attack_exec = ATTACK_EXEC_INSIDE_KERNEL; attack_exec = ATTACK_EXEC_INSIDE_KERNEL;
opts_type = OPTS_TYPE_PT_GENERATE_BE opts_type = OPTS_TYPE_PT_GENERATE_BE
| OPTS_TYPE_PT_UNICODE | OPTS_TYPE_PT_UNICODE
| OPTS_TYPE_PT_ADD80 | OPTS_TYPE_PT_ADD80;
| OPTS_TYPE_ST_ADDBITS15;
kern_type = KERN_TYPE_SHA1_SLTPWU; kern_type = KERN_TYPE_SHA1_SLTPWU;
dgst_size = DGST_SIZE_4_5; dgst_size = DGST_SIZE_4_5;
parse_func = pstoken_parse_hash; parse_func = pstoken_parse_hash;
sort_by_digest = sort_by_digest_4_5; sort_by_digest = sort_by_digest_4_5;
opti_type = OPTI_TYPE_ZERO_BYTE opti_type = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_PRECOMPUTE_INIT | OPTI_TYPE_PRECOMPUTE_INIT
| OPTI_TYPE_PRECOMPUTE_MERKLE
| OPTI_TYPE_EARLY_SKIP | OPTI_TYPE_EARLY_SKIP
| OPTI_TYPE_NOT_ITERATED | OPTI_TYPE_NOT_ITERATED
| OPTI_TYPE_PREPENDED_SALT | OPTI_TYPE_PREPENDED_SALT

Loading…
Cancel
Save