mirror of
https://github.com/hashcat/hashcat.git
synced 2024-12-22 22:58:30 +00:00
Finalize potfile specific functions migration to their own source file
This commit is contained in:
jsteube
parent
f809937b1e
commit
53db51dcc3
@ -12,6 +12,13 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* weak hashes shutcut
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define LM_WEAK_HASH "\x4e\xcf\x0d\x0c\x0a\xe2\xfb\xc1"
|
||||||
|
#define LM_MASKED_PLAIN "[notfound]"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* types
|
* types
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -13,7 +13,6 @@
|
|||||||
|
|
||||||
#define INCR_POT 1000
|
#define INCR_POT 1000
|
||||||
|
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
char plain_buf[HCBUFSIZ_TINY];
|
char plain_buf[HCBUFSIZ_TINY];
|
||||||
@ -37,17 +36,26 @@ typedef struct
|
|||||||
|
|
||||||
} potfile_ctx_t;
|
} potfile_ctx_t;
|
||||||
|
|
||||||
int sort_by_pot (const void *v1, const void *v2);
|
int sort_by_pot (const void *v1, const void *v2);
|
||||||
|
int sort_by_salt_buf (const void *v1, const void *v2);
|
||||||
|
int sort_by_hash_t_salt (const void *v1, const void *v2);
|
||||||
|
int sort_by_hash_t_salt_hccap (const void *v1, const void *v2);
|
||||||
|
|
||||||
|
void handle_show_request (pot_t *pot, uint pot_cnt, char *input_buf, int input_len, hash_t *hashes_buf, int (*sort_by_pot) (const void *, const void *), FILE *out_fp, hashconfig_t *hashconfig);
|
||||||
|
void handle_left_request (pot_t *pot, uint pot_cnt, char *input_buf, int input_len, hash_t *hashes_buf, int (*sort_by_pot) (const void *, const void *), FILE *out_fp, hashconfig_t *hashconfig);
|
||||||
|
void handle_show_request_lm (pot_t *pot, uint pot_cnt, char *input_buf, int input_len, hash_t *hash_left, hash_t *hash_right, int (*sort_by_pot) (const void *, const void *), FILE *out_fp, hashconfig_t *hashconfig);
|
||||||
|
void handle_left_request_lm (pot_t *pot, uint pot_cnt, char *input_buf, int input_len, hash_t *hash_left, hash_t *hash_right, int (*sort_by_pot) (const void *, const void *), FILE *out_fp, hashconfig_t *hashconfig);
|
||||||
|
|
||||||
void potfile_init (potfile_ctx_t *potfile_ctx, const char *profile_dir, const char *potfile_path);
|
void potfile_init (potfile_ctx_t *potfile_ctx, const char *profile_dir, const char *potfile_path);
|
||||||
int potfile_read_open (potfile_ctx_t *potfile_ctx);
|
int potfile_read_open (potfile_ctx_t *potfile_ctx);
|
||||||
void potfile_read_parse (potfile_ctx_t *potfile_ctx, hashconfig_t *hashconfig);
|
void potfile_read_parse (potfile_ctx_t *potfile_ctx, const hashconfig_t *hashconfig);
|
||||||
void potfile_read_close (potfile_ctx_t *potfile_ctx);
|
void potfile_read_close (potfile_ctx_t *potfile_ctx);
|
||||||
int potfile_write_open (potfile_ctx_t *potfile_ctx);
|
int potfile_write_open (potfile_ctx_t *potfile_ctx);
|
||||||
void potfile_write_close (potfile_ctx_t *potfile_ctx);
|
void potfile_write_close (potfile_ctx_t *potfile_ctx);
|
||||||
void potfile_write_append (potfile_ctx_t *potfile_ctx, const char *out_buf, u8 *plain_ptr, unsigned int plain_len);
|
void potfile_write_append (potfile_ctx_t *potfile_ctx, const char *out_buf, u8 *plain_ptr, unsigned int plain_len);
|
||||||
void potfile_hash_alloc (potfile_ctx_t *potfile_ctx, hashconfig_t *hashconfig, const uint num);
|
void potfile_hash_alloc (potfile_ctx_t *potfile_ctx, const hashconfig_t *hashconfig, const uint num);
|
||||||
void potfile_hash_free (potfile_ctx_t *potfile_ctx, hashconfig_t *hashconfig);
|
void potfile_hash_free (potfile_ctx_t *potfile_ctx, const hashconfig_t *hashconfig);
|
||||||
|
int potfile_remove_parse (potfile_ctx_t *potfile_ctx, const hashconfig_t *hashconfig, const hash_t *hashes_buf, const uint hashes_cnt);
|
||||||
void potfile_destroy (potfile_ctx_t *potfile_ctx);
|
void potfile_destroy (potfile_ctx_t *potfile_ctx);
|
||||||
|
|
||||||
#endif // _POTFILE_H
|
#endif // _POTFILE_H
|
||||||
|
|||||||
549
src/hashcat.c
549
src/hashcat.c
@ -403,7 +403,6 @@ int sort_by_digest_p0p1 (const void *v1, const void *v2)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int sort_by_salt (const void *v1, const void *v2)
|
int sort_by_salt (const void *v1, const void *v2)
|
||||||
{
|
{
|
||||||
const salt_t *s1 = (const salt_t *) v1;
|
const salt_t *s1 = (const salt_t *) v1;
|
||||||
@ -438,83 +437,6 @@ int sort_by_salt (const void *v1, const void *v2)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int sort_by_salt_buf (const void *v1, const void *v2)
|
|
||||||
{
|
|
||||||
const pot_t *p1 = (const pot_t *) v1;
|
|
||||||
const pot_t *p2 = (const pot_t *) v2;
|
|
||||||
|
|
||||||
const hash_t *h1 = &p1->hash;
|
|
||||||
const hash_t *h2 = &p2->hash;
|
|
||||||
|
|
||||||
const salt_t *s1 = h1->salt;
|
|
||||||
const salt_t *s2 = h2->salt;
|
|
||||||
|
|
||||||
uint n = 16;
|
|
||||||
|
|
||||||
while (n--)
|
|
||||||
{
|
|
||||||
if (s1->salt_buf[n] > s2->salt_buf[n]) return ( 1);
|
|
||||||
if (s1->salt_buf[n] < s2->salt_buf[n]) return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int sort_by_hash_t_salt (const void *v1, const void *v2)
|
|
||||||
{
|
|
||||||
const hash_t *h1 = (const hash_t *) v1;
|
|
||||||
const hash_t *h2 = (const hash_t *) v2;
|
|
||||||
|
|
||||||
const salt_t *s1 = h1->salt;
|
|
||||||
const salt_t *s2 = h2->salt;
|
|
||||||
|
|
||||||
// testphase: this should work
|
|
||||||
uint n = 16;
|
|
||||||
|
|
||||||
while (n--)
|
|
||||||
{
|
|
||||||
if (s1->salt_buf[n] > s2->salt_buf[n]) return ( 1);
|
|
||||||
if (s1->salt_buf[n] < s2->salt_buf[n]) return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* original code, seems buggy since salt_len can be very big (had a case with 131 len)
|
|
||||||
also it thinks salt_buf[x] is a char but its a uint so salt_len should be / 4
|
|
||||||
if (s1->salt_len > s2->salt_len) return ( 1);
|
|
||||||
if (s1->salt_len < s2->salt_len) return -1;
|
|
||||||
|
|
||||||
uint n = s1->salt_len;
|
|
||||||
|
|
||||||
while (n--)
|
|
||||||
{
|
|
||||||
if (s1->salt_buf[n] > s2->salt_buf[n]) return ( 1);
|
|
||||||
if (s1->salt_buf[n] < s2->salt_buf[n]) return -1;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int sort_by_hash_t_salt_hccap (const void *v1, const void *v2)
|
|
||||||
{
|
|
||||||
const hash_t *h1 = (const hash_t *) v1;
|
|
||||||
const hash_t *h2 = (const hash_t *) v2;
|
|
||||||
|
|
||||||
const salt_t *s1 = h1->salt;
|
|
||||||
const salt_t *s2 = h2->salt;
|
|
||||||
|
|
||||||
// last 2: salt_buf[10] and salt_buf[11] contain the digest (skip them)
|
|
||||||
|
|
||||||
uint n = 9; // 9 * 4 = 36 bytes (max length of ESSID)
|
|
||||||
|
|
||||||
while (n--)
|
|
||||||
{
|
|
||||||
if (s1->salt_buf[n] > s2->salt_buf[n]) return ( 1);
|
|
||||||
if (s1->salt_buf[n] < s2->salt_buf[n]) return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int sort_by_hash_no_salt (const void *v1, const void *v2)
|
int sort_by_hash_no_salt (const void *v1, const void *v2)
|
||||||
{
|
{
|
||||||
const hash_t *h1 = (const hash_t *) v1;
|
const hash_t *h1 = (const hash_t *) v1;
|
||||||
@ -547,8 +469,6 @@ int sort_by_hash (const void *v1, const void *v2)
|
|||||||
return sort_by_digest_p0p1 (d1, d2);
|
return sort_by_digest_p0p1 (d1, d2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int sort_by_mtime (const void *p1, const void *p2)
|
int sort_by_mtime (const void *p1, const void *p2)
|
||||||
{
|
{
|
||||||
const char **f1 = (const char **) p1;
|
const char **f1 = (const char **) p1;
|
||||||
@ -723,263 +643,6 @@ void format_output (FILE *out_fp, char *out_buf, unsigned char *plain_ptr, const
|
|||||||
fputs (EOL, out_fp);
|
fputs (EOL, out_fp);
|
||||||
}
|
}
|
||||||
|
|
||||||
void handle_show_request (pot_t *pot, uint pot_cnt, char *input_buf, int input_len, hash_t *hashes_buf, int (*sort_by_pot) (const void *, const void *), FILE *out_fp, hashconfig_t *hashconfig)
|
|
||||||
{
|
|
||||||
pot_t pot_key;
|
|
||||||
|
|
||||||
pot_key.hash.salt = hashes_buf->salt;
|
|
||||||
pot_key.hash.digest = hashes_buf->digest;
|
|
||||||
|
|
||||||
pot_t *pot_ptr = (pot_t *) bsearch (&pot_key, pot, pot_cnt, sizeof (pot_t), sort_by_pot);
|
|
||||||
|
|
||||||
if (pot_ptr)
|
|
||||||
{
|
|
||||||
log_info_nn ("");
|
|
||||||
|
|
||||||
input_buf[input_len] = 0;
|
|
||||||
|
|
||||||
// user
|
|
||||||
unsigned char *username = NULL;
|
|
||||||
uint user_len = 0;
|
|
||||||
|
|
||||||
if (data.username)
|
|
||||||
{
|
|
||||||
user_t *user = hashes_buf->hash_info->user;
|
|
||||||
|
|
||||||
if (user)
|
|
||||||
{
|
|
||||||
username = (unsigned char *) (user->user_name);
|
|
||||||
|
|
||||||
user_len = user->user_len;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// do output the line
|
|
||||||
format_output (out_fp, input_buf, (unsigned char *) pot_ptr->plain_buf, pot_ptr->plain_len, 0, username, user_len, hashconfig);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#define LM_WEAK_HASH "\x4e\xcf\x0d\x0c\x0a\xe2\xfb\xc1"
|
|
||||||
#define LM_MASKED_PLAIN "[notfound]"
|
|
||||||
|
|
||||||
void handle_show_request_lm (pot_t *pot, uint pot_cnt, char *input_buf, int input_len, hash_t *hash_left, hash_t *hash_right, int (*sort_by_pot) (const void *, const void *), FILE *out_fp, hashconfig_t *hashconfig)
|
|
||||||
{
|
|
||||||
// left
|
|
||||||
|
|
||||||
pot_t pot_left_key;
|
|
||||||
|
|
||||||
pot_left_key.hash.salt = hash_left->salt;
|
|
||||||
pot_left_key.hash.digest = hash_left->digest;
|
|
||||||
|
|
||||||
pot_t *pot_left_ptr = (pot_t *) bsearch (&pot_left_key, pot, pot_cnt, sizeof (pot_t), sort_by_pot);
|
|
||||||
|
|
||||||
// right
|
|
||||||
|
|
||||||
uint weak_hash_found = 0;
|
|
||||||
|
|
||||||
pot_t pot_right_key;
|
|
||||||
|
|
||||||
pot_right_key.hash.salt = hash_right->salt;
|
|
||||||
pot_right_key.hash.digest = hash_right->digest;
|
|
||||||
|
|
||||||
pot_t *pot_right_ptr = (pot_t *) bsearch (&pot_right_key, pot, pot_cnt, sizeof (pot_t), sort_by_pot);
|
|
||||||
|
|
||||||
if (pot_right_ptr == NULL)
|
|
||||||
{
|
|
||||||
// special case, if "weak hash"
|
|
||||||
|
|
||||||
if (memcmp (hash_right->digest, LM_WEAK_HASH, 8) == 0)
|
|
||||||
{
|
|
||||||
weak_hash_found = 1;
|
|
||||||
|
|
||||||
pot_right_ptr = (pot_t *) mycalloc (1, sizeof (pot_t));
|
|
||||||
|
|
||||||
// in theory this is not needed, but we are paranoia:
|
|
||||||
|
|
||||||
memset (pot_right_ptr->plain_buf, 0, sizeof (pot_right_ptr->plain_buf));
|
|
||||||
pot_right_ptr->plain_len = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((pot_left_ptr == NULL) && (pot_right_ptr == NULL))
|
|
||||||
{
|
|
||||||
if (weak_hash_found == 1) myfree (pot_right_ptr); // this shouldn't happen at all: if weak_hash_found == 1, than pot_right_ptr is not NULL for sure
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// at least one half was found:
|
|
||||||
|
|
||||||
log_info_nn ("");
|
|
||||||
|
|
||||||
input_buf[input_len] = 0;
|
|
||||||
|
|
||||||
// user
|
|
||||||
|
|
||||||
unsigned char *username = NULL;
|
|
||||||
uint user_len = 0;
|
|
||||||
|
|
||||||
if (data.username)
|
|
||||||
{
|
|
||||||
user_t *user = hash_left->hash_info->user;
|
|
||||||
|
|
||||||
if (user)
|
|
||||||
{
|
|
||||||
username = (unsigned char *) (user->user_name);
|
|
||||||
|
|
||||||
user_len = user->user_len;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// mask the part which was not found
|
|
||||||
|
|
||||||
uint left_part_masked = 0;
|
|
||||||
uint right_part_masked = 0;
|
|
||||||
|
|
||||||
uint mask_plain_len = strlen (LM_MASKED_PLAIN);
|
|
||||||
|
|
||||||
if (pot_left_ptr == NULL)
|
|
||||||
{
|
|
||||||
left_part_masked = 1;
|
|
||||||
|
|
||||||
pot_left_ptr = (pot_t *) mycalloc (1, sizeof (pot_t));
|
|
||||||
|
|
||||||
memset (pot_left_ptr->plain_buf, 0, sizeof (pot_left_ptr->plain_buf));
|
|
||||||
|
|
||||||
memcpy (pot_left_ptr->plain_buf, LM_MASKED_PLAIN, mask_plain_len);
|
|
||||||
pot_left_ptr->plain_len = mask_plain_len;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pot_right_ptr == NULL)
|
|
||||||
{
|
|
||||||
right_part_masked = 1;
|
|
||||||
|
|
||||||
pot_right_ptr = (pot_t *) mycalloc (1, sizeof (pot_t));
|
|
||||||
|
|
||||||
memset (pot_right_ptr->plain_buf, 0, sizeof (pot_right_ptr->plain_buf));
|
|
||||||
|
|
||||||
memcpy (pot_right_ptr->plain_buf, LM_MASKED_PLAIN, mask_plain_len);
|
|
||||||
pot_right_ptr->plain_len = mask_plain_len;
|
|
||||||
}
|
|
||||||
|
|
||||||
// create the pot_ptr out of pot_left_ptr and pot_right_ptr
|
|
||||||
|
|
||||||
pot_t pot_ptr;
|
|
||||||
|
|
||||||
pot_ptr.plain_len = pot_left_ptr->plain_len + pot_right_ptr->plain_len;
|
|
||||||
|
|
||||||
memcpy (pot_ptr.plain_buf, pot_left_ptr->plain_buf, pot_left_ptr->plain_len);
|
|
||||||
|
|
||||||
memcpy (pot_ptr.plain_buf + pot_left_ptr->plain_len, pot_right_ptr->plain_buf, pot_right_ptr->plain_len);
|
|
||||||
|
|
||||||
// do output the line
|
|
||||||
|
|
||||||
format_output (out_fp, input_buf, (unsigned char *) pot_ptr.plain_buf, pot_ptr.plain_len, 0, username, user_len, hashconfig);
|
|
||||||
|
|
||||||
if (weak_hash_found == 1) myfree (pot_right_ptr);
|
|
||||||
|
|
||||||
if (left_part_masked == 1) myfree (pot_left_ptr);
|
|
||||||
if (right_part_masked == 1) myfree (pot_right_ptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
void handle_left_request (pot_t *pot, uint pot_cnt, char *input_buf, int input_len, hash_t *hashes_buf, int (*sort_by_pot) (const void *, const void *), FILE *out_fp, hashconfig_t *hashconfig)
|
|
||||||
{
|
|
||||||
pot_t pot_key;
|
|
||||||
|
|
||||||
memcpy (&pot_key.hash, hashes_buf, sizeof (hash_t));
|
|
||||||
|
|
||||||
pot_t *pot_ptr = (pot_t *) bsearch (&pot_key, pot, pot_cnt, sizeof (pot_t), sort_by_pot);
|
|
||||||
|
|
||||||
if (pot_ptr == NULL)
|
|
||||||
{
|
|
||||||
log_info_nn ("");
|
|
||||||
|
|
||||||
input_buf[input_len] = 0;
|
|
||||||
|
|
||||||
format_output (out_fp, input_buf, NULL, 0, 0, NULL, 0, hashconfig);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void handle_left_request_lm (pot_t *pot, uint pot_cnt, char *input_buf, int input_len, hash_t *hash_left, hash_t *hash_right, int (*sort_by_pot) (const void *, const void *), FILE *out_fp, hashconfig_t *hashconfig)
|
|
||||||
{
|
|
||||||
// left
|
|
||||||
|
|
||||||
pot_t pot_left_key;
|
|
||||||
|
|
||||||
memcpy (&pot_left_key.hash, hash_left, sizeof (hash_t));
|
|
||||||
|
|
||||||
pot_t *pot_left_ptr = (pot_t *) bsearch (&pot_left_key, pot, pot_cnt, sizeof (pot_t), sort_by_pot);
|
|
||||||
|
|
||||||
// right
|
|
||||||
|
|
||||||
pot_t pot_right_key;
|
|
||||||
|
|
||||||
memcpy (&pot_right_key.hash, hash_right, sizeof (hash_t));
|
|
||||||
|
|
||||||
pot_t *pot_right_ptr = (pot_t *) bsearch (&pot_right_key, pot, pot_cnt, sizeof (pot_t), sort_by_pot);
|
|
||||||
|
|
||||||
uint weak_hash_found = 0;
|
|
||||||
|
|
||||||
if (pot_right_ptr == NULL)
|
|
||||||
{
|
|
||||||
// special case, if "weak hash"
|
|
||||||
|
|
||||||
if (memcmp (hash_right->digest, LM_WEAK_HASH, 8) == 0)
|
|
||||||
{
|
|
||||||
weak_hash_found = 1;
|
|
||||||
|
|
||||||
// we just need that pot_right_ptr is not a NULL pointer
|
|
||||||
|
|
||||||
pot_right_ptr = (pot_t *) mycalloc (1, sizeof (pot_t));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((pot_left_ptr != NULL) && (pot_right_ptr != NULL))
|
|
||||||
{
|
|
||||||
if (weak_hash_found == 1) myfree (pot_right_ptr);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// ... at least one part was not cracked
|
|
||||||
|
|
||||||
log_info_nn ("");
|
|
||||||
|
|
||||||
input_buf[input_len] = 0;
|
|
||||||
|
|
||||||
// only show the hash part which is still not cracked
|
|
||||||
|
|
||||||
uint user_len = (uint)input_len - 32u;
|
|
||||||
|
|
||||||
char *hash_output = (char *) mymalloc (33);
|
|
||||||
|
|
||||||
memcpy (hash_output, input_buf, input_len);
|
|
||||||
|
|
||||||
if (pot_left_ptr != NULL)
|
|
||||||
{
|
|
||||||
// only show right part (because left part was already found)
|
|
||||||
|
|
||||||
memcpy (hash_output + user_len, input_buf + user_len + 16, 16);
|
|
||||||
|
|
||||||
hash_output[user_len + 16] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pot_right_ptr != NULL)
|
|
||||||
{
|
|
||||||
// only show left part (because right part was already found)
|
|
||||||
|
|
||||||
memcpy (hash_output + user_len, input_buf + user_len, 16);
|
|
||||||
|
|
||||||
hash_output[user_len + 16] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
format_output (out_fp, hash_output, NULL, 0, 0, NULL, 0, hashconfig);
|
|
||||||
|
|
||||||
myfree (hash_output);
|
|
||||||
|
|
||||||
if (weak_hash_found == 1) myfree (pot_right_ptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
static char *stroptitype (const uint opti_type)
|
static char *stroptitype (const uint opti_type)
|
||||||
{
|
{
|
||||||
switch (opti_type)
|
switch (opti_type)
|
||||||
@ -1141,10 +804,6 @@ static void hc_signal (void (callback) (int))
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void clear_prompt ()
|
static void clear_prompt ()
|
||||||
{
|
{
|
||||||
fputc ('\r', stdout);
|
fputc ('\r', stdout);
|
||||||
@ -7708,199 +7367,13 @@ int main (int argc, char **argv)
|
|||||||
* Potfile removes
|
* Potfile removes
|
||||||
*/
|
*/
|
||||||
|
|
||||||
uint potfile_remove_cracks = 0;
|
int potfile_remove_cracks = 0;
|
||||||
|
|
||||||
if (potfile_disable == 0)
|
if (potfile_disable == 0)
|
||||||
{
|
{
|
||||||
hash_t hash_buf;
|
if (data.quiet == 0) log_info_nn ("Comparing hashes with potfile entries...");
|
||||||
|
|
||||||
hash_buf.digest = mymalloc (hashconfig->dgst_size);
|
potfile_remove_cracks = potfile_remove_parse (potfile_ctx, hashconfig, hashes_buf, hashes_cnt);
|
||||||
hash_buf.salt = NULL;
|
|
||||||
hash_buf.esalt = NULL;
|
|
||||||
hash_buf.hash_info = NULL;
|
|
||||||
hash_buf.cracked = 0;
|
|
||||||
|
|
||||||
if (hashconfig->is_salted)
|
|
||||||
{
|
|
||||||
hash_buf.salt = (salt_t *) mymalloc (sizeof (salt_t));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hashconfig->esalt_size)
|
|
||||||
{
|
|
||||||
hash_buf.esalt = mymalloc (hashconfig->esalt_size);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (quiet == 0) log_info_nn ("Comparing hashes with potfile entries...");
|
|
||||||
|
|
||||||
// no solution for these special hash types (for instane because they use hashfile in output etc)
|
|
||||||
if ((hashconfig->hash_mode != 5200) &&
|
|
||||||
!((hashconfig->hash_mode >= 6200) && (hashconfig->hash_mode <= 6299)) &&
|
|
||||||
!((hashconfig->hash_mode >= 13700) && (hashconfig->hash_mode <= 13799)) &&
|
|
||||||
(hashconfig->hash_mode != 9000))
|
|
||||||
{
|
|
||||||
potfile_read_open (potfile_ctx);
|
|
||||||
|
|
||||||
if (potfile_ctx->fp != NULL)
|
|
||||||
{
|
|
||||||
char *line_buf = (char *) mymalloc (HCBUFSIZ_LARGE);
|
|
||||||
|
|
||||||
// to be safe work with a copy (because of line_len loop, i etc)
|
|
||||||
// moved up here because it's easier to handle continue case
|
|
||||||
// it's just 64kb
|
|
||||||
|
|
||||||
char *line_buf_cpy = (char *) mymalloc (HCBUFSIZ_LARGE);
|
|
||||||
|
|
||||||
while (!feof (potfile_ctx->fp))
|
|
||||||
{
|
|
||||||
char *ptr = fgets (line_buf, HCBUFSIZ_LARGE - 1, potfile_ctx->fp);
|
|
||||||
|
|
||||||
if (ptr == NULL) break;
|
|
||||||
|
|
||||||
int line_len = strlen (line_buf);
|
|
||||||
|
|
||||||
if (line_len == 0) continue;
|
|
||||||
|
|
||||||
int iter = MAX_CUT_TRIES;
|
|
||||||
|
|
||||||
for (int i = line_len - 1; i && iter; i--, line_len--)
|
|
||||||
{
|
|
||||||
if (line_buf[i] != ':') continue;
|
|
||||||
|
|
||||||
if (hashconfig->is_salted)
|
|
||||||
{
|
|
||||||
memset (hash_buf.salt, 0, sizeof (salt_t));
|
|
||||||
}
|
|
||||||
|
|
||||||
hash_t *found = NULL;
|
|
||||||
|
|
||||||
if (hashconfig->hash_mode == 6800)
|
|
||||||
{
|
|
||||||
if (i < 64) // 64 = 16 * uint in salt_buf[]
|
|
||||||
{
|
|
||||||
// manipulate salt_buf
|
|
||||||
memcpy (hash_buf.salt->salt_buf, line_buf, i);
|
|
||||||
|
|
||||||
hash_buf.salt->salt_len = i;
|
|
||||||
|
|
||||||
found = (hash_t *) bsearch (&hash_buf, hashes_buf, hashes_cnt, sizeof (hash_t), sort_by_hash_t_salt);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (hashconfig->hash_mode == 2500)
|
|
||||||
{
|
|
||||||
if (i < 64) // 64 = 16 * uint in salt_buf[]
|
|
||||||
{
|
|
||||||
// here we have in line_buf: ESSID:MAC1:MAC2 (without the plain)
|
|
||||||
// manipulate salt_buf
|
|
||||||
|
|
||||||
memset (line_buf_cpy, 0, HCBUFSIZ_LARGE);
|
|
||||||
memcpy (line_buf_cpy, line_buf, i);
|
|
||||||
|
|
||||||
char *mac2_pos = strrchr (line_buf_cpy, ':');
|
|
||||||
|
|
||||||
if (mac2_pos == NULL) continue;
|
|
||||||
|
|
||||||
mac2_pos[0] = 0;
|
|
||||||
mac2_pos++;
|
|
||||||
|
|
||||||
if (strlen (mac2_pos) != 12) continue;
|
|
||||||
|
|
||||||
char *mac1_pos = strrchr (line_buf_cpy, ':');
|
|
||||||
|
|
||||||
if (mac1_pos == NULL) continue;
|
|
||||||
|
|
||||||
mac1_pos[0] = 0;
|
|
||||||
mac1_pos++;
|
|
||||||
|
|
||||||
if (strlen (mac1_pos) != 12) continue;
|
|
||||||
|
|
||||||
uint essid_length = mac1_pos - line_buf_cpy - 1;
|
|
||||||
|
|
||||||
// here we need the ESSID
|
|
||||||
memcpy (hash_buf.salt->salt_buf, line_buf_cpy, essid_length);
|
|
||||||
|
|
||||||
hash_buf.salt->salt_len = essid_length;
|
|
||||||
|
|
||||||
found = (hash_t *) bsearch (&hash_buf, hashes_buf, hashes_cnt, sizeof (hash_t), sort_by_hash_t_salt_hccap);
|
|
||||||
|
|
||||||
if (found)
|
|
||||||
{
|
|
||||||
wpa_t *wpa = (wpa_t *) found->esalt;
|
|
||||||
|
|
||||||
// compare hex string(s) vs binary MAC address(es)
|
|
||||||
|
|
||||||
for (uint i = 0, j = 0; i < 6; i++, j += 2)
|
|
||||||
{
|
|
||||||
if (wpa->orig_mac1[i] != hex_to_u8 ((const u8 *) &mac1_pos[j]))
|
|
||||||
{
|
|
||||||
found = NULL;
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// early skip ;)
|
|
||||||
if (!found) continue;
|
|
||||||
|
|
||||||
for (uint i = 0, j = 0; i < 6; i++, j += 2)
|
|
||||||
{
|
|
||||||
if (wpa->orig_mac2[i] != hex_to_u8 ((const u8 *) &mac2_pos[j]))
|
|
||||||
{
|
|
||||||
found = NULL;
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
int parser_status = hashconfig->parse_func (line_buf, line_len - 1, &hash_buf, hashconfig);
|
|
||||||
|
|
||||||
if (parser_status == PARSER_OK)
|
|
||||||
{
|
|
||||||
if (hashconfig->is_salted)
|
|
||||||
{
|
|
||||||
found = (hash_t *) bsearch (&hash_buf, hashes_buf, hashes_cnt, sizeof (hash_t), sort_by_hash);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
found = (hash_t *) bsearch (&hash_buf, hashes_buf, hashes_cnt, sizeof (hash_t), sort_by_hash_no_salt);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (found == NULL) continue;
|
|
||||||
|
|
||||||
if (!found->cracked) potfile_remove_cracks++;
|
|
||||||
|
|
||||||
found->cracked = 1;
|
|
||||||
|
|
||||||
if (found) break;
|
|
||||||
|
|
||||||
iter--;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
myfree (line_buf_cpy);
|
|
||||||
|
|
||||||
myfree (line_buf);
|
|
||||||
|
|
||||||
potfile_read_close (potfile_ctx);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hashconfig->esalt_size)
|
|
||||||
{
|
|
||||||
local_free (hash_buf.esalt);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hashconfig->is_salted)
|
|
||||||
{
|
|
||||||
local_free (hash_buf.salt);
|
|
||||||
}
|
|
||||||
|
|
||||||
local_free (hash_buf.digest);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -12952,27 +12425,23 @@ int main (int argc, char **argv)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
data.outfile_check_timer = outfile_check_timer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Inform the user if we got some hashes remove because of the pot file remove feature
|
* main loop
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (data.quiet == 0)
|
if (data.quiet == 0)
|
||||||
{
|
{
|
||||||
if (potfile_remove_cracks > 0)
|
if (potfile_remove_cracks > 0)
|
||||||
{
|
{
|
||||||
if (potfile_remove_cracks == 1) log_info ("INFO: Removed 1 hash found in pot file\n");
|
if (potfile_remove_cracks == 1) log_info ("INFO: Removed 1 hash found in potfile\n");
|
||||||
else log_info ("INFO: Removed %u hashes found in pot file\n", potfile_remove_cracks);
|
else log_info ("INFO: Removed %d hashes found in potfile\n", potfile_remove_cracks);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
data.outfile_check_timer = outfile_check_timer;
|
|
||||||
|
|
||||||
potfile_write_open (potfile_ctx);
|
potfile_write_open (potfile_ctx);
|
||||||
|
|
||||||
/**
|
|
||||||
* main loop
|
|
||||||
*/
|
|
||||||
|
|
||||||
char **induction_dictionaries = NULL;
|
char **induction_dictionaries = NULL;
|
||||||
|
|
||||||
int induction_dictionaries_cnt = 0;
|
int induction_dictionaries_cnt = 0;
|
||||||
@ -14410,8 +13879,6 @@ int main (int argc, char **argv)
|
|||||||
|
|
||||||
local_free (masks);
|
local_free (masks);
|
||||||
|
|
||||||
potfile_hash_free (potfile_ctx, hashconfig);
|
|
||||||
|
|
||||||
potfile_write_close (potfile_ctx);
|
potfile_write_close (potfile_ctx);
|
||||||
|
|
||||||
potfile_destroy (potfile_ctx);
|
potfile_destroy (potfile_ctx);
|
||||||
|
|||||||
548
src/potfile.c
548
src/potfile.c
@ -6,6 +6,7 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "types_int.h"
|
#include "types_int.h"
|
||||||
#include "types.h"
|
#include "types.h"
|
||||||
|
#include "convert.h"
|
||||||
#include "memory.h"
|
#include "memory.h"
|
||||||
#include "logging.h"
|
#include "logging.h"
|
||||||
#include "interface.h"
|
#include "interface.h"
|
||||||
@ -14,7 +15,9 @@
|
|||||||
|
|
||||||
// get rid of this later
|
// get rid of this later
|
||||||
int sort_by_hash (const void *v1, const void *v2);
|
int sort_by_hash (const void *v1, const void *v2);
|
||||||
|
int sort_by_hash_no_salt (const void *v1, const void *v2);
|
||||||
void format_plain (FILE *fp, unsigned char *plain_ptr, uint plain_len, uint outfile_autohex);
|
void format_plain (FILE *fp, unsigned char *plain_ptr, uint plain_len, uint outfile_autohex);
|
||||||
|
void format_output (FILE *out_fp, char *out_buf, unsigned char *plain_ptr, const uint plain_len, const u64 crackpos, unsigned char *username, const uint user_len, hashconfig_t *hashconfig);
|
||||||
// get rid of this later
|
// get rid of this later
|
||||||
|
|
||||||
int sort_by_pot (const void *v1, const void *v2)
|
int sort_by_pot (const void *v1, const void *v2)
|
||||||
@ -28,6 +31,337 @@ int sort_by_pot (const void *v1, const void *v2)
|
|||||||
return sort_by_hash (h1, h2);
|
return sort_by_hash (h1, h2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int sort_by_salt_buf (const void *v1, const void *v2)
|
||||||
|
{
|
||||||
|
const pot_t *p1 = (const pot_t *) v1;
|
||||||
|
const pot_t *p2 = (const pot_t *) v2;
|
||||||
|
|
||||||
|
const hash_t *h1 = &p1->hash;
|
||||||
|
const hash_t *h2 = &p2->hash;
|
||||||
|
|
||||||
|
const salt_t *s1 = h1->salt;
|
||||||
|
const salt_t *s2 = h2->salt;
|
||||||
|
|
||||||
|
uint n = 16;
|
||||||
|
|
||||||
|
while (n--)
|
||||||
|
{
|
||||||
|
if (s1->salt_buf[n] > s2->salt_buf[n]) return ( 1);
|
||||||
|
if (s1->salt_buf[n] < s2->salt_buf[n]) return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int sort_by_hash_t_salt (const void *v1, const void *v2)
|
||||||
|
{
|
||||||
|
const hash_t *h1 = (const hash_t *) v1;
|
||||||
|
const hash_t *h2 = (const hash_t *) v2;
|
||||||
|
|
||||||
|
const salt_t *s1 = h1->salt;
|
||||||
|
const salt_t *s2 = h2->salt;
|
||||||
|
|
||||||
|
// testphase: this should work
|
||||||
|
uint n = 16;
|
||||||
|
|
||||||
|
while (n--)
|
||||||
|
{
|
||||||
|
if (s1->salt_buf[n] > s2->salt_buf[n]) return ( 1);
|
||||||
|
if (s1->salt_buf[n] < s2->salt_buf[n]) return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* original code, seems buggy since salt_len can be very big (had a case with 131 len)
|
||||||
|
also it thinks salt_buf[x] is a char but its a uint so salt_len should be / 4
|
||||||
|
if (s1->salt_len > s2->salt_len) return ( 1);
|
||||||
|
if (s1->salt_len < s2->salt_len) return -1;
|
||||||
|
|
||||||
|
uint n = s1->salt_len;
|
||||||
|
|
||||||
|
while (n--)
|
||||||
|
{
|
||||||
|
if (s1->salt_buf[n] > s2->salt_buf[n]) return ( 1);
|
||||||
|
if (s1->salt_buf[n] < s2->salt_buf[n]) return -1;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int sort_by_hash_t_salt_hccap (const void *v1, const void *v2)
|
||||||
|
{
|
||||||
|
const hash_t *h1 = (const hash_t *) v1;
|
||||||
|
const hash_t *h2 = (const hash_t *) v2;
|
||||||
|
|
||||||
|
const salt_t *s1 = h1->salt;
|
||||||
|
const salt_t *s2 = h2->salt;
|
||||||
|
|
||||||
|
// last 2: salt_buf[10] and salt_buf[11] contain the digest (skip them)
|
||||||
|
|
||||||
|
uint n = 9; // 9 * 4 = 36 bytes (max length of ESSID)
|
||||||
|
|
||||||
|
while (n--)
|
||||||
|
{
|
||||||
|
if (s1->salt_buf[n] > s2->salt_buf[n]) return ( 1);
|
||||||
|
if (s1->salt_buf[n] < s2->salt_buf[n]) return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void handle_show_request (pot_t *pot, uint pot_cnt, char *input_buf, int input_len, hash_t *hashes_buf, int (*sort_by_pot) (const void *, const void *), FILE *out_fp, hashconfig_t *hashconfig)
|
||||||
|
{
|
||||||
|
pot_t pot_key;
|
||||||
|
|
||||||
|
pot_key.hash.salt = hashes_buf->salt;
|
||||||
|
pot_key.hash.digest = hashes_buf->digest;
|
||||||
|
|
||||||
|
pot_t *pot_ptr = (pot_t *) bsearch (&pot_key, pot, pot_cnt, sizeof (pot_t), sort_by_pot);
|
||||||
|
|
||||||
|
if (pot_ptr)
|
||||||
|
{
|
||||||
|
log_info_nn ("");
|
||||||
|
|
||||||
|
input_buf[input_len] = 0;
|
||||||
|
|
||||||
|
// user
|
||||||
|
unsigned char *username = NULL;
|
||||||
|
uint user_len = 0;
|
||||||
|
|
||||||
|
if (hashes_buf->hash_info)
|
||||||
|
{
|
||||||
|
user_t *user = hashes_buf->hash_info->user;
|
||||||
|
|
||||||
|
if (user)
|
||||||
|
{
|
||||||
|
username = (unsigned char *) (user->user_name);
|
||||||
|
|
||||||
|
user_len = user->user_len;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// do output the line
|
||||||
|
format_output (out_fp, input_buf, (unsigned char *) pot_ptr->plain_buf, pot_ptr->plain_len, 0, username, user_len, hashconfig);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void handle_left_request (pot_t *pot, uint pot_cnt, char *input_buf, int input_len, hash_t *hashes_buf, int (*sort_by_pot) (const void *, const void *), FILE *out_fp, hashconfig_t *hashconfig)
|
||||||
|
{
|
||||||
|
pot_t pot_key;
|
||||||
|
|
||||||
|
memcpy (&pot_key.hash, hashes_buf, sizeof (hash_t));
|
||||||
|
|
||||||
|
pot_t *pot_ptr = (pot_t *) bsearch (&pot_key, pot, pot_cnt, sizeof (pot_t), sort_by_pot);
|
||||||
|
|
||||||
|
if (pot_ptr == NULL)
|
||||||
|
{
|
||||||
|
log_info_nn ("");
|
||||||
|
|
||||||
|
input_buf[input_len] = 0;
|
||||||
|
|
||||||
|
format_output (out_fp, input_buf, NULL, 0, 0, NULL, 0, hashconfig);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void handle_show_request_lm (pot_t *pot, uint pot_cnt, char *input_buf, int input_len, hash_t *hash_left, hash_t *hash_right, int (*sort_by_pot) (const void *, const void *), FILE *out_fp, hashconfig_t *hashconfig)
|
||||||
|
{
|
||||||
|
// left
|
||||||
|
|
||||||
|
pot_t pot_left_key;
|
||||||
|
|
||||||
|
pot_left_key.hash.salt = hash_left->salt;
|
||||||
|
pot_left_key.hash.digest = hash_left->digest;
|
||||||
|
|
||||||
|
pot_t *pot_left_ptr = (pot_t *) bsearch (&pot_left_key, pot, pot_cnt, sizeof (pot_t), sort_by_pot);
|
||||||
|
|
||||||
|
// right
|
||||||
|
|
||||||
|
uint weak_hash_found = 0;
|
||||||
|
|
||||||
|
pot_t pot_right_key;
|
||||||
|
|
||||||
|
pot_right_key.hash.salt = hash_right->salt;
|
||||||
|
pot_right_key.hash.digest = hash_right->digest;
|
||||||
|
|
||||||
|
pot_t *pot_right_ptr = (pot_t *) bsearch (&pot_right_key, pot, pot_cnt, sizeof (pot_t), sort_by_pot);
|
||||||
|
|
||||||
|
if (pot_right_ptr == NULL)
|
||||||
|
{
|
||||||
|
// special case, if "weak hash"
|
||||||
|
|
||||||
|
if (memcmp (hash_right->digest, LM_WEAK_HASH, 8) == 0)
|
||||||
|
{
|
||||||
|
weak_hash_found = 1;
|
||||||
|
|
||||||
|
pot_right_ptr = (pot_t *) mycalloc (1, sizeof (pot_t));
|
||||||
|
|
||||||
|
// in theory this is not needed, but we are paranoia:
|
||||||
|
|
||||||
|
memset (pot_right_ptr->plain_buf, 0, sizeof (pot_right_ptr->plain_buf));
|
||||||
|
pot_right_ptr->plain_len = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((pot_left_ptr == NULL) && (pot_right_ptr == NULL))
|
||||||
|
{
|
||||||
|
if (weak_hash_found == 1) myfree (pot_right_ptr); // this shouldn't happen at all: if weak_hash_found == 1, than pot_right_ptr is not NULL for sure
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// at least one half was found:
|
||||||
|
|
||||||
|
log_info_nn ("");
|
||||||
|
|
||||||
|
input_buf[input_len] = 0;
|
||||||
|
|
||||||
|
// user
|
||||||
|
|
||||||
|
unsigned char *username = NULL;
|
||||||
|
uint user_len = 0;
|
||||||
|
|
||||||
|
if (hash_left->hash_info)
|
||||||
|
{
|
||||||
|
user_t *user = hash_left->hash_info->user;
|
||||||
|
|
||||||
|
if (user)
|
||||||
|
{
|
||||||
|
username = (unsigned char *) (user->user_name);
|
||||||
|
|
||||||
|
user_len = user->user_len;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// mask the part which was not found
|
||||||
|
|
||||||
|
uint left_part_masked = 0;
|
||||||
|
uint right_part_masked = 0;
|
||||||
|
|
||||||
|
uint mask_plain_len = strlen (LM_MASKED_PLAIN);
|
||||||
|
|
||||||
|
if (pot_left_ptr == NULL)
|
||||||
|
{
|
||||||
|
left_part_masked = 1;
|
||||||
|
|
||||||
|
pot_left_ptr = (pot_t *) mycalloc (1, sizeof (pot_t));
|
||||||
|
|
||||||
|
memset (pot_left_ptr->plain_buf, 0, sizeof (pot_left_ptr->plain_buf));
|
||||||
|
|
||||||
|
memcpy (pot_left_ptr->plain_buf, LM_MASKED_PLAIN, mask_plain_len);
|
||||||
|
pot_left_ptr->plain_len = mask_plain_len;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pot_right_ptr == NULL)
|
||||||
|
{
|
||||||
|
right_part_masked = 1;
|
||||||
|
|
||||||
|
pot_right_ptr = (pot_t *) mycalloc (1, sizeof (pot_t));
|
||||||
|
|
||||||
|
memset (pot_right_ptr->plain_buf, 0, sizeof (pot_right_ptr->plain_buf));
|
||||||
|
|
||||||
|
memcpy (pot_right_ptr->plain_buf, LM_MASKED_PLAIN, mask_plain_len);
|
||||||
|
pot_right_ptr->plain_len = mask_plain_len;
|
||||||
|
}
|
||||||
|
|
||||||
|
// create the pot_ptr out of pot_left_ptr and pot_right_ptr
|
||||||
|
|
||||||
|
pot_t pot_ptr;
|
||||||
|
|
||||||
|
pot_ptr.plain_len = pot_left_ptr->plain_len + pot_right_ptr->plain_len;
|
||||||
|
|
||||||
|
memcpy (pot_ptr.plain_buf, pot_left_ptr->plain_buf, pot_left_ptr->plain_len);
|
||||||
|
|
||||||
|
memcpy (pot_ptr.plain_buf + pot_left_ptr->plain_len, pot_right_ptr->plain_buf, pot_right_ptr->plain_len);
|
||||||
|
|
||||||
|
// do output the line
|
||||||
|
|
||||||
|
format_output (out_fp, input_buf, (unsigned char *) pot_ptr.plain_buf, pot_ptr.plain_len, 0, username, user_len, hashconfig);
|
||||||
|
|
||||||
|
if (weak_hash_found == 1) myfree (pot_right_ptr);
|
||||||
|
|
||||||
|
if (left_part_masked == 1) myfree (pot_left_ptr);
|
||||||
|
if (right_part_masked == 1) myfree (pot_right_ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
void handle_left_request_lm (pot_t *pot, uint pot_cnt, char *input_buf, int input_len, hash_t *hash_left, hash_t *hash_right, int (*sort_by_pot) (const void *, const void *), FILE *out_fp, hashconfig_t *hashconfig)
|
||||||
|
{
|
||||||
|
// left
|
||||||
|
|
||||||
|
pot_t pot_left_key;
|
||||||
|
|
||||||
|
memcpy (&pot_left_key.hash, hash_left, sizeof (hash_t));
|
||||||
|
|
||||||
|
pot_t *pot_left_ptr = (pot_t *) bsearch (&pot_left_key, pot, pot_cnt, sizeof (pot_t), sort_by_pot);
|
||||||
|
|
||||||
|
// right
|
||||||
|
|
||||||
|
pot_t pot_right_key;
|
||||||
|
|
||||||
|
memcpy (&pot_right_key.hash, hash_right, sizeof (hash_t));
|
||||||
|
|
||||||
|
pot_t *pot_right_ptr = (pot_t *) bsearch (&pot_right_key, pot, pot_cnt, sizeof (pot_t), sort_by_pot);
|
||||||
|
|
||||||
|
uint weak_hash_found = 0;
|
||||||
|
|
||||||
|
if (pot_right_ptr == NULL)
|
||||||
|
{
|
||||||
|
// special case, if "weak hash"
|
||||||
|
|
||||||
|
if (memcmp (hash_right->digest, LM_WEAK_HASH, 8) == 0)
|
||||||
|
{
|
||||||
|
weak_hash_found = 1;
|
||||||
|
|
||||||
|
// we just need that pot_right_ptr is not a NULL pointer
|
||||||
|
|
||||||
|
pot_right_ptr = (pot_t *) mycalloc (1, sizeof (pot_t));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((pot_left_ptr != NULL) && (pot_right_ptr != NULL))
|
||||||
|
{
|
||||||
|
if (weak_hash_found == 1) myfree (pot_right_ptr);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ... at least one part was not cracked
|
||||||
|
|
||||||
|
log_info_nn ("");
|
||||||
|
|
||||||
|
input_buf[input_len] = 0;
|
||||||
|
|
||||||
|
// only show the hash part which is still not cracked
|
||||||
|
|
||||||
|
uint user_len = (uint)input_len - 32u;
|
||||||
|
|
||||||
|
char *hash_output = (char *) mymalloc (33);
|
||||||
|
|
||||||
|
memcpy (hash_output, input_buf, input_len);
|
||||||
|
|
||||||
|
if (pot_left_ptr != NULL)
|
||||||
|
{
|
||||||
|
// only show right part (because left part was already found)
|
||||||
|
|
||||||
|
memcpy (hash_output + user_len, input_buf + user_len + 16, 16);
|
||||||
|
|
||||||
|
hash_output[user_len + 16] = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pot_right_ptr != NULL)
|
||||||
|
{
|
||||||
|
// only show left part (because right part was already found)
|
||||||
|
|
||||||
|
memcpy (hash_output + user_len, input_buf + user_len, 16);
|
||||||
|
|
||||||
|
hash_output[user_len + 16] = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
format_output (out_fp, hash_output, NULL, 0, 0, NULL, 0, hashconfig);
|
||||||
|
|
||||||
|
myfree (hash_output);
|
||||||
|
|
||||||
|
if (weak_hash_found == 1) myfree (pot_right_ptr);
|
||||||
|
}
|
||||||
|
|
||||||
void potfile_init (potfile_ctx_t *potfile_ctx, const char *profile_dir, const char *potfile_path)
|
void potfile_init (potfile_ctx_t *potfile_ctx, const char *profile_dir, const char *potfile_path)
|
||||||
{
|
{
|
||||||
potfile_ctx->fp = NULL;
|
potfile_ctx->fp = NULL;
|
||||||
@ -63,7 +397,7 @@ int potfile_read_open (potfile_ctx_t *potfile_ctx)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void potfile_read_parse (potfile_ctx_t *potfile_ctx, hashconfig_t *hashconfig)
|
void potfile_read_parse (potfile_ctx_t *potfile_ctx, const hashconfig_t *hashconfig)
|
||||||
{
|
{
|
||||||
potfile_ctx->pot_avail = count_lines (potfile_ctx->fp);
|
potfile_ctx->pot_avail = count_lines (potfile_ctx->fp);
|
||||||
|
|
||||||
@ -203,7 +537,7 @@ void potfile_write_append (potfile_ctx_t *potfile_ctx, const char *out_buf, u8 *
|
|||||||
fflush (fp);
|
fflush (fp);
|
||||||
}
|
}
|
||||||
|
|
||||||
void potfile_hash_alloc (potfile_ctx_t *potfile_ctx, hashconfig_t *hashconfig, const uint num)
|
void potfile_hash_alloc (potfile_ctx_t *potfile_ctx, const hashconfig_t *hashconfig, const uint num)
|
||||||
{
|
{
|
||||||
uint pos = 0;
|
uint pos = 0;
|
||||||
|
|
||||||
@ -231,7 +565,7 @@ void potfile_hash_alloc (potfile_ctx_t *potfile_ctx, hashconfig_t *hashconfig, c
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void potfile_hash_free (potfile_ctx_t *potfile_ctx, hashconfig_t *hashconfig)
|
void potfile_hash_free (potfile_ctx_t *potfile_ctx, const hashconfig_t *hashconfig)
|
||||||
{
|
{
|
||||||
for (uint i = 0; i < potfile_ctx->pot_cnt; i++)
|
for (uint i = 0; i < potfile_ctx->pot_cnt; i++)
|
||||||
{
|
{
|
||||||
@ -253,9 +587,213 @@ void potfile_hash_free (potfile_ctx_t *potfile_ctx, hashconfig_t *hashconfig)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int potfile_remove_parse (potfile_ctx_t *potfile_ctx, const hashconfig_t *hashconfig, const hash_t *hashes_buf, const uint hashes_cnt)
|
||||||
|
{
|
||||||
|
// no solution for these special hash types (for instane because they use hashfile in output etc)
|
||||||
|
|
||||||
|
if (hashconfig->hash_mode == 5200)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if ((hashconfig->hash_mode >= 6200) && (hashconfig->hash_mode <= 6299))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (hashconfig->hash_mode == 9000)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if ((hashconfig->hash_mode >= 13700) && (hashconfig->hash_mode <= 13799))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
hash_t hash_buf;
|
||||||
|
|
||||||
|
hash_buf.digest = mymalloc (hashconfig->dgst_size);
|
||||||
|
hash_buf.salt = NULL;
|
||||||
|
hash_buf.esalt = NULL;
|
||||||
|
hash_buf.hash_info = NULL;
|
||||||
|
hash_buf.cracked = 0;
|
||||||
|
|
||||||
|
if (hashconfig->is_salted)
|
||||||
|
{
|
||||||
|
hash_buf.salt = (salt_t *) mymalloc (sizeof (salt_t));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hashconfig->esalt_size)
|
||||||
|
{
|
||||||
|
hash_buf.esalt = mymalloc (hashconfig->esalt_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
const int rc = potfile_read_open (potfile_ctx);
|
||||||
|
|
||||||
|
if (rc == -1) return 0;
|
||||||
|
|
||||||
|
int potfile_remove_cracks = 0;
|
||||||
|
|
||||||
|
char *line_buf = (char *) mymalloc (HCBUFSIZ_LARGE);
|
||||||
|
|
||||||
|
// to be safe work with a copy (because of line_len loop, i etc)
|
||||||
|
// moved up here because it's easier to handle continue case
|
||||||
|
// it's just 64kb
|
||||||
|
|
||||||
|
char *line_buf_cpy = (char *) mymalloc (HCBUFSIZ_LARGE);
|
||||||
|
|
||||||
|
while (!feof (potfile_ctx->fp))
|
||||||
|
{
|
||||||
|
char *ptr = fgets (line_buf, HCBUFSIZ_LARGE - 1, potfile_ctx->fp);
|
||||||
|
|
||||||
|
if (ptr == NULL) break;
|
||||||
|
|
||||||
|
int line_len = strlen (line_buf);
|
||||||
|
|
||||||
|
if (line_len == 0) continue;
|
||||||
|
|
||||||
|
int iter = MAX_CUT_TRIES;
|
||||||
|
|
||||||
|
for (int i = line_len - 1; i && iter; i--, line_len--)
|
||||||
|
{
|
||||||
|
if (line_buf[i] != ':') continue;
|
||||||
|
|
||||||
|
if (hashconfig->is_salted)
|
||||||
|
{
|
||||||
|
memset (hash_buf.salt, 0, sizeof (salt_t));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hashconfig->esalt_size)
|
||||||
|
{
|
||||||
|
memset (hash_buf.esalt, 0, hashconfig->esalt_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
hash_t *found = NULL;
|
||||||
|
|
||||||
|
if (hashconfig->hash_mode == 6800)
|
||||||
|
{
|
||||||
|
if (i < 64) // 64 = 16 * uint in salt_buf[]
|
||||||
|
{
|
||||||
|
// manipulate salt_buf
|
||||||
|
memcpy (hash_buf.salt->salt_buf, line_buf, i);
|
||||||
|
|
||||||
|
hash_buf.salt->salt_len = i;
|
||||||
|
|
||||||
|
found = (hash_t *) bsearch (&hash_buf, hashes_buf, hashes_cnt, sizeof (hash_t), sort_by_hash_t_salt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (hashconfig->hash_mode == 2500)
|
||||||
|
{
|
||||||
|
if (i < 64) // 64 = 16 * uint in salt_buf[]
|
||||||
|
{
|
||||||
|
// here we have in line_buf: ESSID:MAC1:MAC2 (without the plain)
|
||||||
|
// manipulate salt_buf
|
||||||
|
|
||||||
|
memset (line_buf_cpy, 0, HCBUFSIZ_LARGE);
|
||||||
|
memcpy (line_buf_cpy, line_buf, i);
|
||||||
|
|
||||||
|
char *mac2_pos = strrchr (line_buf_cpy, ':');
|
||||||
|
|
||||||
|
if (mac2_pos == NULL) continue;
|
||||||
|
|
||||||
|
mac2_pos[0] = 0;
|
||||||
|
mac2_pos++;
|
||||||
|
|
||||||
|
if (strlen (mac2_pos) != 12) continue;
|
||||||
|
|
||||||
|
char *mac1_pos = strrchr (line_buf_cpy, ':');
|
||||||
|
|
||||||
|
if (mac1_pos == NULL) continue;
|
||||||
|
|
||||||
|
mac1_pos[0] = 0;
|
||||||
|
mac1_pos++;
|
||||||
|
|
||||||
|
if (strlen (mac1_pos) != 12) continue;
|
||||||
|
|
||||||
|
uint essid_length = mac1_pos - line_buf_cpy - 1;
|
||||||
|
|
||||||
|
// here we need the ESSID
|
||||||
|
memcpy (hash_buf.salt->salt_buf, line_buf_cpy, essid_length);
|
||||||
|
|
||||||
|
hash_buf.salt->salt_len = essid_length;
|
||||||
|
|
||||||
|
found = (hash_t *) bsearch (&hash_buf, hashes_buf, hashes_cnt, sizeof (hash_t), sort_by_hash_t_salt_hccap);
|
||||||
|
|
||||||
|
if (found)
|
||||||
|
{
|
||||||
|
wpa_t *wpa = (wpa_t *) found->esalt;
|
||||||
|
|
||||||
|
// compare hex string(s) vs binary MAC address(es)
|
||||||
|
|
||||||
|
for (uint i = 0, j = 0; i < 6; i++, j += 2)
|
||||||
|
{
|
||||||
|
if (wpa->orig_mac1[i] != hex_to_u8 ((const u8 *) &mac1_pos[j]))
|
||||||
|
{
|
||||||
|
found = NULL;
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// early skip ;)
|
||||||
|
if (!found) continue;
|
||||||
|
|
||||||
|
for (uint i = 0, j = 0; i < 6; i++, j += 2)
|
||||||
|
{
|
||||||
|
if (wpa->orig_mac2[i] != hex_to_u8 ((const u8 *) &mac2_pos[j]))
|
||||||
|
{
|
||||||
|
found = NULL;
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int parser_status = hashconfig->parse_func (line_buf, line_len - 1, &hash_buf, hashconfig);
|
||||||
|
|
||||||
|
if (parser_status == PARSER_OK)
|
||||||
|
{
|
||||||
|
if (hashconfig->is_salted)
|
||||||
|
{
|
||||||
|
found = (hash_t *) bsearch (&hash_buf, hashes_buf, hashes_cnt, sizeof (hash_t), sort_by_hash);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
found = (hash_t *) bsearch (&hash_buf, hashes_buf, hashes_cnt, sizeof (hash_t), sort_by_hash_no_salt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (found == NULL) continue;
|
||||||
|
|
||||||
|
if (!found->cracked) potfile_remove_cracks++;
|
||||||
|
|
||||||
|
found->cracked = 1;
|
||||||
|
|
||||||
|
if (found) break;
|
||||||
|
|
||||||
|
iter--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
myfree (line_buf_cpy);
|
||||||
|
|
||||||
|
myfree (line_buf);
|
||||||
|
|
||||||
|
potfile_read_close (potfile_ctx);
|
||||||
|
|
||||||
|
if (hashconfig->esalt_size)
|
||||||
|
{
|
||||||
|
myfree (hash_buf.esalt);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hashconfig->is_salted)
|
||||||
|
{
|
||||||
|
myfree (hash_buf.salt);
|
||||||
|
}
|
||||||
|
|
||||||
|
myfree (hash_buf.digest);
|
||||||
|
|
||||||
|
return potfile_remove_cracks;
|
||||||
|
}
|
||||||
|
|
||||||
void potfile_destroy (potfile_ctx_t *potfile_ctx)
|
void potfile_destroy (potfile_ctx_t *potfile_ctx)
|
||||||
{
|
{
|
||||||
myfree (potfile_ctx->filename);
|
myfree (potfile_ctx->filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user