DeforaNetworks/hashcat
3
0
Fork 0
Code Releases Activity

Added support for loading hccapx files

Browse Source
This commit is contained in:
jsteube
2017-02-06 17:03:42 +01:00
parent cc991ee106
commit 717da7f4f2
9 changed files with 132 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
include/interface.h
View File

@@ -176,12 +176,13 @@ typedef struct wpa
{
u32 pke[25];
u32 eapol[64];
int eapol_size;
int keyver;
u8 orig_mac1[6];
u8 orig_mac2[6];
u8 orig_nonce1[32];
u8 orig_nonce2[32];
u16 eapol_len;
u8 authenticated;
u8 keyver;
u8 orig_mac_ap[6];
u8 orig_mac_sta[6];
u8 orig_nonce_ap[32];
u8 orig_nonce_sta[32];
int essid_reuse;
} wpa_t;
@@ -809,22 +810,27 @@ typedef struct struct_psafe2_hdr
} psafe2_hdr;
typedef struct hccap
#define HCCAPX_SIGNATURE 0x58504348 // HCPX
struct hccapx
{
char essid[36];
u32 signature;
u32 version;
u8 authenticated;
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];
u8 mac1[6];
u8 mac2[6];
u8 nonce1[32];
u8 nonce2[32];
} __attribute__((packed));
u8 eapol[256];
int eapol_size;
int keyver;
u8 keymic[16];
} hccap_t;
typedef struct hccapx hccapx_t;
/**
* hashtypes enums
@@ -1722,7 +1728,7 @@ char *stroptitype (const u32 opti_type);
char *strhashtype (const u32 hash_mode);
char *strparser (const u32 parser_status);
void to_hccap_t (hashcat_ctx_t *hashcat_ctx, hccap_t *hccap, const u32 salt_pos, const u32 digest_pos);
void to_hccapx_t (hashcat_ctx_t *hashcat_ctx, hccapx_t *hccapx, const u32 salt_pos, const u32 digest_pos);
void wpa_essid_reuse (hashcat_ctx_t *hashcat_ctx);

6
include/types.h
View File

@@ -433,8 +433,8 @@ typedef enum parser_rc
PARSER_SALT_ITERATION = -8,
PARSER_SEPARATOR_UNMATCHED = -9,
PARSER_SIGNATURE_UNMATCHED = -10,
PARSER_HCCAP_FILE_SIZE = -11,
PARSER_HCCAP_EAPOL_SIZE = -12,
PARSER_HCCAPX_FILE_SIZE = -11,
PARSER_HCCAPX_EAPOL_LEN = -12,
PARSER_PSAFE2_FILE_SIZE = -13,
PARSER_PSAFE3_FILE_SIZE = -14,
PARSER_TC_FILE_SIZE = -15,
@@ -453,6 +453,8 @@ typedef enum parser_rc
PARSER_LUKS_KEY_DISABLED = -28,
PARSER_LUKS_KEY_STRIPES = -29,
PARSER_LUKS_HASH_CIPHER = -30,
PARSER_HCCAPX_SIGNATURE = -31,
PARSER_HCCAPX_VERSION = -32,
PARSER_UNKNOWN_ERROR = -255
} parser_rc_t;