From e72bd958baf684fb5b5d181c1e1fa91483556555 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Wed, 15 Jan 2020 20:27:08 +0100 Subject: [PATCH] Fix some formating --- src/modules/module_00300.c | 10 +++++----- src/modules/module_01300.c | 14 +++++++------- src/modules/module_01700.c | 16 ++++++++-------- src/modules/module_15000.c | 16 ++++++++-------- src/modules/module_21000.c | 16 ++++++++-------- src/modules/module_22200.c | 16 ++++++++-------- src/user_options.c | 2 +- tools/benchmark_deep.pl | 2 +- 8 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/modules/module_00300.c b/src/modules/module_00300.c index 3764d565b..00fccfe0a 100644 --- a/src/modules/module_00300.c +++ b/src/modules/module_00300.c @@ -121,11 +121,11 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE u8 *out_buf = (u8 *) line_buf; - u32_to_hex (tmp[0], out_buf + 0); - u32_to_hex (tmp[1], out_buf + 8); - u32_to_hex (tmp[2], out_buf + 16); - u32_to_hex (tmp[3], out_buf + 24); - u32_to_hex (tmp[4], out_buf + 32); + u32_to_hex (tmp[0], out_buf + 0); + u32_to_hex (tmp[1], out_buf + 8); + u32_to_hex (tmp[2], out_buf + 16); + u32_to_hex (tmp[3], out_buf + 24); + u32_to_hex (tmp[4], out_buf + 32); const int out_len = 40; diff --git a/src/modules/module_01300.c b/src/modules/module_01300.c index 3d0172a4a..7811626e7 100644 --- a/src/modules/module_01300.c +++ b/src/modules/module_01300.c @@ -134,13 +134,13 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE u8 *out_buf = (u8 *) line_buf; - u32_to_hex (tmp[ 0], out_buf + 0); - u32_to_hex (tmp[ 1], out_buf + 8); - u32_to_hex (tmp[ 2], out_buf + 16); - u32_to_hex (tmp[ 3], out_buf + 24); - u32_to_hex (tmp[ 4], out_buf + 32); - u32_to_hex (tmp[ 5], out_buf + 40); - u32_to_hex (tmp[ 6], out_buf + 48); + u32_to_hex (tmp[ 0], out_buf + 0); + u32_to_hex (tmp[ 1], out_buf + 8); + u32_to_hex (tmp[ 2], out_buf + 16); + u32_to_hex (tmp[ 3], out_buf + 24); + u32_to_hex (tmp[ 4], out_buf + 32); + u32_to_hex (tmp[ 5], out_buf + 40); + u32_to_hex (tmp[ 6], out_buf + 48); const int out_len = 56; diff --git a/src/modules/module_01700.c b/src/modules/module_01700.c index fda53c0e0..79b5cb8b8 100644 --- a/src/modules/module_01700.c +++ b/src/modules/module_01700.c @@ -142,14 +142,14 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE u8 *out_buf = (u8 *) line_buf; - u64_to_hex (tmp[0], out_buf + 0); - u64_to_hex (tmp[1], out_buf + 16); - u64_to_hex (tmp[2], out_buf + 32); - u64_to_hex (tmp[3], out_buf + 48); - u64_to_hex (tmp[4], out_buf + 64); - u64_to_hex (tmp[5], out_buf + 80); - u64_to_hex (tmp[6], out_buf + 96); - u64_to_hex (tmp[7], out_buf + 112); + u64_to_hex (tmp[0], out_buf + 0); + u64_to_hex (tmp[1], out_buf + 16); + u64_to_hex (tmp[2], out_buf + 32); + u64_to_hex (tmp[3], out_buf + 48); + u64_to_hex (tmp[4], out_buf + 64); + u64_to_hex (tmp[5], out_buf + 80); + u64_to_hex (tmp[6], out_buf + 96); + u64_to_hex (tmp[7], out_buf + 112); const int out_len = 128; diff --git a/src/modules/module_15000.c b/src/modules/module_15000.c index ea57ea224..3ccc9c068 100644 --- a/src/modules/module_15000.c +++ b/src/modules/module_15000.c @@ -188,14 +188,14 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE int out_len = 0; - u64_to_hex (tmp[0], out_buf + out_len); out_len += 16; - u64_to_hex (tmp[1], out_buf + out_len); out_len += 16; - u64_to_hex (tmp[2], out_buf + out_len); out_len += 16; - u64_to_hex (tmp[3], out_buf + out_len); out_len += 16; - u64_to_hex (tmp[4], out_buf + out_len); out_len += 16; - u64_to_hex (tmp[5], out_buf + out_len); out_len += 16; - u64_to_hex (tmp[6], out_buf + out_len); out_len += 16; - u64_to_hex (tmp[7], out_buf + out_len); out_len += 16; + u64_to_hex (tmp[0], out_buf + out_len); out_len += 16; + u64_to_hex (tmp[1], out_buf + out_len); out_len += 16; + u64_to_hex (tmp[2], out_buf + out_len); out_len += 16; + u64_to_hex (tmp[3], out_buf + out_len); out_len += 16; + u64_to_hex (tmp[4], out_buf + out_len); out_len += 16; + u64_to_hex (tmp[5], out_buf + out_len); out_len += 16; + u64_to_hex (tmp[6], out_buf + out_len); out_len += 16; + u64_to_hex (tmp[7], out_buf + out_len); out_len += 16; out_buf[out_len] = hashconfig->separator; diff --git a/src/modules/module_21000.c b/src/modules/module_21000.c index 41e32c006..737d3679f 100644 --- a/src/modules/module_21000.c +++ b/src/modules/module_21000.c @@ -142,14 +142,14 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE u8 *out_buf = (u8 *) line_buf; - u64_to_hex (tmp[0], out_buf + 0); - u64_to_hex (tmp[1], out_buf + 16); - u64_to_hex (tmp[2], out_buf + 32); - u64_to_hex (tmp[3], out_buf + 48); - u64_to_hex (tmp[4], out_buf + 64); - u64_to_hex (tmp[5], out_buf + 80); - u64_to_hex (tmp[6], out_buf + 96); - u64_to_hex (tmp[7], out_buf + 112); + u64_to_hex (tmp[0], out_buf + 0); + u64_to_hex (tmp[1], out_buf + 16); + u64_to_hex (tmp[2], out_buf + 32); + u64_to_hex (tmp[3], out_buf + 48); + u64_to_hex (tmp[4], out_buf + 64); + u64_to_hex (tmp[5], out_buf + 80); + u64_to_hex (tmp[6], out_buf + 96); + u64_to_hex (tmp[7], out_buf + 112); const int out_len = 128; diff --git a/src/modules/module_22200.c b/src/modules/module_22200.c index 04ec5fd81..d9ba12286 100644 --- a/src/modules/module_22200.c +++ b/src/modules/module_22200.c @@ -175,14 +175,14 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE memcpy (out_buf + out_len, tmp_salt, 8); out_len += 8; - u64_to_hex (tmp[0], out_buf + out_len); out_len += 16; - u64_to_hex (tmp[1], out_buf + out_len); out_len += 16; - u64_to_hex (tmp[2], out_buf + out_len); out_len += 16; - u64_to_hex (tmp[3], out_buf + out_len); out_len += 16; - u64_to_hex (tmp[4], out_buf + out_len); out_len += 16; - u64_to_hex (tmp[5], out_buf + out_len); out_len += 16; - u64_to_hex (tmp[6], out_buf + out_len); out_len += 16; - u64_to_hex (tmp[7], out_buf + out_len); out_len += 16; + u64_to_hex (tmp[0], out_buf + out_len); out_len += 16; + u64_to_hex (tmp[1], out_buf + out_len); out_len += 16; + u64_to_hex (tmp[2], out_buf + out_len); out_len += 16; + u64_to_hex (tmp[3], out_buf + out_len); out_len += 16; + u64_to_hex (tmp[4], out_buf + out_len); out_len += 16; + u64_to_hex (tmp[5], out_buf + out_len); out_len += 16; + u64_to_hex (tmp[6], out_buf + out_len); out_len += 16; + u64_to_hex (tmp[7], out_buf + out_len); out_len += 16; return out_len; } diff --git a/src/user_options.c b/src/user_options.c index a395850f4..e6811f87e 100644 --- a/src/user_options.c +++ b/src/user_options.c @@ -399,7 +399,7 @@ int user_options_getopt (hashcat_ctx_t *hashcat_ctx, int argc, char **argv) case IDX_RESTORE_DISABLE: user_options->restore_disable = true; break; case IDX_RESTORE_FILE_PATH: user_options->restore_file_path = optarg; break; case IDX_STATUS: user_options->status = true; break; - case IDX_STATUS_JSON: user_options->status_json = true; break; + case IDX_STATUS_JSON: user_options->status_json = true; break; case IDX_STATUS_TIMER: user_options->status_timer = hc_strtoul (optarg, NULL, 10); break; case IDX_MACHINE_READABLE: user_options->machine_readable = true; break; case IDX_LOOPBACK: user_options->loopback = true; break; diff --git a/tools/benchmark_deep.pl b/tools/benchmark_deep.pl index e75332dba..a8ab578bf 100755 --- a/tools/benchmark_deep.pl +++ b/tools/benchmark_deep.pl @@ -8,7 +8,7 @@ my $amd_cache = "~/.AMD"; my $hashcat_path = "."; my $kernels_cache = "$hashcat_path/kernels"; my $hashcat_bin = "$hashcat_path/hashcat"; -my $device = 1; +my $device = 5; my $workload_profile = 3; my $runtime = 24; my $sleep_sec = 12;