mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-22 16:18:09 +00:00
Fully rewrite dictstat logic to make it possible to pack it into a module
This commit is contained in:
jsteube
parent
e923c29435
commit
ecba0d295a
@ -12,6 +12,9 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <search.h>
|
||||
|
||||
#define MAX_DICTSTAT 10000
|
||||
|
||||
typedef struct
|
||||
@ -28,6 +31,27 @@ typedef struct
|
||||
|
||||
} dictstat_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
char *filename;
|
||||
|
||||
dictstat_t *base;
|
||||
|
||||
#if defined (_POSIX)
|
||||
size_t cnt;
|
||||
#else
|
||||
uint cnt;
|
||||
#endif
|
||||
|
||||
} dictstat_ctx_t;
|
||||
|
||||
int sort_by_dictstat (const void *s1, const void *s2);
|
||||
|
||||
void dictstat_init (dictstat_ctx_t *dictstat_ctx, char *profile_dir);
|
||||
void dictstat_destroy (dictstat_ctx_t *dictstat_ctx);
|
||||
void dictstat_read (dictstat_ctx_t *dictstat_ctx);
|
||||
int dictstat_write (dictstat_ctx_t *dictstat_ctx);
|
||||
u64 dictstat_find (dictstat_ctx_t *dictstat_ctx, dictstat_t *d);
|
||||
void dictstat_append (dictstat_ctx_t *dictstat_ctx, dictstat_t *d);
|
||||
|
||||
#endif // _DICTSTAT_H
|
||||
|
||||
115
src/dictstat.c
115
src/dictstat.c
@ -5,8 +5,13 @@
|
||||
|
||||
#include "common.h"
|
||||
#include "types_int.h"
|
||||
#include "memory.h"
|
||||
#include "filenames.h"
|
||||
#include "logging.h"
|
||||
#include "dictstat.h"
|
||||
|
||||
extern const int comptime;
|
||||
|
||||
int sort_by_dictstat (const void *s1, const void *s2)
|
||||
{
|
||||
dictstat_t *d1 = (dictstat_t *) s1;
|
||||
@ -20,3 +25,113 @@ int sort_by_dictstat (const void *s1, const void *s2)
|
||||
|
||||
return memcmp (&d1->stat, &d2->stat, sizeof (struct stat));
|
||||
}
|
||||
|
||||
void dictstat_init (dictstat_ctx_t *dictstat_ctx, char *profile_dir)
|
||||
{
|
||||
dictstat_ctx->filename = (char *) mymalloc (HCBUFSIZ_TINY);
|
||||
dictstat_ctx->base = (dictstat_t *) mycalloc (MAX_DICTSTAT, sizeof (dictstat_t));
|
||||
dictstat_ctx->cnt = 0;
|
||||
|
||||
generate_dictstat_filename (profile_dir, dictstat_ctx->filename);
|
||||
}
|
||||
|
||||
void dictstat_destroy (dictstat_ctx_t *dictstat_ctx)
|
||||
{
|
||||
myfree (dictstat_ctx->filename);
|
||||
myfree (dictstat_ctx->base);
|
||||
}
|
||||
|
||||
void dictstat_read (dictstat_ctx_t *dictstat_ctx)
|
||||
{
|
||||
FILE *fp = fopen (dictstat_ctx->filename, "rb");
|
||||
|
||||
if (fp == NULL)
|
||||
{
|
||||
// first run, file does not exist, do not error out
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
#if defined (_POSIX)
|
||||
struct stat tmpstat;
|
||||
|
||||
fstat (fileno (fp), &tmpstat);
|
||||
#endif
|
||||
|
||||
#if defined (_WIN)
|
||||
struct stat64 tmpstat;
|
||||
|
||||
_fstat64 (fileno (fp), &tmpstat);
|
||||
#endif
|
||||
|
||||
if (tmpstat.st_mtime < comptime)
|
||||
{
|
||||
/* with v0.15 the format changed so we have to ensure user is using a good version
|
||||
since there is no version-header in the dictstat file */
|
||||
|
||||
fclose (fp);
|
||||
|
||||
unlink (dictstat_ctx->filename);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
while (!feof (fp))
|
||||
{
|
||||
dictstat_t d;
|
||||
|
||||
const int nread = fread (&d, sizeof (dictstat_t), 1, fp);
|
||||
|
||||
if (nread == 0) continue;
|
||||
|
||||
lsearch (&d, dictstat_ctx->base, &dictstat_ctx->cnt, sizeof (dictstat_t), sort_by_dictstat);
|
||||
|
||||
if (dictstat_ctx->cnt == MAX_DICTSTAT)
|
||||
{
|
||||
log_error ("ERROR: There are too many entries in the %s database. You have to remove/rename it.", dictstat_ctx->filename);
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
fclose (fp);
|
||||
}
|
||||
|
||||
int dictstat_write (dictstat_ctx_t *dictstat_ctx)
|
||||
{
|
||||
FILE *fp = fopen (dictstat_ctx->filename, "wb");
|
||||
|
||||
if (fp == NULL)
|
||||
{
|
||||
log_error ("ERROR: %s: %s", dictstat_ctx->filename, strerror (errno));
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
fwrite (dictstat_ctx->base, sizeof (dictstat_t), dictstat_ctx->cnt, fp);
|
||||
|
||||
fclose (fp);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
u64 dictstat_find (dictstat_ctx_t *dictstat_ctx, dictstat_t *d)
|
||||
{
|
||||
dictstat_t *d_cache = (dictstat_t *) lfind (d, dictstat_ctx->base, &dictstat_ctx->cnt, sizeof (dictstat_t), sort_by_dictstat);
|
||||
|
||||
if (d_cache == NULL) return 0;
|
||||
|
||||
return d_cache->cnt;
|
||||
}
|
||||
|
||||
void dictstat_append (dictstat_ctx_t *dictstat_ctx, dictstat_t *d)
|
||||
{
|
||||
if (dictstat_ctx->cnt == MAX_DICTSTAT)
|
||||
{
|
||||
log_error ("ERROR: There are too many entries in the %s database. You have to remove/rename it.", dictstat_ctx->filename);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
lsearch (d, dictstat_ctx->base, &dictstat_ctx->cnt, sizeof (dictstat_t), sort_by_dictstat);
|
||||
}
|
||||
|
||||
112
src/hashcat.c
112
src/hashcat.c
@ -84,6 +84,8 @@ static const char *PROGNAME = "hashcat";
|
||||
|
||||
static double TARGET_MS_PROFILE[4] = { 2, 12, 96, 480 };
|
||||
|
||||
const int comptime = COMPTIME;
|
||||
|
||||
#define INCR_RULES 10000
|
||||
#define INCR_SALTS 100000
|
||||
#define INCR_MASKS 1000
|
||||
@ -3279,13 +3281,7 @@ static int run_cracker (hc_device_param_t *device_param, const uint pws_cnt)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if defined (_POSIX)
|
||||
static u64 count_words (wl_data_t *wl_data, FILE *fd, char *dictfile, dictstat_t *dictstat_base, size_t *dictstat_nmemb)
|
||||
#endif
|
||||
|
||||
#if defined (_WIN)
|
||||
static u64 count_words (wl_data_t *wl_data, FILE *fd, char *dictfile, dictstat_t *dictstat_base, uint *dictstat_nmemb)
|
||||
#endif
|
||||
static u64 count_words (wl_data_t *wl_data, FILE *fd, const char *dictfile, dictstat_ctx_t *dictstat_ctx)
|
||||
{
|
||||
hc_signal (NULL);
|
||||
|
||||
@ -3315,15 +3311,13 @@ static u64 count_words (wl_data_t *wl_data, FILE *fd, char *dictfile, dictstat_t
|
||||
|
||||
if (d.stat.st_size == 0) return 0;
|
||||
|
||||
dictstat_t *d_cache = (dictstat_t *) lfind (&d, dictstat_base, dictstat_nmemb, sizeof (dictstat_t), sort_by_dictstat);
|
||||
const u64 cached_cnt = dictstat_find (dictstat_ctx, &d);
|
||||
|
||||
if (run_rule_engine (data.rule_len_l, data.rule_buf_l) == 0)
|
||||
{
|
||||
if (d_cache)
|
||||
if (cached_cnt)
|
||||
{
|
||||
u64 cnt = d_cache->cnt;
|
||||
|
||||
u64 keyspace = cnt;
|
||||
u64 keyspace = cached_cnt;
|
||||
|
||||
if (data.attack_kern == ATTACK_KERN_STRAIGHT)
|
||||
{
|
||||
@ -3334,7 +3328,7 @@ static u64 count_words (wl_data_t *wl_data, FILE *fd, char *dictfile, dictstat_t
|
||||
keyspace *= data.combs_cnt;
|
||||
}
|
||||
|
||||
if (data.quiet == 0) log_info ("Cache-hit dictionary stats %s: %" PRIu64 " bytes, %" PRIu64 " words, %" PRIu64 " keyspace", dictfile, d.stat.st_size, cnt, keyspace);
|
||||
if (data.quiet == 0) log_info ("Cache-hit dictionary stats %s: %" PRIu64 " bytes, %" PRIu64 " words, %" PRIu64 " keyspace", dictfile, d.stat.st_size, cached_cnt, keyspace);
|
||||
if (data.quiet == 0) log_info ("");
|
||||
|
||||
hc_signal (sigHandler_default);
|
||||
@ -3419,7 +3413,7 @@ static u64 count_words (wl_data_t *wl_data, FILE *fd, char *dictfile, dictstat_t
|
||||
if (data.quiet == 0) log_info ("Generated dictionary stats for %s: %" PRIu64 " bytes, %" PRIu64 " words, %" PRIu64 " keyspace", dictfile, comp, cnt2, cnt);
|
||||
if (data.quiet == 0) log_info ("");
|
||||
|
||||
lsearch (&d, dictstat_base, dictstat_nmemb, sizeof (dictstat_t), sort_by_dictstat);
|
||||
dictstat_append (dictstat_ctx, &d);
|
||||
|
||||
hc_signal (sigHandler_default);
|
||||
|
||||
@ -10589,70 +10583,13 @@ int main (int argc, char **argv)
|
||||
* dictstat
|
||||
*/
|
||||
|
||||
dictstat_t *dictstat_base = (dictstat_t *) mycalloc (MAX_DICTSTAT, sizeof (dictstat_t));
|
||||
dictstat_ctx_t dictstat_ctx;
|
||||
|
||||
#if defined (_POSIX)
|
||||
size_t dictstat_nmemb = 0;
|
||||
#endif
|
||||
|
||||
#if defined (_WIN)
|
||||
uint dictstat_nmemb = 0;
|
||||
#endif
|
||||
|
||||
char dictstat_filename[HCBUFSIZ_TINY];
|
||||
|
||||
FILE *dictstat_fp = NULL;
|
||||
dictstat_init (&dictstat_ctx, profile_dir);
|
||||
|
||||
if (keyspace == 0)
|
||||
{
|
||||
generate_dictstat_filename (profile_dir, dictstat_filename);
|
||||
|
||||
dictstat_fp = fopen (dictstat_filename, "rb");
|
||||
|
||||
if (dictstat_fp)
|
||||
{
|
||||
#if defined (_POSIX)
|
||||
struct stat tmpstat;
|
||||
|
||||
fstat (fileno (dictstat_fp), &tmpstat);
|
||||
#endif
|
||||
|
||||
#if defined (_WIN)
|
||||
struct stat64 tmpstat;
|
||||
|
||||
_fstat64 (fileno (dictstat_fp), &tmpstat);
|
||||
#endif
|
||||
|
||||
if (tmpstat.st_mtime < COMPTIME)
|
||||
{
|
||||
/* with v0.15 the format changed so we have to ensure user is using a good version
|
||||
since there is no version-header in the dictstat file */
|
||||
|
||||
fclose (dictstat_fp);
|
||||
|
||||
unlink (dictstat_filename);
|
||||
}
|
||||
else
|
||||
{
|
||||
while (!feof (dictstat_fp))
|
||||
{
|
||||
dictstat_t d;
|
||||
|
||||
if (fread (&d, sizeof (dictstat_t), 1, dictstat_fp) == 0) continue;
|
||||
|
||||
lsearch (&d, dictstat_base, &dictstat_nmemb, sizeof (dictstat_t), sort_by_dictstat);
|
||||
|
||||
if (dictstat_nmemb == (MAX_DICTSTAT - 1000))
|
||||
{
|
||||
log_error ("ERROR: There are too many entries in the %s database. You have to remove/rename it.", dictstat_filename);
|
||||
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
fclose (dictstat_fp);
|
||||
}
|
||||
}
|
||||
dictstat_read (&dictstat_ctx);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -16697,7 +16634,7 @@ int main (int argc, char **argv)
|
||||
|
||||
data.quiet = 1;
|
||||
|
||||
const u64 words1_cnt = count_words (wl_data, fp1, dictfile1, dictstat_base, &dictstat_nmemb);
|
||||
const u64 words1_cnt = count_words (wl_data, fp1, dictfile1, &dictstat_ctx);
|
||||
|
||||
data.quiet = quiet;
|
||||
|
||||
@ -16715,7 +16652,7 @@ int main (int argc, char **argv)
|
||||
|
||||
data.quiet = 1;
|
||||
|
||||
const u64 words2_cnt = count_words (wl_data, fp2, dictfile2, dictstat_base, &dictstat_nmemb);
|
||||
const u64 words2_cnt = count_words (wl_data, fp2, dictfile2, &dictstat_ctx);
|
||||
|
||||
data.quiet = quiet;
|
||||
|
||||
@ -17811,7 +17748,7 @@ int main (int argc, char **argv)
|
||||
return -1;
|
||||
}
|
||||
|
||||
data.words_cnt = count_words (wl_data, fd2, dictfile, dictstat_base, &dictstat_nmemb);
|
||||
data.words_cnt = count_words (wl_data, fd2, dictfile, &dictstat_ctx);
|
||||
|
||||
fclose (fd2);
|
||||
|
||||
@ -17842,7 +17779,7 @@ int main (int argc, char **argv)
|
||||
return -1;
|
||||
}
|
||||
|
||||
data.words_cnt = count_words (wl_data, fd2, dictfile, dictstat_base, &dictstat_nmemb);
|
||||
data.words_cnt = count_words (wl_data, fd2, dictfile, &dictstat_ctx);
|
||||
|
||||
fclose (fd2);
|
||||
}
|
||||
@ -17857,7 +17794,7 @@ int main (int argc, char **argv)
|
||||
return -1;
|
||||
}
|
||||
|
||||
data.words_cnt = count_words (wl_data, fd2, dictfile2, dictstat_base, &dictstat_nmemb);
|
||||
data.words_cnt = count_words (wl_data, fd2, dictfile2, &dictstat_ctx);
|
||||
|
||||
fclose (fd2);
|
||||
}
|
||||
@ -17898,7 +17835,7 @@ int main (int argc, char **argv)
|
||||
return -1;
|
||||
}
|
||||
|
||||
data.words_cnt = count_words (wl_data, fd2, dictfile, dictstat_base, &dictstat_nmemb);
|
||||
data.words_cnt = count_words (wl_data, fd2, dictfile, &dictstat_ctx);
|
||||
|
||||
fclose (fd2);
|
||||
|
||||
@ -18243,16 +18180,7 @@ int main (int argc, char **argv)
|
||||
|
||||
if (keyspace == 0)
|
||||
{
|
||||
dictstat_fp = fopen (dictstat_filename, "wb");
|
||||
|
||||
if (dictstat_fp)
|
||||
{
|
||||
lock_file (dictstat_fp);
|
||||
|
||||
fwrite (dictstat_base, sizeof (dictstat_t), dictstat_nmemb, dictstat_fp);
|
||||
|
||||
fclose (dictstat_fp);
|
||||
}
|
||||
dictstat_write (&dictstat_ctx);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -18829,9 +18757,9 @@ int main (int argc, char **argv)
|
||||
|
||||
// free memory
|
||||
|
||||
local_free (masks);
|
||||
dictstat_destroy (&dictstat_ctx);
|
||||
|
||||
local_free (dictstat_base);
|
||||
local_free (masks);
|
||||
|
||||
for (uint pot_pos = 0; pot_pos < pot_cnt; pot_pos++)
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user