From 148c4335aa3352198d9f7f76fdc38f9968e36add Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 27 Sep 2017 19:29:25 -0700 Subject: [PATCH 1/2] fix printf formats. --- src/interface.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/interface.c b/src/interface.c index d0cca51ac..a593bfade 100644 --- a/src/interface.c +++ b/src/interface.c @@ -18433,7 +18433,7 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_le cost++; } - snprintf (out_buf, out_len - 1, "%s%d$%u$%d$%s$%u$%08x%08x%08x%08x$%u$%u$%u$%s", + snprintf (out_buf, out_len - 1, "%s%u$%u$%u$%s$%u$%08x%08x%08x%08x$%u$%u$%u$%s", SIGNATURE_SEVEN_ZIP, salt.salt_sign[0], cost, @@ -18453,7 +18453,7 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_le { u32 bytes_written = strlen (out_buf); - snprintf (out_buf + bytes_written, out_len - bytes_written - 1, "$%i$", seven_zip->crc_len); + snprintf (out_buf + bytes_written, out_len - bytes_written - 1, "$%u$", seven_zip->crc_len); bytes_written = strlen (out_buf); @@ -19044,7 +19044,7 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_le wpky[80] = 0; - snprintf (out_buf, out_len - 1, "%s*%i*%s*%i*%s**", + snprintf (out_buf, out_len - 1, "%s*%u*%s*%u*%s**", SIGNATURE_ITUNES_BACKUP, salt.salt_sign[0], wpky, @@ -19106,7 +19106,7 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_le dpsl[40] = 0; - snprintf (out_buf, out_len - 1, "%s*%i*%s*%i*%s*%i*%s", + snprintf (out_buf, out_len - 1, "%s*%u*%s*%u*%s*%u*%s", SIGNATURE_ITUNES_BACKUP, salt.salt_sign[0], wpky, @@ -19127,7 +19127,7 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_le // output: - snprintf (out_buf, out_len - 1, "$sha1$%i$%s$%s", + snprintf (out_buf, out_len - 1, "$sha1$%u$%s$%s", salt.salt_iter + 1, (char *) salt.salt_buf, ptr_plain); @@ -19224,7 +19224,7 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_le memcpy(hash_algorithm, "sha1", strlen("sha1")); } - snprintf (out_buf, out_len - 1, "%s%d*%d*%s*%s*%s*%d*%s*%d*%s", + snprintf (out_buf, out_len - 1, "%s%u*%u*%s*%s*%s*%u*%s*%u*%s", SIGNATURE_DPAPIMK, version, context, @@ -19289,7 +19289,7 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_le ethereum_pbkdf2_t *ethereum_pbkdf2s = (ethereum_pbkdf2_t *) esalts_buf; ethereum_pbkdf2_t *ethereum_pbkdf2 = ðereum_pbkdf2s[digest_cur]; - snprintf (out_buf, out_len - 1, "%s*%d*%s*%08x%08x%08x%08x%08x%08x%08x%08x*%08x%08x%08x%08x%08x%08x%08x%08x", + snprintf (out_buf, out_len - 1, "%s*%u*%s*%08x%08x%08x%08x%08x%08x%08x%08x*%08x%08x%08x%08x%08x%08x%08x%08x", SIGNATURE_ETHEREUM_PBKDF2, salt.salt_iter + 1, (char *) salt.salt_buf, @@ -19316,7 +19316,7 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_le ethereum_scrypt_t *ethereum_scrypts = (ethereum_scrypt_t *) esalts_buf; ethereum_scrypt_t *ethereum_scrypt = ðereum_scrypts[digest_cur]; - snprintf (out_buf, out_len - 1, "%s*%d*%d*%d*%s*%08x%08x%08x%08x%08x%08x%08x%08x*%08x%08x%08x%08x%08x%08x%08x%08x", + snprintf (out_buf, out_len - 1, "%s*%u*%u*%u*%s*%08x%08x%08x%08x%08x%08x%08x%08x*%08x%08x%08x%08x%08x%08x%08x%08x", SIGNATURE_ETHEREUM_SCRYPT, salt.scrypt_N, salt.scrypt_r, @@ -19507,7 +19507,7 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_le const chacha20_t *chacha20_tmp = (const chacha20_t *) esalts_buf; const chacha20_t *chacha20 = &chacha20_tmp[digest_cur]; - snprintf (out_buf, out_len - 1, "%s*%08x%08x*%d*%08x%08x*%08x%08x*%08x%08x", + snprintf (out_buf, out_len - 1, "%s*%08x%08x*%u*%08x%08x*%08x%08x*%08x%08x", SIGNATURE_CHACHA20, byte_swap_32(chacha20->position[0]), byte_swap_32(chacha20->position[1]), From da621fa3be819764ae590a35bc877924daffe79f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 27 Sep 2017 19:31:54 -0700 Subject: [PATCH 2/2] fix some clang -Weverything warnings --- include/shared.h | 2 +- src/dispatch.c | 2 +- src/monitor.c | 12 ++++++------ src/user_options.c | 4 +--- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/include/shared.h b/include/shared.h index 2c8ab99e8..bc4ab8f25 100644 --- a/include/shared.h +++ b/include/shared.h @@ -31,7 +31,7 @@ char *filename_from_filepath (char *filepath); void naive_replace (char *s, const char key_char, const char replace_char); void naive_escape (char *s, size_t s_max, const char key_char, const char escape_char); -void hc_asprintf (char **strp, const char *fmt, ...); +__attribute__ ((format (printf, 2, 3))) void hc_asprintf (char **strp, const char *fmt, ...); void hc_sleep_msec (const u32 msec); void hc_sleep (const u32 sec); diff --git a/src/dispatch.c b/src/dispatch.c index c3a36ad1b..02d104919 100644 --- a/src/dispatch.c +++ b/src/dispatch.c @@ -126,7 +126,7 @@ static int calc_stdin (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_par bool iconv_enabled = false; - iconv_t iconv_ctx; + iconv_t iconv_ctx = NULL; char *iconv_tmp = NULL; diff --git a/src/monitor.c b/src/monitor.c index b4ce64e7a..a3b6b41c4 100644 --- a/src/monitor.c +++ b/src/monitor.c @@ -58,12 +58,12 @@ static int monitor (hashcat_ctx_t *hashcat_ctx) bool hwmon_check = false; bool performance_check = false; - const int sleep_time = 1; - const int temp_threshold = 1; // degrees celcius - const int fan_speed_min = 33; // in percentage - const int fan_speed_max = 100; - const float exec_low = 50.0f; // in ms - const float util_low = 90.0f; // in percent + const int sleep_time = 1; + const int temp_threshold = 1; // degrees celcius + const int fan_speed_min = 33; // in percentage + const int fan_speed_max = 100; + const double exec_low = 50.0; // in ms + const double util_low = 90.0; // in percent if (user_options->runtime) { diff --git a/src/user_options.c b/src/user_options.c index 2361265af..e12ebeb8e 100644 --- a/src/user_options.c +++ b/src/user_options.c @@ -111,7 +111,7 @@ static const struct option long_options[] = {"version", no_argument, 0, IDX_VERSION}, {"weak-hash-threshold", required_argument, 0, IDX_WEAK_HASH_THRESHOLD}, {"workload-profile", required_argument, 0, IDX_WORKLOAD_PROFILE}, - {0, 0, 0, 0} + {} }; static char ENCODING_FROM[] = "utf-8"; @@ -304,8 +304,6 @@ int user_options_getopt (hashcat_ctx_t *hashcat_ctx, int argc, char **argv) return -1; } - - break; } }