2019-12-15 20:09:04 +00:00
|
|
|
/**
|
|
|
|
* Author......: See docs/credits.txt
|
|
|
|
* License.....: MIT
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "common.h"
|
|
|
|
#include "types.h"
|
|
|
|
#include "modules.h"
|
|
|
|
#include "bitops.h"
|
|
|
|
#include "convert.h"
|
|
|
|
#include "shared.h"
|
|
|
|
#include "memory.h"
|
|
|
|
|
|
|
|
#define DGST_ELEM 4
|
|
|
|
|
|
|
|
#include "emu_general.h"
|
|
|
|
#include "emu_inc_cipher_aes.h"
|
|
|
|
#include "emu_inc_hash_md5.h"
|
|
|
|
#include "m22000-pure.cl"
|
|
|
|
|
|
|
|
static const u32 ATTACK_EXEC = ATTACK_EXEC_OUTSIDE_KERNEL;
|
|
|
|
static const u32 DGST_POS0 = 0;
|
|
|
|
static const u32 DGST_POS1 = 1;
|
|
|
|
static const u32 DGST_POS2 = 2;
|
|
|
|
static const u32 DGST_POS3 = 3;
|
|
|
|
static const u32 DGST_SIZE = DGST_SIZE_4_4;
|
|
|
|
static const u32 HASH_CATEGORY = HASH_CATEGORY_NETWORK_PROTOCOL;
|
|
|
|
static const char *HASH_NAME = "WPA-PBKDF2-PMKID+EAPOL";
|
|
|
|
static const u64 KERN_TYPE = 22000;
|
|
|
|
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
|
|
|
|
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
|
|
|
|
static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE
|
|
|
|
| OPTS_TYPE_AUX1
|
|
|
|
| OPTS_TYPE_AUX2
|
|
|
|
| OPTS_TYPE_AUX3
|
|
|
|
| OPTS_TYPE_AUX4
|
2019-12-16 18:35:00 +00:00
|
|
|
| OPTS_TYPE_BINARY_HASHFILE
|
2019-12-15 20:09:04 +00:00
|
|
|
| OPTS_TYPE_DEEP_COMP_KERNEL
|
|
|
|
| OPTS_TYPE_COPY_TMPS;
|
|
|
|
static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED;
|
|
|
|
static const char *ST_PASS = "hashcat!";
|
2020-01-18 14:29:06 +00:00
|
|
|
static const char *ST_HASH = "WPA*01*4d4fe7aac3a2cecab195321ceb99a7d0*fc690c158264*f4747f87f9f4*686173686361742d6573736964***";
|
2019-12-15 20:09:04 +00:00
|
|
|
|
|
|
|
u32 module_attack_exec (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ATTACK_EXEC; }
|
|
|
|
u32 module_dgst_pos0 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS0; }
|
|
|
|
u32 module_dgst_pos1 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS1; }
|
|
|
|
u32 module_dgst_pos2 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS2; }
|
|
|
|
u32 module_dgst_pos3 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS3; }
|
|
|
|
u32 module_dgst_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_SIZE; }
|
|
|
|
u32 module_hash_category (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HASH_CATEGORY; }
|
|
|
|
const char *module_hash_name (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HASH_NAME; }
|
|
|
|
u64 module_kern_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return KERN_TYPE; }
|
|
|
|
u32 module_opti_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return OPTI_TYPE; }
|
|
|
|
u64 module_opts_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return OPTS_TYPE; }
|
|
|
|
u32 module_salt_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return SALT_TYPE; }
|
|
|
|
const char *module_st_hash (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_HASH; }
|
|
|
|
const char *module_st_pass (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_PASS; }
|
|
|
|
|
|
|
|
static const u32 ROUNDS_WPA_PBKDF2 = 4096;
|
|
|
|
|
2019-12-16 18:35:00 +00:00
|
|
|
// this is required to force mingw to accept the packed attribute
|
|
|
|
#pragma pack(push,1)
|
|
|
|
|
2019-12-15 20:09:04 +00:00
|
|
|
struct auth_packet
|
|
|
|
{
|
|
|
|
u8 version;
|
|
|
|
u8 type;
|
|
|
|
u16 length;
|
|
|
|
u8 key_descriptor;
|
|
|
|
u16 key_information;
|
|
|
|
u16 key_length;
|
|
|
|
u64 replay_counter;
|
|
|
|
u8 wpa_key_nonce[32];
|
|
|
|
u8 wpa_key_iv[16];
|
|
|
|
u8 wpa_key_rsc[8];
|
|
|
|
u8 wpa_key_id[8];
|
|
|
|
u8 wpa_key_mic[16];
|
|
|
|
u16 wpa_key_data_length;
|
|
|
|
|
|
|
|
} __attribute__((packed));
|
|
|
|
|
2019-12-16 18:35:00 +00:00
|
|
|
#pragma pack(pop)
|
|
|
|
|
2019-12-15 20:09:04 +00:00
|
|
|
typedef struct auth_packet auth_packet_t;
|
|
|
|
|
2019-12-16 18:35:00 +00:00
|
|
|
#define HCCAPX_VERSION 4
|
|
|
|
#define HCCAPX_SIGNATURE 0x58504348 // HCPX
|
|
|
|
|
|
|
|
// this is required to force mingw to accept the packed attribute
|
|
|
|
#pragma pack(push,1)
|
|
|
|
|
|
|
|
struct hccapx
|
|
|
|
{
|
|
|
|
u32 signature;
|
|
|
|
u32 version;
|
|
|
|
u8 message_pair;
|
|
|
|
u8 essid_len;
|
|
|
|
u8 essid[32];
|
|
|
|
u8 keyver;
|
|
|
|
u8 keymic[16];
|
|
|
|
u8 mac_ap[6];
|
|
|
|
u8 nonce_ap[32];
|
|
|
|
u8 mac_sta[6];
|
|
|
|
u8 nonce_sta[32];
|
|
|
|
u16 eapol_len;
|
|
|
|
u8 eapol[256];
|
|
|
|
|
|
|
|
} __attribute__((packed));
|
|
|
|
|
|
|
|
typedef struct hccapx hccapx_t;
|
|
|
|
|
|
|
|
#pragma pack(pop)
|
|
|
|
|
2019-12-15 20:09:04 +00:00
|
|
|
const char *module_benchmark_mask (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
{
|
|
|
|
const char *mask = "?a?a?a?a?a?a?a?a";
|
|
|
|
|
|
|
|
return mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
u64 module_tmp_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
{
|
|
|
|
const u64 tmp_size = (const u64) sizeof (wpa_pbkdf2_tmp_t);
|
|
|
|
|
|
|
|
return tmp_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
u64 module_esalt_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
{
|
|
|
|
const u64 esalt_size = (const u64) sizeof (wpa_t);
|
|
|
|
|
|
|
|
return esalt_size;
|
|
|
|
}
|
|
|
|
|
2019-12-16 18:35:00 +00:00
|
|
|
static bool is_hccapx (HCFILE *fp)
|
|
|
|
{
|
|
|
|
hccapx_t hccapx;
|
|
|
|
|
|
|
|
const size_t nread = hc_fread (&hccapx, sizeof (hccapx_t), 1, fp);
|
|
|
|
|
|
|
|
if (nread == 1)
|
|
|
|
{
|
|
|
|
if (hccapx.signature == HCCAPX_SIGNATURE)
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
int module_hash_init_selftest (MAYBE_UNUSED const hashconfig_t *hashconfig, hash_t *hash)
|
|
|
|
{
|
|
|
|
const int parser_status = module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash->hook_salt, hash->hash_info, hashconfig->st_hash, strlen (hashconfig->st_hash));
|
|
|
|
|
|
|
|
wpa_t *wpa = (wpa_t *) hash->esalt;
|
|
|
|
|
|
|
|
wpa->detected_le = 1;
|
|
|
|
wpa->detected_be = 0;
|
|
|
|
|
|
|
|
wpa->nonce_error_corrections = 3;
|
|
|
|
|
|
|
|
return parser_status;
|
|
|
|
}
|
|
|
|
|
|
|
|
int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, hashes_t *hashes)
|
|
|
|
{
|
|
|
|
hash_t *hashes_buf = hashes->hashes_buf;
|
|
|
|
|
|
|
|
int hashes_cnt = 0;
|
|
|
|
|
|
|
|
HCFILE fp;
|
|
|
|
|
2020-05-27 13:23:02 +00:00
|
|
|
if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
|
2019-12-16 18:35:00 +00:00
|
|
|
|
|
|
|
const bool r = is_hccapx (&fp);
|
|
|
|
|
|
|
|
hc_rewind (&fp);
|
|
|
|
|
|
|
|
if (r == true)
|
|
|
|
{
|
|
|
|
char *in = (char *) hcmalloc (sizeof (hccapx_t));
|
|
|
|
|
|
|
|
while (!hc_feof (&fp))
|
|
|
|
{
|
|
|
|
const size_t nread = hc_fread (in, sizeof (hccapx_t), 1, &fp);
|
|
|
|
|
|
|
|
if (nread == 0) break;
|
|
|
|
|
|
|
|
memset (hashes_buf[hashes_cnt].salt, 0, sizeof (salt_t));
|
|
|
|
|
|
|
|
memset (hashes_buf[hashes_cnt].esalt, 0, sizeof (wpa_t));
|
|
|
|
|
|
|
|
wpa_t *wpa = (wpa_t *) hashes_buf[hashes_cnt].esalt;
|
|
|
|
|
|
|
|
wpa->message_pair_chgd = user_options->hccapx_message_pair_chgd;
|
|
|
|
wpa->message_pair = user_options->hccapx_message_pair;
|
|
|
|
|
|
|
|
wpa->nonce_error_corrections_chgd = user_options->nonce_error_corrections_chgd;
|
|
|
|
wpa->nonce_error_corrections = user_options->nonce_error_corrections;
|
|
|
|
|
|
|
|
hash_t *hash = &hashes_buf[hashes_cnt];
|
|
|
|
|
|
|
|
const int parser_status = module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash->hook_salt, hash->hash_info, in, sizeof (hccapx_t));
|
|
|
|
|
|
|
|
if (parser_status != PARSER_OK) continue;
|
|
|
|
|
|
|
|
hashes_cnt++;
|
|
|
|
}
|
|
|
|
|
|
|
|
hcfree (in);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
char *line_buf = (char *) hcmalloc (HCBUFSIZ_LARGE);
|
|
|
|
|
|
|
|
while (!hc_feof (&fp))
|
|
|
|
{
|
|
|
|
const size_t line_len = fgetl (&fp, line_buf, HCBUFSIZ_LARGE);
|
|
|
|
|
|
|
|
if (line_len == 0) continue;
|
|
|
|
|
|
|
|
memset (hashes_buf[hashes_cnt].salt, 0, sizeof (salt_t));
|
|
|
|
|
|
|
|
memset (hashes_buf[hashes_cnt].esalt, 0, sizeof (wpa_t));
|
|
|
|
|
|
|
|
wpa_t *wpa = (wpa_t *) hashes_buf[hashes_cnt].esalt;
|
|
|
|
|
|
|
|
wpa->message_pair_chgd = user_options->hccapx_message_pair_chgd;
|
|
|
|
wpa->message_pair = user_options->hccapx_message_pair;
|
|
|
|
|
|
|
|
wpa->nonce_error_corrections_chgd = user_options->nonce_error_corrections_chgd;
|
|
|
|
wpa->nonce_error_corrections = user_options->nonce_error_corrections;
|
|
|
|
|
|
|
|
hash_t *hash = &hashes_buf[hashes_cnt];
|
|
|
|
|
|
|
|
const int parser_status = module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash->hook_salt, hash->hash_info, line_buf, line_len);
|
|
|
|
|
|
|
|
if (parser_status != PARSER_OK) continue;
|
|
|
|
|
|
|
|
hashes_cnt++;
|
|
|
|
}
|
|
|
|
|
|
|
|
hcfree (line_buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
hc_fclose (&fp);
|
|
|
|
|
|
|
|
return hashes_cnt;
|
|
|
|
}
|
|
|
|
|
|
|
|
int module_hash_binary_count (MAYBE_UNUSED const hashes_t *hashes)
|
|
|
|
{
|
|
|
|
// this mode actually works on a plaintext file
|
|
|
|
// but to stay in a .hccapx backward compatibility mode we have to tell the module
|
|
|
|
// the file is in binary.
|
|
|
|
// we then have to iterated through the file ourself
|
|
|
|
|
|
|
|
HCFILE fp;
|
|
|
|
|
2020-05-27 13:23:02 +00:00
|
|
|
if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
|
2019-12-16 18:35:00 +00:00
|
|
|
|
|
|
|
const bool r = is_hccapx (&fp);
|
|
|
|
|
|
|
|
hc_rewind (&fp);
|
|
|
|
|
|
|
|
int count = 0;
|
|
|
|
|
|
|
|
if (r == true)
|
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
stat (hashes->hashfile, &st);
|
|
|
|
|
|
|
|
count = st.st_size / sizeof (hccapx_t);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
count = count_lines (&fp);
|
|
|
|
}
|
|
|
|
|
|
|
|
hc_fclose (&fp);
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2019-12-15 20:09:04 +00:00
|
|
|
bool module_hlfmt_disable (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
{
|
|
|
|
const bool hlfmt_disable = true;
|
|
|
|
|
|
|
|
return hlfmt_disable;
|
|
|
|
}
|
|
|
|
|
|
|
|
u32 module_pw_min (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
{
|
|
|
|
const u32 pw_min = 8;
|
|
|
|
|
|
|
|
return pw_min;
|
|
|
|
}
|
|
|
|
|
|
|
|
u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
{
|
|
|
|
const u32 pw_max = 63;
|
|
|
|
|
|
|
|
return pw_max;
|
|
|
|
}
|
|
|
|
|
|
|
|
int module_hash_decode_potfile (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, MAYBE_UNUSED void *hook_salt_buf, MAYBE_UNUSED hashinfo_t *hash_info, const char *line_buf, MAYBE_UNUSED const int line_len, MAYBE_UNUSED void *tmps)
|
|
|
|
{
|
|
|
|
wpa_t *wpa = (wpa_t *) esalt_buf;
|
|
|
|
|
|
|
|
wpa_pbkdf2_tmp_t *wpa_pbkdf2_tmp = (wpa_pbkdf2_tmp_t *) tmps;
|
|
|
|
|
|
|
|
// here we have in line_hash_buf: PMK*essid:password
|
|
|
|
// but we don't care about the password
|
|
|
|
|
|
|
|
// PMK
|
|
|
|
|
|
|
|
wpa_pbkdf2_tmp->out[0] = hex_to_u32 ((const u8 *) line_buf + 0);
|
|
|
|
wpa_pbkdf2_tmp->out[1] = hex_to_u32 ((const u8 *) line_buf + 8);
|
|
|
|
wpa_pbkdf2_tmp->out[2] = hex_to_u32 ((const u8 *) line_buf + 16);
|
|
|
|
wpa_pbkdf2_tmp->out[3] = hex_to_u32 ((const u8 *) line_buf + 24);
|
|
|
|
wpa_pbkdf2_tmp->out[4] = hex_to_u32 ((const u8 *) line_buf + 32);
|
|
|
|
wpa_pbkdf2_tmp->out[5] = hex_to_u32 ((const u8 *) line_buf + 40);
|
|
|
|
wpa_pbkdf2_tmp->out[6] = hex_to_u32 ((const u8 *) line_buf + 48);
|
|
|
|
wpa_pbkdf2_tmp->out[7] = hex_to_u32 ((const u8 *) line_buf + 56);
|
|
|
|
|
|
|
|
// essid
|
|
|
|
|
2020-01-02 09:41:22 +00:00
|
|
|
char *sep_pos = strrchr (line_buf, '*');
|
2019-12-15 20:09:04 +00:00
|
|
|
|
|
|
|
if (sep_pos == NULL) return (PARSER_SEPARATOR_UNMATCHED);
|
|
|
|
|
|
|
|
if ((line_buf + 64) != sep_pos) return (PARSER_HASH_LENGTH);
|
|
|
|
|
|
|
|
char *essid_pos = sep_pos + 1;
|
|
|
|
|
|
|
|
const int essid_len = strlen (essid_pos);
|
|
|
|
|
|
|
|
if (essid_len & 1) return (PARSER_SALT_VALUE);
|
|
|
|
|
|
|
|
if (essid_len > 64) return (PARSER_SALT_VALUE);
|
|
|
|
|
|
|
|
wpa->essid_len = hex_decode ((const u8 *) essid_pos, essid_len, (u8 *) wpa->essid_buf);
|
|
|
|
|
|
|
|
return PARSER_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
int module_hash_encode_potfile (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, MAYBE_UNUSED const void *hook_salt_buf, MAYBE_UNUSED const hashinfo_t *hash_info, char *line_buf, MAYBE_UNUSED const int line_size, MAYBE_UNUSED const void *tmps)
|
|
|
|
{
|
|
|
|
const wpa_t *wpa = (const wpa_t *) esalt_buf;
|
|
|
|
|
|
|
|
const wpa_pbkdf2_tmp_t *wpa_pbkdf2_tmp = (const wpa_pbkdf2_tmp_t *) tmps;
|
|
|
|
|
|
|
|
char tmp_buf[128];
|
|
|
|
|
|
|
|
const int tmp_len = hex_encode ((const u8 *) wpa->essid_buf, wpa->essid_len, (u8 *) tmp_buf);
|
|
|
|
|
|
|
|
tmp_buf[tmp_len] = 0;
|
|
|
|
|
2020-01-02 09:41:22 +00:00
|
|
|
const int line_len = snprintf (line_buf, line_size, "%08x%08x%08x%08x%08x%08x%08x%08x*%s",
|
2019-12-15 20:09:04 +00:00
|
|
|
wpa_pbkdf2_tmp->out[0],
|
|
|
|
wpa_pbkdf2_tmp->out[1],
|
|
|
|
wpa_pbkdf2_tmp->out[2],
|
|
|
|
wpa_pbkdf2_tmp->out[3],
|
|
|
|
wpa_pbkdf2_tmp->out[4],
|
|
|
|
wpa_pbkdf2_tmp->out[5],
|
|
|
|
wpa_pbkdf2_tmp->out[6],
|
|
|
|
wpa_pbkdf2_tmp->out[7],
|
|
|
|
tmp_buf);
|
|
|
|
|
|
|
|
return line_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
int module_hash_binary_save (MAYBE_UNUSED const hashes_t *hashes, MAYBE_UNUSED const u32 salt_pos, MAYBE_UNUSED const u32 digest_pos, char **buf)
|
|
|
|
{
|
|
|
|
const salt_t *salts_buf = hashes->salts_buf;
|
|
|
|
const void *esalts_buf = hashes->esalts_buf;
|
|
|
|
|
|
|
|
const salt_t *salt = &salts_buf[salt_pos];
|
|
|
|
|
|
|
|
const u32 digest_cur = salt->digests_offset + digest_pos;
|
|
|
|
|
|
|
|
const wpa_t *wpas = (const wpa_t *) esalts_buf;
|
|
|
|
const wpa_t *wpa = &wpas[digest_cur];
|
|
|
|
|
|
|
|
char tmp_buf[128];
|
|
|
|
|
|
|
|
const int tmp_len = hex_encode ((const u8 *) wpa->essid_buf, wpa->essid_len, (u8 *) tmp_buf);
|
|
|
|
|
|
|
|
tmp_buf[tmp_len] = 0;
|
|
|
|
|
2019-12-16 11:47:48 +00:00
|
|
|
const u8 *mac_ap = (const u8 *) wpa->mac_ap;
|
|
|
|
const u8 *mac_sta = (const u8 *) wpa->mac_sta;
|
|
|
|
|
2019-12-15 20:09:04 +00:00
|
|
|
if (wpa->type == 1)
|
|
|
|
{
|
2019-12-22 09:11:25 +00:00
|
|
|
const int len = hc_asprintf (buf, "WPA*01*%08x%08x%08x%08x*%02x%02x%02x%02x%02x%02x*%02x%02x%02x%02x%02x%02x*%s***" EOL,
|
2019-12-15 20:09:04 +00:00
|
|
|
byte_swap_32 (wpa->pmkid[0]),
|
|
|
|
byte_swap_32 (wpa->pmkid[1]),
|
|
|
|
byte_swap_32 (wpa->pmkid[2]),
|
|
|
|
byte_swap_32 (wpa->pmkid[3]),
|
2019-12-16 11:47:48 +00:00
|
|
|
mac_ap[0],
|
|
|
|
mac_ap[1],
|
|
|
|
mac_ap[2],
|
|
|
|
mac_ap[3],
|
|
|
|
mac_ap[4],
|
|
|
|
mac_ap[5],
|
|
|
|
mac_sta[0],
|
|
|
|
mac_sta[1],
|
|
|
|
mac_sta[2],
|
|
|
|
mac_sta[3],
|
|
|
|
mac_sta[4],
|
|
|
|
mac_sta[5],
|
2019-12-15 20:09:04 +00:00
|
|
|
tmp_buf);
|
|
|
|
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
else if (wpa->type == 2)
|
|
|
|
{
|
|
|
|
u32 eapol_swapped[64 + 2];
|
|
|
|
|
|
|
|
for (int i = 0; i < 64; i++)
|
|
|
|
{
|
|
|
|
eapol_swapped[i] = wpa->eapol[i];
|
|
|
|
|
|
|
|
if (wpa->keyver == 2)
|
|
|
|
{
|
|
|
|
eapol_swapped[i] = byte_swap_32 (eapol_swapped[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
eapol_swapped[64] = 0;
|
|
|
|
eapol_swapped[65] = 0;
|
|
|
|
|
2019-12-22 09:35:40 +00:00
|
|
|
char tmp2_buf[1024];
|
2019-12-15 20:09:04 +00:00
|
|
|
|
|
|
|
const int tmp2_len = hex_encode ((const u8 *) eapol_swapped, wpa->eapol_len, (u8 *) tmp2_buf);
|
|
|
|
|
|
|
|
tmp2_buf[tmp2_len] = 0;
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
const int len = hc_asprintf (buf, "WPA*02*%08x%08x%08x%08x*%02x%02x%02x%02x%02x%02x*%02x%02x%02x%02x%02x%02x*%s*%08x%08x%08x%08x%08x%08x%08x%08x*%s*%02x" EOL,
|
2019-12-15 20:09:04 +00:00
|
|
|
wpa->keymic[0],
|
|
|
|
wpa->keymic[1],
|
|
|
|
wpa->keymic[2],
|
|
|
|
wpa->keymic[3],
|
2019-12-16 11:47:48 +00:00
|
|
|
mac_ap[0],
|
|
|
|
mac_ap[1],
|
|
|
|
mac_ap[2],
|
|
|
|
mac_ap[3],
|
|
|
|
mac_ap[4],
|
|
|
|
mac_ap[5],
|
|
|
|
mac_sta[0],
|
|
|
|
mac_sta[1],
|
|
|
|
mac_sta[2],
|
|
|
|
mac_sta[3],
|
|
|
|
mac_sta[4],
|
|
|
|
mac_sta[5],
|
2019-12-15 20:09:04 +00:00
|
|
|
tmp_buf,
|
|
|
|
byte_swap_32 (wpa->anonce[0]),
|
|
|
|
byte_swap_32 (wpa->anonce[1]),
|
|
|
|
byte_swap_32 (wpa->anonce[2]),
|
|
|
|
byte_swap_32 (wpa->anonce[3]),
|
|
|
|
byte_swap_32 (wpa->anonce[4]),
|
|
|
|
byte_swap_32 (wpa->anonce[5]),
|
|
|
|
byte_swap_32 (wpa->anonce[6]),
|
|
|
|
byte_swap_32 (wpa->anonce[7]),
|
|
|
|
tmp2_buf,
|
2019-12-16 11:47:48 +00:00
|
|
|
wpa->message_pair);
|
2019-12-15 20:09:04 +00:00
|
|
|
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
u32 module_deep_comp_kernel (MAYBE_UNUSED const hashes_t *hashes, MAYBE_UNUSED const u32 salt_pos, MAYBE_UNUSED const u32 digest_pos)
|
|
|
|
{
|
|
|
|
const u32 digests_offset = hashes->salts_buf[salt_pos].digests_offset;
|
|
|
|
|
|
|
|
wpa_t *wpas = (wpa_t *) hashes->esalts_buf;
|
|
|
|
|
|
|
|
wpa_t *wpa = &wpas[digests_offset + digest_pos];
|
|
|
|
|
|
|
|
if (wpa->type == 1)
|
|
|
|
{
|
|
|
|
return KERN_RUN_AUX4;
|
|
|
|
}
|
|
|
|
else if (wpa->type == 2)
|
|
|
|
{
|
|
|
|
if (wpa->keyver == 1)
|
|
|
|
{
|
|
|
|
return KERN_RUN_AUX1;
|
|
|
|
}
|
|
|
|
else if (wpa->keyver == 2)
|
|
|
|
{
|
|
|
|
return KERN_RUN_AUX2;
|
|
|
|
}
|
|
|
|
else if (wpa->keyver == 3)
|
|
|
|
{
|
|
|
|
return KERN_RUN_AUX3;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const hash_t *db, MAYBE_UNUSED const hash_t *entry_hash, MAYBE_UNUSED const void *entry_tmps)
|
|
|
|
{
|
|
|
|
const wpa_t *wpa_entry = (const wpa_t *) entry_hash->esalt;
|
|
|
|
const wpa_t *wpa_db = (const wpa_t *) db->esalt;
|
|
|
|
|
|
|
|
if (wpa_db->essid_len != wpa_entry->essid_len) return false;
|
|
|
|
|
|
|
|
if (strcmp ((const char *) wpa_db->essid_buf, (const char *) wpa_entry->essid_buf)) return false;
|
|
|
|
|
|
|
|
const wpa_pbkdf2_tmp_t *wpa_pbkdf2_tmp = (const wpa_pbkdf2_tmp_t *) entry_tmps;
|
|
|
|
|
|
|
|
wpa_pbkdf2_tmp_t tmps;
|
|
|
|
|
|
|
|
tmps.out[0] = byte_swap_32 (wpa_pbkdf2_tmp->out[0]);
|
|
|
|
tmps.out[1] = byte_swap_32 (wpa_pbkdf2_tmp->out[1]);
|
|
|
|
tmps.out[2] = byte_swap_32 (wpa_pbkdf2_tmp->out[2]);
|
|
|
|
tmps.out[3] = byte_swap_32 (wpa_pbkdf2_tmp->out[3]);
|
|
|
|
tmps.out[4] = byte_swap_32 (wpa_pbkdf2_tmp->out[4]);
|
|
|
|
tmps.out[5] = byte_swap_32 (wpa_pbkdf2_tmp->out[5]);
|
|
|
|
tmps.out[6] = byte_swap_32 (wpa_pbkdf2_tmp->out[6]);
|
|
|
|
tmps.out[7] = byte_swap_32 (wpa_pbkdf2_tmp->out[7]);
|
|
|
|
|
|
|
|
plain_t plains_buf;
|
|
|
|
|
|
|
|
u32 hashes_shown = 0;
|
|
|
|
|
|
|
|
u32 d_return_buf = 0;
|
|
|
|
|
|
|
|
void (*m22000_aux) (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t));
|
|
|
|
|
|
|
|
if (wpa_db->type == 1)
|
|
|
|
{
|
|
|
|
m22000_aux = m22000_aux4;
|
|
|
|
}
|
|
|
|
else if (wpa_db->type == 2)
|
|
|
|
{
|
|
|
|
if (wpa_db->keyver == 1)
|
|
|
|
{
|
|
|
|
m22000_aux = m22000_aux1;
|
|
|
|
}
|
|
|
|
else if (wpa_db->keyver == 2)
|
|
|
|
{
|
|
|
|
m22000_aux = m22000_aux2;
|
|
|
|
}
|
|
|
|
else if (wpa_db->keyver == 3)
|
|
|
|
{
|
|
|
|
m22000_aux = m22000_aux3;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
m22000_aux
|
|
|
|
(
|
|
|
|
NULL, // pws
|
|
|
|
NULL, // rules_buf
|
|
|
|
NULL, // combs_buf
|
|
|
|
NULL, // bfs_buf
|
|
|
|
&tmps, // tmps
|
|
|
|
NULL, // hooks
|
|
|
|
NULL, // bitmaps_buf_s1_a
|
|
|
|
NULL, // bitmaps_buf_s1_b
|
|
|
|
NULL, // bitmaps_buf_s1_c
|
|
|
|
NULL, // bitmaps_buf_s1_d
|
|
|
|
NULL, // bitmaps_buf_s2_a
|
|
|
|
NULL, // bitmaps_buf_s2_b
|
|
|
|
NULL, // bitmaps_buf_s2_c
|
|
|
|
NULL, // bitmaps_buf_s2_d
|
|
|
|
&plains_buf, // plains_buf
|
|
|
|
db->digest, // digests_buf
|
|
|
|
&hashes_shown, // hashes_shown
|
|
|
|
db->salt, // salt_bufs
|
|
|
|
db->esalt, // esalt_bufs
|
|
|
|
&d_return_buf, // d_return_buf
|
|
|
|
NULL, // d_extra0_buf
|
|
|
|
NULL, // d_extra1_buf
|
|
|
|
NULL, // d_extra2_buf
|
|
|
|
NULL, // d_extra3_buf
|
|
|
|
0, // bitmap_mask
|
|
|
|
0, // bitmap_shift1
|
|
|
|
0, // bitmap_shift2
|
|
|
|
0, // salt_pos
|
|
|
|
0, // loop_pos
|
|
|
|
0, // loop_cnt
|
|
|
|
0, // il_cnt
|
|
|
|
1, // digests_cnt
|
|
|
|
0, // digests_offset
|
|
|
|
0, // combs_mode
|
|
|
|
1 // gid_max
|
|
|
|
);
|
|
|
|
|
|
|
|
const bool r = (d_return_buf == 0) ? false : true;
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, MAYBE_UNUSED void *hook_salt_buf, MAYBE_UNUSED hashinfo_t *hash_info, const char *line_buf, MAYBE_UNUSED const int line_len)
|
|
|
|
{
|
|
|
|
u32 *digest = (u32 *) digest_buf;
|
|
|
|
|
|
|
|
wpa_t *wpa = (wpa_t *) esalt_buf;
|
|
|
|
|
2019-12-16 18:35:00 +00:00
|
|
|
char *input_buf = (char *) line_buf;
|
|
|
|
int input_len = line_len;
|
|
|
|
|
|
|
|
// start old pmkid/hccapx compatibility parsing
|
|
|
|
// idea is to find out if parsing succeeds and in this case to build a
|
|
|
|
// valid 22000 hash line and replace line_buf pointer
|
|
|
|
|
|
|
|
char tmp_buf[1024];
|
|
|
|
int tmp_len;
|
|
|
|
|
|
|
|
// hccapx parser
|
|
|
|
|
|
|
|
if (line_len == sizeof (hccapx_t))
|
|
|
|
{
|
|
|
|
hccapx_t *hccapx = (hccapx_t *) line_buf;
|
|
|
|
|
|
|
|
if ((hccapx->signature == HCCAPX_SIGNATURE) && (hccapx->version == HCCAPX_VERSION))
|
|
|
|
{
|
|
|
|
tmp_len = 0;
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
tmp_len += snprintf (tmp_buf, sizeof (tmp_buf) - tmp_len, "WPA*02*");
|
2019-12-16 18:35:00 +00:00
|
|
|
|
|
|
|
tmp_len += hex_encode ((const u8 *) hccapx->keymic, 16, (u8 *) tmp_buf + tmp_len);
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
tmp_buf[tmp_len] = '*';
|
2019-12-16 18:35:00 +00:00
|
|
|
|
|
|
|
tmp_len++;
|
|
|
|
|
|
|
|
tmp_len += hex_encode ((const u8 *) hccapx->mac_ap, 6, (u8 *) tmp_buf + tmp_len);
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
tmp_buf[tmp_len] = '*';
|
2019-12-16 18:35:00 +00:00
|
|
|
|
|
|
|
tmp_len++;
|
|
|
|
|
|
|
|
tmp_len += hex_encode ((const u8 *) hccapx->mac_sta, 6, (u8 *) tmp_buf + tmp_len);
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
tmp_buf[tmp_len] = '*';
|
2019-12-16 18:35:00 +00:00
|
|
|
|
|
|
|
tmp_len++;
|
|
|
|
|
|
|
|
tmp_len += hex_encode ((const u8 *) hccapx->essid, hccapx->essid_len, (u8 *) tmp_buf + tmp_len);
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
tmp_buf[tmp_len] = '*';
|
2019-12-16 18:35:00 +00:00
|
|
|
|
|
|
|
tmp_len++;
|
|
|
|
|
|
|
|
tmp_len += hex_encode ((const u8 *) hccapx->nonce_ap, 32, (u8 *) tmp_buf + tmp_len);
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
tmp_buf[tmp_len] = '*';
|
2019-12-16 18:35:00 +00:00
|
|
|
|
|
|
|
tmp_len++;
|
|
|
|
|
|
|
|
tmp_len += hex_encode ((const u8 *) hccapx->eapol, hccapx->eapol_len, (u8 *) tmp_buf + tmp_len);
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
tmp_buf[tmp_len] = '*';
|
2019-12-16 18:35:00 +00:00
|
|
|
|
|
|
|
tmp_len++;
|
|
|
|
|
|
|
|
tmp_len += hex_encode ((const u8 *) &hccapx->message_pair, 1, (u8 *) tmp_buf + tmp_len);
|
|
|
|
|
|
|
|
tmp_buf[tmp_len] = 0;
|
|
|
|
|
|
|
|
input_buf = tmp_buf;
|
|
|
|
input_len = tmp_len;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// pmkid parser
|
|
|
|
|
|
|
|
if (1)
|
|
|
|
{
|
|
|
|
// detect super-old/old format
|
|
|
|
|
|
|
|
int old_sep = 0;
|
|
|
|
int new_sep = 0;
|
|
|
|
|
|
|
|
for (int i = 0; i < line_len; i++)
|
|
|
|
{
|
|
|
|
const char c = line_buf[i];
|
|
|
|
|
|
|
|
if (c == '*') old_sep++;
|
|
|
|
if (c == ':') new_sep++;
|
|
|
|
}
|
|
|
|
|
|
|
|
const u8 sep = (new_sep > old_sep) ? ':' : '*';
|
|
|
|
|
|
|
|
// start normal parsing
|
|
|
|
|
|
|
|
token_t token;
|
|
|
|
|
|
|
|
token.token_cnt = 4;
|
|
|
|
|
|
|
|
token.sep[0] = sep;
|
|
|
|
token.len_min[0] = 32;
|
|
|
|
token.len_max[0] = 32;
|
|
|
|
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH
|
|
|
|
| TOKEN_ATTR_VERIFY_HEX;
|
|
|
|
|
|
|
|
token.sep[1] = sep;
|
|
|
|
token.len_min[1] = 12;
|
|
|
|
token.len_max[1] = 12;
|
|
|
|
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH
|
|
|
|
| TOKEN_ATTR_VERIFY_HEX;
|
|
|
|
|
|
|
|
token.sep[2] = sep;
|
|
|
|
token.len_min[2] = 12;
|
|
|
|
token.len_max[2] = 12;
|
|
|
|
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH
|
|
|
|
| TOKEN_ATTR_VERIFY_HEX;
|
|
|
|
|
|
|
|
token.sep[3] = sep;
|
|
|
|
token.len_min[3] = 0;
|
|
|
|
token.len_max[3] = 64;
|
|
|
|
token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH
|
|
|
|
| TOKEN_ATTR_VERIFY_HEX;
|
|
|
|
|
|
|
|
const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token);
|
|
|
|
|
|
|
|
if (rc_tokenizer == PARSER_OK)
|
|
|
|
{
|
2019-12-19 18:17:01 +00:00
|
|
|
tmp_len = snprintf (tmp_buf, sizeof (tmp_buf), "WPA*01*%s***", line_buf);
|
2019-12-16 18:35:00 +00:00
|
|
|
|
|
|
|
input_buf = tmp_buf;
|
|
|
|
input_len = tmp_len;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-15 20:09:04 +00:00
|
|
|
// start normal parsing
|
|
|
|
|
|
|
|
token_t token;
|
|
|
|
|
|
|
|
token.token_cnt = 9;
|
|
|
|
|
|
|
|
token.signatures_cnt = 1;
|
|
|
|
token.signatures_buf[0] = "WPA";
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
token.sep[0] = '*';
|
2019-12-15 20:09:04 +00:00
|
|
|
token.len_min[0] = 3;
|
|
|
|
token.len_max[0] = 3;
|
|
|
|
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH
|
|
|
|
| TOKEN_ATTR_VERIFY_SIGNATURE;
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
token.sep[1] = '*';
|
2019-12-15 20:09:04 +00:00
|
|
|
token.len_min[1] = 2;
|
|
|
|
token.len_max[1] = 2;
|
|
|
|
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH
|
|
|
|
| TOKEN_ATTR_VERIFY_HEX;
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
token.sep[2] = '*';
|
2019-12-15 20:09:04 +00:00
|
|
|
token.len_min[2] = 32;
|
|
|
|
token.len_max[2] = 32;
|
|
|
|
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH
|
|
|
|
| TOKEN_ATTR_VERIFY_HEX;
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
token.sep[3] = '*';
|
2019-12-15 20:09:04 +00:00
|
|
|
token.len_min[3] = 12;
|
|
|
|
token.len_max[3] = 12;
|
|
|
|
token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH
|
|
|
|
| TOKEN_ATTR_VERIFY_HEX;
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
token.sep[4] = '*';
|
2019-12-15 20:09:04 +00:00
|
|
|
token.len_min[4] = 12;
|
|
|
|
token.len_max[4] = 12;
|
|
|
|
token.attr[4] = TOKEN_ATTR_VERIFY_LENGTH
|
|
|
|
| TOKEN_ATTR_VERIFY_HEX;
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
token.sep[5] = '*';
|
2019-12-15 20:09:04 +00:00
|
|
|
token.len_min[5] = 0;
|
|
|
|
token.len_max[5] = 64;
|
|
|
|
token.attr[5] = TOKEN_ATTR_VERIFY_LENGTH
|
|
|
|
| TOKEN_ATTR_VERIFY_HEX;
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
token.sep[6] = '*';
|
2019-12-15 20:09:04 +00:00
|
|
|
token.len_min[6] = 0;
|
|
|
|
token.len_max[6] = 64;
|
|
|
|
token.attr[6] = TOKEN_ATTR_VERIFY_LENGTH
|
|
|
|
| TOKEN_ATTR_VERIFY_HEX;
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
token.sep[7] = '*';
|
2019-12-15 20:09:04 +00:00
|
|
|
token.len_min[7] = 0;
|
|
|
|
token.len_max[7] = 512;
|
|
|
|
token.attr[7] = TOKEN_ATTR_VERIFY_LENGTH
|
|
|
|
| TOKEN_ATTR_VERIFY_HEX;
|
|
|
|
|
2019-12-19 18:17:01 +00:00
|
|
|
token.sep[8] = '*';
|
2019-12-15 20:09:04 +00:00
|
|
|
token.len_min[8] = 0;
|
|
|
|
token.len_max[8] = 2;
|
|
|
|
token.attr[8] = TOKEN_ATTR_VERIFY_LENGTH
|
|
|
|
| TOKEN_ATTR_VERIFY_HEX;
|
|
|
|
|
2019-12-16 18:35:00 +00:00
|
|
|
const int rc_tokenizer = input_tokenizer ((const u8 *) input_buf, input_len, &token);
|
2019-12-15 20:09:04 +00:00
|
|
|
|
|
|
|
if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
|
|
|
|
|
|
|
|
// mac_ap
|
|
|
|
|
2019-12-16 11:47:48 +00:00
|
|
|
u8 *mac_ap = (u8 *) wpa->mac_ap;
|
|
|
|
u8 *mac_sta = (u8 *) wpa->mac_sta;
|
|
|
|
|
2019-12-15 20:09:04 +00:00
|
|
|
const u8 *macap_buf = token.buf[3];
|
|
|
|
|
2019-12-16 11:47:48 +00:00
|
|
|
mac_ap[0] = hex_to_u8 (macap_buf + 0);
|
|
|
|
mac_ap[1] = hex_to_u8 (macap_buf + 2);
|
|
|
|
mac_ap[2] = hex_to_u8 (macap_buf + 4);
|
|
|
|
mac_ap[3] = hex_to_u8 (macap_buf + 6);
|
|
|
|
mac_ap[4] = hex_to_u8 (macap_buf + 8);
|
|
|
|
mac_ap[5] = hex_to_u8 (macap_buf + 10);
|
2019-12-15 20:09:04 +00:00
|
|
|
|
|
|
|
// mac_sta
|
|
|
|
|
|
|
|
const u8 *macsta_buf = token.buf[4];
|
|
|
|
|
2019-12-16 11:47:48 +00:00
|
|
|
mac_sta[0] = hex_to_u8 (macsta_buf + 0);
|
|
|
|
mac_sta[1] = hex_to_u8 (macsta_buf + 2);
|
|
|
|
mac_sta[2] = hex_to_u8 (macsta_buf + 4);
|
|
|
|
mac_sta[3] = hex_to_u8 (macsta_buf + 6);
|
|
|
|
mac_sta[4] = hex_to_u8 (macsta_buf + 8);
|
|
|
|
mac_sta[5] = hex_to_u8 (macsta_buf + 10);
|
2019-12-15 20:09:04 +00:00
|
|
|
|
|
|
|
// essid
|
|
|
|
|
|
|
|
const u8 *essid_buf = token.buf[5];
|
|
|
|
const int essid_len = token.len[5];
|
|
|
|
|
|
|
|
if (essid_len & 1) return (PARSER_SALT_VALUE);
|
|
|
|
|
|
|
|
wpa->essid_len = hex_decode (essid_buf, essid_len, (u8 *) wpa->essid_buf);
|
|
|
|
|
|
|
|
// salt
|
|
|
|
|
|
|
|
memcpy (salt->salt_buf, wpa->essid_buf, wpa->essid_len);
|
|
|
|
|
|
|
|
salt->salt_len = wpa->essid_len;
|
|
|
|
|
|
|
|
salt->salt_iter = ROUNDS_WPA_PBKDF2 - 1;
|
|
|
|
|
|
|
|
// type
|
|
|
|
|
|
|
|
const u8 *type_buf = token.buf[1];
|
|
|
|
|
|
|
|
const u8 type = hex_to_u8 (type_buf);
|
|
|
|
|
|
|
|
if ((type != 1) && (type != 2)) return (PARSER_SALT_VALUE);
|
|
|
|
|
|
|
|
wpa->type = type;
|
|
|
|
|
|
|
|
// PMKID specific code
|
|
|
|
|
|
|
|
if (type == 1)
|
|
|
|
{
|
|
|
|
// pmkid
|
|
|
|
|
|
|
|
const u8 *pmkid_buf = token.buf[2];
|
|
|
|
|
|
|
|
wpa->pmkid[0] = hex_to_u32 (pmkid_buf + 0);
|
|
|
|
wpa->pmkid[1] = hex_to_u32 (pmkid_buf + 8);
|
|
|
|
wpa->pmkid[2] = hex_to_u32 (pmkid_buf + 16);
|
|
|
|
wpa->pmkid[3] = hex_to_u32 (pmkid_buf + 24);
|
|
|
|
|
|
|
|
// pmkid_data
|
|
|
|
|
|
|
|
wpa->pmkid_data[0] = 0x204b4d50; // "PMK "
|
|
|
|
wpa->pmkid_data[1] = 0x656d614e; // "Name"
|
2019-12-16 11:47:48 +00:00
|
|
|
wpa->pmkid_data[2] = (mac_ap[0] << 0)
|
|
|
|
| (mac_ap[1] << 8)
|
|
|
|
| (mac_ap[2] << 16)
|
|
|
|
| (mac_ap[3] << 24);
|
|
|
|
wpa->pmkid_data[3] = (mac_ap[4] << 0)
|
|
|
|
| (mac_ap[5] << 8)
|
|
|
|
| (mac_sta[0] << 16)
|
|
|
|
| (mac_sta[1] << 24);
|
|
|
|
wpa->pmkid_data[4] = (mac_sta[2] << 0)
|
|
|
|
| (mac_sta[3] << 8)
|
|
|
|
| (mac_sta[4] << 16)
|
|
|
|
| (mac_sta[5] << 24);
|
2019-12-15 20:09:04 +00:00
|
|
|
|
|
|
|
// hash
|
|
|
|
|
|
|
|
digest[0] = wpa->pmkid[0];
|
|
|
|
digest[1] = wpa->pmkid[1];
|
|
|
|
digest[2] = wpa->pmkid[2];
|
|
|
|
digest[3] = wpa->pmkid[3];
|
|
|
|
|
|
|
|
digest[0] = byte_swap_32 (digest[0]);
|
|
|
|
digest[1] = byte_swap_32 (digest[1]);
|
|
|
|
digest[2] = byte_swap_32 (digest[2]);
|
|
|
|
digest[3] = byte_swap_32 (digest[3]);
|
|
|
|
}
|
|
|
|
|
|
|
|
// EAPOL specific code
|
|
|
|
|
|
|
|
if (type == 2)
|
|
|
|
{
|
|
|
|
// checks
|
|
|
|
|
|
|
|
if (token.len[6] != 64) return (PARSER_SALT_LENGTH);
|
|
|
|
|
|
|
|
if (token.len[7] < (int) sizeof (auth_packet_t) * 2) return (PARSER_SALT_LENGTH);
|
|
|
|
|
|
|
|
if (token.len[8] != 2) return (PARSER_SALT_LENGTH);
|
|
|
|
|
|
|
|
// anonce
|
|
|
|
|
|
|
|
const u8 *anonce_pos = token.buf[6];
|
|
|
|
|
|
|
|
wpa->anonce[0] = hex_to_u32 (anonce_pos + 0);
|
|
|
|
wpa->anonce[1] = hex_to_u32 (anonce_pos + 8);
|
|
|
|
wpa->anonce[2] = hex_to_u32 (anonce_pos + 16);
|
|
|
|
wpa->anonce[3] = hex_to_u32 (anonce_pos + 24);
|
|
|
|
wpa->anonce[4] = hex_to_u32 (anonce_pos + 32);
|
|
|
|
wpa->anonce[5] = hex_to_u32 (anonce_pos + 40);
|
|
|
|
wpa->anonce[6] = hex_to_u32 (anonce_pos + 48);
|
|
|
|
wpa->anonce[7] = hex_to_u32 (anonce_pos + 56);
|
|
|
|
|
|
|
|
// eapol
|
|
|
|
|
|
|
|
const u8 *eapol_pos = token.buf[7];
|
|
|
|
|
|
|
|
u8 *eapol_ptr = (u8 *) wpa->eapol;
|
|
|
|
|
|
|
|
wpa->eapol_len = hex_decode ((const u8 *) eapol_pos, token.len[7], eapol_ptr);
|
|
|
|
|
|
|
|
memset (eapol_ptr + wpa->eapol_len, 0, (256 + 64) - wpa->eapol_len);
|
|
|
|
|
|
|
|
auth_packet_t *auth_packet = (auth_packet_t *) wpa->eapol;
|
|
|
|
|
|
|
|
// keyver
|
|
|
|
|
|
|
|
const u16 key_information = byte_swap_16 (auth_packet->key_information);
|
|
|
|
|
|
|
|
wpa->keyver = key_information & 3;
|
|
|
|
|
|
|
|
if ((wpa->keyver != 1) && (wpa->keyver != 2) && (wpa->keyver != 3)) return (PARSER_SALT_VALUE);
|
|
|
|
|
|
|
|
// pke
|
|
|
|
|
|
|
|
u8 *pke_ptr = (u8 *) wpa->pke;
|
|
|
|
|
|
|
|
memset (pke_ptr, 0, 128);
|
|
|
|
|
|
|
|
if ((wpa->keyver == 1) || (wpa->keyver == 2))
|
|
|
|
{
|
|
|
|
memcpy (pke_ptr, "Pairwise key expansion\x00", 23);
|
|
|
|
|
2019-12-16 11:47:48 +00:00
|
|
|
if (memcmp (mac_ap, mac_sta, 6) < 0)
|
2019-12-15 20:09:04 +00:00
|
|
|
{
|
2019-12-16 11:47:48 +00:00
|
|
|
memcpy (pke_ptr + 23, mac_ap, 6);
|
|
|
|
memcpy (pke_ptr + 29, mac_sta, 6);
|
2019-12-15 20:09:04 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2019-12-16 11:47:48 +00:00
|
|
|
memcpy (pke_ptr + 23, mac_sta, 6);
|
|
|
|
memcpy (pke_ptr + 29, mac_ap, 6);
|
2019-12-15 20:09:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
wpa->nonce_compare = memcmp (wpa->anonce, auth_packet->wpa_key_nonce, 32);
|
|
|
|
|
|
|
|
if (wpa->nonce_compare < 0)
|
|
|
|
{
|
|
|
|
memcpy (pke_ptr + 35, wpa->anonce, 32);
|
|
|
|
memcpy (pke_ptr + 67, auth_packet->wpa_key_nonce, 32);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
memcpy (pke_ptr + 35, auth_packet->wpa_key_nonce, 32);
|
|
|
|
memcpy (pke_ptr + 67, wpa->anonce, 32);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (wpa->keyver == 3)
|
|
|
|
{
|
|
|
|
pke_ptr[0] = 1;
|
|
|
|
pke_ptr[1] = 0;
|
|
|
|
|
|
|
|
memcpy (pke_ptr + 2, "Pairwise key expansion", 22);
|
|
|
|
|
2019-12-16 11:47:48 +00:00
|
|
|
if (memcmp (mac_ap, mac_sta, 6) < 0)
|
2019-12-15 20:09:04 +00:00
|
|
|
{
|
2019-12-16 11:47:48 +00:00
|
|
|
memcpy (pke_ptr + 24, mac_ap, 6);
|
|
|
|
memcpy (pke_ptr + 30, mac_sta, 6);
|
2019-12-15 20:09:04 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2019-12-16 11:47:48 +00:00
|
|
|
memcpy (pke_ptr + 24, mac_sta, 6);
|
|
|
|
memcpy (pke_ptr + 30, mac_ap, 6);
|
2019-12-15 20:09:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
wpa->nonce_compare = memcmp (wpa->anonce, auth_packet->wpa_key_nonce, 32);
|
|
|
|
|
|
|
|
if (wpa->nonce_compare < 0)
|
|
|
|
{
|
|
|
|
memcpy (pke_ptr + 36, wpa->anonce, 32);
|
|
|
|
memcpy (pke_ptr + 68, auth_packet->wpa_key_nonce, 32);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
memcpy (pke_ptr + 36, auth_packet->wpa_key_nonce, 32);
|
|
|
|
memcpy (pke_ptr + 68, wpa->anonce, 32);
|
|
|
|
}
|
|
|
|
|
|
|
|
pke_ptr[100] = 0x80;
|
|
|
|
pke_ptr[101] = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < 32; i++)
|
|
|
|
{
|
|
|
|
wpa->pke[i] = byte_swap_32 (wpa->pke[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpa->keyver == 2)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < 64; i++)
|
|
|
|
{
|
|
|
|
wpa->eapol[i] = byte_swap_32 (wpa->eapol[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpa->keyver == 3)
|
|
|
|
{
|
|
|
|
eapol_ptr[wpa->eapol_len] = 0x80;
|
|
|
|
}
|
|
|
|
|
2019-12-16 11:47:48 +00:00
|
|
|
// message_pair
|
2019-12-15 20:09:04 +00:00
|
|
|
|
2019-12-16 18:35:00 +00:00
|
|
|
const u8 *message_pair_pos = token.buf[8];
|
2019-12-15 20:09:04 +00:00
|
|
|
|
2019-12-16 18:35:00 +00:00
|
|
|
const u8 message_pair = hex_to_u8 (message_pair_pos);
|
2019-12-16 11:47:48 +00:00
|
|
|
|
2019-12-16 18:35:00 +00:00
|
|
|
if (wpa->message_pair_chgd == true)
|
2019-12-16 11:47:48 +00:00
|
|
|
{
|
2019-12-16 18:35:00 +00:00
|
|
|
// we can filter some message types here
|
2019-12-16 11:47:48 +00:00
|
|
|
|
2019-12-16 18:35:00 +00:00
|
|
|
if (wpa->message_pair != (message_pair & 0x7f)) return (PARSER_HCCAPX_MESSAGE_PAIR);
|
2019-12-16 11:47:48 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2019-12-16 18:35:00 +00:00
|
|
|
wpa->message_pair = message_pair;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpa->nonce_error_corrections_chgd == true)
|
|
|
|
{
|
|
|
|
// value was set in module_hash_binary_parse()
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (wpa->message_pair & (1 << 4))
|
2019-12-16 11:47:48 +00:00
|
|
|
{
|
2019-12-16 18:35:00 +00:00
|
|
|
// ap-less attack detected, nc not needed
|
2019-12-16 11:47:48 +00:00
|
|
|
|
2019-12-16 18:35:00 +00:00
|
|
|
wpa->nonce_error_corrections = 0;
|
2019-12-16 11:47:48 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2019-12-16 18:35:00 +00:00
|
|
|
if (wpa->message_pair & (1 << 7))
|
|
|
|
{
|
|
|
|
// replaycount not checked, nc needed
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
wpa->nonce_error_corrections = 0;
|
|
|
|
}
|
2019-12-16 11:47:48 +00:00
|
|
|
}
|
|
|
|
}
|
2019-12-15 20:09:04 +00:00
|
|
|
|
2019-12-16 18:35:00 +00:00
|
|
|
// now some optimization related to replay counter endianess
|
|
|
|
// hcxtools has techniques to detect them
|
|
|
|
// since we can not guarantee to get our handshakes from hcxtools we enable both by default
|
|
|
|
// this means that we check both even if both are not set!
|
|
|
|
// however if one of them is set, we can assume that the endianess has been checked and the other one is not needed
|
|
|
|
|
2019-12-16 11:47:48 +00:00
|
|
|
wpa->detected_le = 1;
|
|
|
|
wpa->detected_be = 1;
|
2019-12-15 20:09:04 +00:00
|
|
|
|
2019-12-16 11:47:48 +00:00
|
|
|
if (wpa->message_pair & (1 << 5))
|
|
|
|
{
|
|
|
|
wpa->detected_le = 1;
|
|
|
|
wpa->detected_be = 0;
|
|
|
|
}
|
|
|
|
else if (wpa->message_pair & (1 << 6))
|
|
|
|
{
|
|
|
|
wpa->detected_le = 0;
|
|
|
|
wpa->detected_be = 1;
|
|
|
|
}
|
2019-12-15 20:09:04 +00:00
|
|
|
|
|
|
|
// mic
|
|
|
|
|
|
|
|
const u8 *mic_pos = token.buf[2];
|
|
|
|
|
|
|
|
wpa->keymic[0] = hex_to_u32 (mic_pos + 0);
|
|
|
|
wpa->keymic[1] = hex_to_u32 (mic_pos + 8);
|
|
|
|
wpa->keymic[2] = hex_to_u32 (mic_pos + 16);
|
|
|
|
wpa->keymic[3] = hex_to_u32 (mic_pos + 24);
|
|
|
|
|
|
|
|
wpa->keymic[0] = byte_swap_32 (wpa->keymic[0]);
|
|
|
|
wpa->keymic[1] = byte_swap_32 (wpa->keymic[1]);
|
|
|
|
wpa->keymic[2] = byte_swap_32 (wpa->keymic[2]);
|
|
|
|
wpa->keymic[3] = byte_swap_32 (wpa->keymic[3]);
|
|
|
|
|
|
|
|
// Create a hash of the nonce as ESSID is not unique enough
|
|
|
|
// Not a regular MD5 but good enough
|
|
|
|
// We can also ignore cases where we should bzero the work buffer
|
|
|
|
|
|
|
|
u32 hash[4];
|
|
|
|
|
|
|
|
hash[0] = 0;
|
|
|
|
hash[1] = 1;
|
|
|
|
hash[2] = 2;
|
|
|
|
hash[3] = 3;
|
|
|
|
|
|
|
|
u32 block[16];
|
|
|
|
|
|
|
|
memset (block, 0, sizeof (block));
|
|
|
|
|
|
|
|
u8 *block_ptr = (u8 *) block;
|
|
|
|
|
|
|
|
for (int i = 0; i < 16; i++) block[i] = salt->salt_buf[i];
|
|
|
|
|
|
|
|
md5_transform (block + 0, block + 4, block + 8, block + 12, hash);
|
|
|
|
|
|
|
|
for (int i = 0; i < 16; i++) block[i] = wpa->pke[i + 0];
|
|
|
|
|
|
|
|
md5_transform (block + 0, block + 4, block + 8, block + 12, hash);
|
|
|
|
|
|
|
|
for (int i = 0; i < 16; i++) block[i] = wpa->pke[i + 16];
|
|
|
|
|
|
|
|
md5_transform (block + 0, block + 4, block + 8, block + 12, hash);
|
|
|
|
|
|
|
|
for (int i = 0; i < 16; i++) block[i] = wpa->eapol[i + 0];
|
|
|
|
|
|
|
|
md5_transform (block + 0, block + 4, block + 8, block + 12, hash);
|
|
|
|
|
|
|
|
for (int i = 0; i < 16; i++) block[i] = wpa->eapol[i + 16];
|
|
|
|
|
|
|
|
md5_transform (block + 0, block + 4, block + 8, block + 12, hash);
|
|
|
|
|
|
|
|
for (int i = 0; i < 16; i++) block[i] = wpa->eapol[i + 32];
|
|
|
|
|
|
|
|
md5_transform (block + 0, block + 4, block + 8, block + 12, hash);
|
|
|
|
|
|
|
|
for (int i = 0; i < 16; i++) block[i] = wpa->eapol[i + 48];
|
|
|
|
|
|
|
|
md5_transform (block + 0, block + 4, block + 8, block + 12, hash);
|
|
|
|
|
2019-12-16 11:47:48 +00:00
|
|
|
for (int i = 0; i < 2; i++) block[0 + i] = wpa->mac_ap[i];
|
|
|
|
for (int i = 0; i < 2; i++) block[2 + i] = wpa->mac_ap[i];
|
|
|
|
for (int i = 0; i < 12; i++) block[4 + i] = 0;
|
2019-12-15 20:09:04 +00:00
|
|
|
|
|
|
|
md5_transform (block + 0, block + 4, block + 8, block + 12, hash);
|
|
|
|
|
|
|
|
memcpy (block_ptr + 0, wpa->anonce, 32);
|
|
|
|
memcpy (block_ptr + 32, auth_packet->wpa_key_nonce, 32);
|
|
|
|
|
|
|
|
md5_transform (block + 0, block + 4, block + 8, block + 12, hash);
|
|
|
|
|
|
|
|
block[0] = wpa->keymic[0];
|
|
|
|
block[1] = wpa->keymic[1];
|
|
|
|
block[2] = wpa->keymic[2];
|
|
|
|
block[3] = wpa->keymic[3];
|
|
|
|
|
|
|
|
md5_transform (block + 0, block + 4, block + 8, block + 12, hash);
|
|
|
|
|
|
|
|
// make all this stuff unique
|
|
|
|
|
|
|
|
digest[0] = hash[0];
|
|
|
|
digest[1] = hash[1];
|
|
|
|
digest[2] = hash[2];
|
|
|
|
digest[3] = hash[3];
|
|
|
|
}
|
|
|
|
|
|
|
|
return (PARSER_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, MAYBE_UNUSED const void *hook_salt_buf, MAYBE_UNUSED const hashinfo_t *hash_info, char *line_buf, MAYBE_UNUSED const int line_size)
|
|
|
|
{
|
|
|
|
const wpa_t *wpa = (const wpa_t *) esalt_buf;
|
|
|
|
|
|
|
|
int line_len = 0;
|
|
|
|
|
2019-12-16 11:47:48 +00:00
|
|
|
const u8 *mac_ap = (const u8 *) wpa->mac_ap;
|
|
|
|
const u8 *mac_sta = (const u8 *) wpa->mac_sta;
|
|
|
|
|
2020-01-19 17:12:16 +00:00
|
|
|
if (wpa->type == 1)
|
|
|
|
{
|
|
|
|
u32_to_hex (wpa->pmkid[0], (u8 *) line_buf + line_len); line_len += 8;
|
|
|
|
u32_to_hex (wpa->pmkid[1], (u8 *) line_buf + line_len); line_len += 8;
|
|
|
|
u32_to_hex (wpa->pmkid[2], (u8 *) line_buf + line_len); line_len += 8;
|
|
|
|
u32_to_hex (wpa->pmkid[3], (u8 *) line_buf + line_len); line_len += 8;
|
|
|
|
}
|
|
|
|
else if (wpa->type == 2)
|
|
|
|
{
|
2020-01-26 09:45:41 +00:00
|
|
|
u32_to_hex (byte_swap_32 (wpa->keymic[0]), (u8 *) line_buf + line_len); line_len += 8;
|
|
|
|
u32_to_hex (byte_swap_32 (wpa->keymic[1]), (u8 *) line_buf + line_len); line_len += 8;
|
|
|
|
u32_to_hex (byte_swap_32 (wpa->keymic[2]), (u8 *) line_buf + line_len); line_len += 8;
|
|
|
|
u32_to_hex (byte_swap_32 (wpa->keymic[3]), (u8 *) line_buf + line_len); line_len += 8;
|
2020-01-19 17:12:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
line_buf[line_len] = ':';
|
|
|
|
|
|
|
|
line_len++;
|
|
|
|
|
|
|
|
if (need_hexify ((const u8 *) wpa->essid_buf, wpa->essid_len, ':', 0) == true)
|
2019-12-15 20:09:04 +00:00
|
|
|
{
|
|
|
|
char tmp_buf[128];
|
|
|
|
|
|
|
|
int tmp_len = 0;
|
|
|
|
|
|
|
|
tmp_buf[tmp_len++] = '$';
|
|
|
|
tmp_buf[tmp_len++] = 'H';
|
|
|
|
tmp_buf[tmp_len++] = 'E';
|
|
|
|
tmp_buf[tmp_len++] = 'X';
|
|
|
|
tmp_buf[tmp_len++] = '[';
|
|
|
|
|
|
|
|
exec_hexify ((const u8 *) wpa->essid_buf, wpa->essid_len, (u8 *) tmp_buf + tmp_len);
|
|
|
|
|
|
|
|
tmp_len += wpa->essid_len * 2;
|
|
|
|
|
|
|
|
tmp_buf[tmp_len++] = ']';
|
|
|
|
|
|
|
|
tmp_buf[tmp_len++] = 0;
|
|
|
|
|
2020-01-19 17:12:16 +00:00
|
|
|
line_len += snprintf (line_buf + line_len, line_size - line_len, "%02x%02x%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%s",
|
2019-12-16 11:47:48 +00:00
|
|
|
mac_ap[0],
|
|
|
|
mac_ap[1],
|
|
|
|
mac_ap[2],
|
|
|
|
mac_ap[3],
|
|
|
|
mac_ap[4],
|
|
|
|
mac_ap[5],
|
|
|
|
mac_sta[0],
|
|
|
|
mac_sta[1],
|
|
|
|
mac_sta[2],
|
|
|
|
mac_sta[3],
|
|
|
|
mac_sta[4],
|
|
|
|
mac_sta[5],
|
2019-12-15 20:09:04 +00:00
|
|
|
tmp_buf);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2020-01-19 17:12:16 +00:00
|
|
|
line_len += snprintf (line_buf + line_len, line_size - line_len, "%02x%02x%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%s",
|
2019-12-16 11:47:48 +00:00
|
|
|
mac_ap[0],
|
|
|
|
mac_ap[1],
|
|
|
|
mac_ap[2],
|
|
|
|
mac_ap[3],
|
|
|
|
mac_ap[4],
|
|
|
|
mac_ap[5],
|
|
|
|
mac_sta[0],
|
|
|
|
mac_sta[1],
|
|
|
|
mac_sta[2],
|
|
|
|
mac_sta[3],
|
|
|
|
mac_sta[4],
|
|
|
|
mac_sta[5],
|
2019-12-15 20:09:04 +00:00
|
|
|
(const char *) wpa->essid_buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
return line_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
void module_init (module_ctx_t *module_ctx)
|
|
|
|
{
|
|
|
|
module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
|
|
|
|
module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
|
|
|
|
|
|
|
|
module_ctx->module_attack_exec = module_attack_exec;
|
|
|
|
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_benchmark_mask = module_benchmark_mask;
|
|
|
|
module_ctx->module_benchmark_salt = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_build_plain_postprocess = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_deep_comp_kernel = module_deep_comp_kernel;
|
|
|
|
module_ctx->module_dgst_pos0 = module_dgst_pos0;
|
|
|
|
module_ctx->module_dgst_pos1 = module_dgst_pos1;
|
|
|
|
module_ctx->module_dgst_pos2 = module_dgst_pos2;
|
|
|
|
module_ctx->module_dgst_pos3 = module_dgst_pos3;
|
|
|
|
module_ctx->module_dgst_size = module_dgst_size;
|
|
|
|
module_ctx->module_dictstat_disable = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_esalt_size = module_esalt_size;
|
|
|
|
module_ctx->module_extra_buffer_size = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_extra_tmp_size = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_forced_outfile_format = MODULE_DEFAULT;
|
2019-12-16 18:35:00 +00:00
|
|
|
module_ctx->module_hash_binary_count = module_hash_binary_count;
|
|
|
|
module_ctx->module_hash_binary_parse = module_hash_binary_parse;
|
2019-12-15 20:09:04 +00:00
|
|
|
module_ctx->module_hash_binary_save = module_hash_binary_save;
|
|
|
|
module_ctx->module_hash_decode_potfile = module_hash_decode_potfile;
|
|
|
|
module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hash_decode = module_hash_decode;
|
|
|
|
module_ctx->module_hash_encode_status = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hash_encode_potfile = module_hash_encode_potfile;
|
|
|
|
module_ctx->module_hash_encode = module_hash_encode;
|
2019-12-16 18:35:00 +00:00
|
|
|
module_ctx->module_hash_init_selftest = module_hash_init_selftest;
|
2019-12-15 20:09:04 +00:00
|
|
|
module_ctx->module_hash_mode = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hash_category = module_hash_category;
|
|
|
|
module_ctx->module_hash_name = module_hash_name;
|
|
|
|
module_ctx->module_hashes_count_min = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hashes_count_max = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hlfmt_disable = module_hlfmt_disable;
|
2020-08-29 14:12:15 +00:00
|
|
|
module_ctx->module_hook_extra_param_size = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hook_extra_param_init = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hook_extra_param_term = MODULE_DEFAULT;
|
2019-12-15 20:09:04 +00:00
|
|
|
module_ctx->module_hook12 = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hook23 = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hook_size = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_jit_build_options = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_jit_cache_disable = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_kernel_loops_max = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_kernel_loops_min = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_kernel_threads_max = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_kernel_threads_min = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_kern_type = module_kern_type;
|
|
|
|
module_ctx->module_kern_type_dynamic = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_opti_type = module_opti_type;
|
|
|
|
module_ctx->module_opts_type = module_opts_type;
|
|
|
|
module_ctx->module_outfile_check_disable = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_outfile_check_nocomp = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_potfile_custom_check = module_potfile_custom_check;
|
|
|
|
module_ctx->module_potfile_disable = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_potfile_keep_all_hashes = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_pwdump_column = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_pw_max = module_pw_max;
|
|
|
|
module_ctx->module_pw_min = module_pw_min;
|
|
|
|
module_ctx->module_salt_max = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_salt_min = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_salt_type = module_salt_type;
|
|
|
|
module_ctx->module_separator = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_st_hash = module_st_hash;
|
|
|
|
module_ctx->module_st_pass = module_st_pass;
|
|
|
|
module_ctx->module_tmp_size = module_tmp_size;
|
|
|
|
module_ctx->module_unstable_warning = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_warmup_disable = MODULE_DEFAULT;
|
|
|
|
}
|