arno
/
hashcat
mirror of https://github.com/hashcat/hashcat.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1331 from philsmd/master

Browse Source 
use an overflow check instead of a hard coded max. value for ETA
pull/1332/head
Jens Steube 7 years ago committed by GitHub
parent 58012ada0c 1644ac30b5
commit a697ad87ae
6 changed files with 89 additions and 73 deletions
Show Stats Download Patch File Download Diff File

1
docs/changes.txt
Unescape View File

@ -25,6 +25,7 @@
- Fixed a memory problem that occured when the OpenCL folder was not found and e.g. the shared and session folder were the same
- Fixed the version number used in the restore file header
- Fixed the parsing of command line options. It doesn't show two times the same error about an invalid option anymore.
- Fixed the estimated time value whenever the value is very large and overflows
##
## Improvements

4
include/shared.h
Unescape View File

@ -62,4 +62,8 @@ void hc_string_trim_leading (char *s);
size_t hc_fread (void *ptr, size_t size, size_t nmemb, FILE *stream);
void hc_fwrite (const void *ptr, size_t size, size_t nmemb, FILE *stream);
void hc_time (hc_time_t *t);
struct tm *hc_gmtime (hc_time_t *t);
char *hc_ctime (hc_time_t *t, char *buf, MAYBE_UNUSED size_t buf_size);
#endif // _SHARED_H

1
include/status.h
Unescape View File

@ -47,6 +47,7 @@ double status_get_msec_paused (const hashcat_ctx_t *hashcat_
double status_get_msec_real (const hashcat_ctx_t *hashcat_ctx);
char *status_get_time_started_absolute (const hashcat_ctx_t *hashcat_ctx);
char *status_get_time_started_relative (const hashcat_ctx_t *hashcat_ctx);
hc_time_t status_get_sec_etc (const hashcat_ctx_t *hashcat_ctx);
char *status_get_time_estimated_absolute (const hashcat_ctx_t *hashcat_ctx);
char *status_get_time_estimated_relative (const hashcat_ctx_t *hashcat_ctx);
u64 status_get_restore_point (const hashcat_ctx_t *hashcat_ctx);

8
include/types.h
Unescape View File

@ -43,6 +43,14 @@ typedef uint16_t u16;
typedef uint32_t u32;
typedef uint64_t u64;
// time
#if defined (_WIN)
typedef __time64_t hc_time_t;
#else
typedef time_t hc_time_t;
#endif
// timer
#if defined (_WIN)

37
src/shared.c
Unescape View File

@ -441,3 +441,40 @@ void hc_fwrite (const void *ptr, size_t size, size_t nmemb, FILE *stream)
if (rc == 0) rc = 0;
}
void hc_time (hc_time_t *t)
{
#if defined (_WIN)
_time64 (t);
#else
time (t);
#endif
}
struct tm *hc_gmtime (hc_time_t *t)
{
#if defined (_WIN)
return _gmtime64 (t);
#else
return gmtime (t);
#endif
}
char *hc_ctime (hc_time_t *t, char *buf, MAYBE_UNUSED size_t buf_size)
{
char *etc = NULL;
#if defined (_WIN)
etc = _ctime64 (t);
if (etc != NULL)
{
snprintf (buf, buf_size, "%s", etc);
}
#else
etc = ctime_r (t, buf); // buf should have room for at least 26 bytes
#endif
return etc;
}

111
src/status.c
Unescape View File

@ -18,6 +18,7 @@
#include "mpsp.h"
#include "terminal.h"
#include "status.h"
#include "shared.h"
static const char ST_0000[] = "Initializing";
static const char ST_0001[] = "Autotuning";
@ -36,6 +37,9 @@ static const char ST_9999[] = "Unknown! Bug!";
static const char UNITS[7] = { ' ', 'k', 'M', 'G', 'T', 'P', 'E' };
static const char ETA_ABSOLUTE_MAX_EXCEEDED[] = "Next Big Bang"; // in honor of ighashgpu
static const char ETA_RELATIVE_MAX_EXCEEDED[] = "> 10 years";
static char *status_get_rules_file (const hashcat_ctx_t *hashcat_ctx)
{
const user_options_t *user_options = hashcat_ctx->user_options;
@ -981,16 +985,12 @@ char *status_get_time_started_relative (const hashcat_ctx_t *hashcat_ctx)
return display_run;
}
char *status_get_time_estimated_absolute (const hashcat_ctx_t *hashcat_ctx)
hc_time_t status_get_sec_etc (const hashcat_ctx_t *hashcat_ctx)
{
const status_ctx_t *status_ctx = hashcat_ctx->status_ctx;
const user_options_extra_t *user_options_extra = hashcat_ctx->user_options_extra;
#if defined (_WIN)
__time64_t sec_etc = 0;
#else
time_t sec_etc = 0;
#endif
hc_time_t sec_etc = 0;
if ((user_options_extra->wordlist_mode == WL_MODE_FILE) || (user_options_extra->wordlist_mode == WL_MODE_MASK))
{
@ -1014,21 +1014,33 @@ char *status_get_time_estimated_absolute (const hashcat_ctx_t *hashcat_ctx)
}
}
// we need this check to avoid integer overflow
if (sec_etc > 100000000)
{
sec_etc = 100000000;
}
return sec_etc;
}
time_t now;
char *status_get_time_estimated_absolute (const hashcat_ctx_t *hashcat_ctx)
{
hc_time_t sec_etc = status_get_sec_etc (hashcat_ctx);
time (&now);
hc_time_t now;
hc_time (&now);
now += sec_etc;
char buf[32] = { 0 };
char *etc = ctime_r (&now, buf);
char *etc;
if (overflow_check_u64_add (now, sec_etc) == false)
{
etc = (char *) ETA_ABSOLUTE_MAX_EXCEEDED;
}
else
{
hc_time_t end = now + sec_etc;
etc = hc_ctime (&end, buf, sizeof (buf));
if (etc == NULL) etc = (char *) ETA_ABSOLUTE_MAX_EXCEEDED;
}
const size_t etc_len = strlen (etc);
@ -1040,59 +1052,22 @@ char *status_get_time_estimated_absolute (const hashcat_ctx_t *hashcat_ctx)
char *status_get_time_estimated_relative (const hashcat_ctx_t *hashcat_ctx)
{
const status_ctx_t *status_ctx = hashcat_ctx->status_ctx;
const user_options_t *user_options = hashcat_ctx->user_options;
const user_options_extra_t *user_options_extra = hashcat_ctx->user_options_extra;
#if defined (_WIN)
__time64_t sec_etc = 0;
#else
time_t sec_etc = 0;
#endif
if ((user_options_extra->wordlist_mode == WL_MODE_FILE) || (user_options_extra->wordlist_mode == WL_MODE_MASK))
{
if (status_ctx->devices_status != STATUS_CRACKED)
{
const u64 progress_cur_relative_skip = status_get_progress_cur_relative_skip (hashcat_ctx);
const u64 progress_end_relative_skip = status_get_progress_end_relative_skip (hashcat_ctx);
const user_options_t *user_options = hashcat_ctx->user_options;
const u64 progress_ignore = status_get_progress_ignore (hashcat_ctx);
char *display = (char *) malloc (HCBUFSIZ_TINY);
const double hashes_msec_all = status_get_hashes_msec_all (hashcat_ctx);
hc_time_t sec_etc = status_get_sec_etc (hashcat_ctx);
if (hashes_msec_all > 0)
{
const u64 progress_left_relative_skip = progress_end_relative_skip - progress_cur_relative_skip;
struct tm *tmp = hc_gmtime (&sec_etc);
u64 msec_left = (u64) ((progress_left_relative_skip - progress_ignore) / hashes_msec_all);
sec_etc = msec_left / 1000;
}
}
if (tmp == NULL)
{
snprintf (display, HCBUFSIZ_TINY, "%s", ETA_RELATIVE_MAX_EXCEEDED);
}
// we need this check to avoid integer overflow
#if defined (_WIN)
if (sec_etc > 100000000)
else
{
sec_etc = 100000000;
format_timer_display (tmp, display, HCBUFSIZ_TINY);
}
#endif
struct tm *tmp;
#if defined (_WIN)
tmp = _gmtime64 (&sec_etc);
#else
struct tm tm;
tmp = gmtime_r (&sec_etc, &tm);
#endif
char *display = (char *) malloc (HCBUFSIZ_TINY);
format_timer_display (tmp, display, HCBUFSIZ_TINY);
if (user_options->runtime > 0)
{
@ -1102,21 +1077,11 @@ char *status_get_time_estimated_relative (const hashcat_ctx_t *hashcat_ctx)
if (runtime_left > 0)
{
#if defined (_WIN)
__time64_t sec_left = runtime_left;
#else
time_t sec_left = runtime_left;
#endif
hc_time_t sec_left = runtime_left;
struct tm *tmp_left;
#if defined (_WIN)
tmp_left = _gmtime64 (&sec_left);
#else
struct tm tm_left;
tmp_left = gmtime_r (&sec_left, &tm_left);
#endif
tmp_left = hc_gmtime (&sec_left);
char *display_left = (char *) malloc (HCBUFSIZ_TINY);

Write Preview
Loading…
Cancel
Save