Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Filter ESSID by RegEx in hcxhashtool #343

Merged
merged 2 commits into from
Oct 9, 2024
Merged

Filter ESSID by RegEx in hcxhashtool #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5583dc6
Add ESSID regex filter support in hcxhashtool
RealEnder Oct 8, 2024
ea10af7
Cleanup
RealEnder Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 56 additions & 1 deletion hcxhashtool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
#include <regex.h>

#if defined (__APPLE__) || defined(__OpenBSD__)
#include <sys/socket.h>
Expand Down Expand Up @@ -113,8 +114,10 @@ static int essidlenmin;
static int essidlenmax;
static int filteressidlen;
static char *filteressidptr;
static regex_t essidregex;
static int filteressidpartlen;
static char *filteressidpartptr;
static char *filteressidregexptr;

static char *filtervendorptr;
static char *filtervendorapptr;
Expand Down Expand Up @@ -157,6 +160,7 @@ static void closelists(void)
{
if(hashlist != NULL) free(hashlist);
if(ouilist != NULL) free(ouilist);
if(filteressidregexptr != NULL) regfree(&essidregex);
if(ctxhmac != NULL)
{
EVP_MAC_CTX_free(ctxhmac);
Expand Down Expand Up @@ -268,6 +272,7 @@ if(essidlenmin != 0) fprintf(stdout, "filter by ESSID len min.......: %d\n", e
if(essidlenmax != 32) fprintf(stdout, "filter by ESSID len max.......: %d\n", essidlenmax);
if(filteressidptr != NULL) fprintf(stdout, "filter by ESSID...............: %s\n", filteressidptr);
if(filteressidpartptr != NULL) fprintf(stdout, "filter by part of ESSID.......: %s\n", filteressidpartptr);
if(filteressidregexptr != NULL) fprintf(stdout, "filter by ESSID RegEx.........: %s\n", filteressidregexptr);
if(flagfiltermacap == true)
{
vendor = getvendor(filtermacap);
Expand Down Expand Up @@ -608,6 +613,7 @@ static void writejohnrecord(FILE *fh_john, hashlist_t *zeiger)
{
static wpakey_t *wpak;
static int i;
static char essid[ESSID_LEN_MAX+1];
static unsigned char *hcpos;
static hccap_t hccap;

Expand All @@ -626,6 +632,12 @@ if(filteressidpartptr != NULL)
{
if(ispartof(filteressidpartlen, (uint8_t*)filteressidpartptr, zeiger->essidlen, zeiger->essid) == false) return;
}
if(filteressidregexptr != NULL)
{
strncpy(essid, (char*)zeiger->essid, zeiger->essidlen);
essid[zeiger->essidlen] = '\0';
if(regexec(&essidregex, essid, 0, NULL, 0) == REG_NOMATCH) return;
}
if((filtervendorptr != NULL) || (filtervendorapptr != NULL) || (filtervendorclientptr != NULL))
{
if(isoui(zeiger->ap, zeiger->client) == false) return;
Expand Down Expand Up @@ -675,7 +687,7 @@ if(hccap.keyver == 1) fprintf(fh_john, "::WPA");
else fprintf(fh_john, "::WPA2");
if((zeiger->mp &0x7) == 0) fprintf(fh_john, ":not verified");
else fprintf(fh_john, ":verified");
fprintf(fh_john, ":converted by hcxhastool\n");
fprintf(fh_john, ":converted by hcxhashtool\n");
johneapolwrittencount++;
return;
}
Expand Down Expand Up @@ -725,6 +737,7 @@ typedef struct hccap_s hccap_t;

static wpakey_t *wpak;
static hccap_t hccap;
static char essid[ESSID_LEN_MAX+1];

if(zeiger->type == HCX_TYPE_PMKID) return;
if((zeiger->essidlen < essidlenmin) || (zeiger->essidlen > essidlenmax)) return;
Expand All @@ -742,6 +755,12 @@ if(filteressidpartptr != NULL)
{
if(ispartof(filteressidpartlen, (uint8_t*)filteressidpartptr, zeiger->essidlen, zeiger->essid) == false) return;
}
if(filteressidregexptr != NULL)
{
strncpy(essid, (char *) zeiger->essid, zeiger->essidlen);
essid[zeiger->essidlen] = '\0';
if(regexec(&essidregex, essid, 0, NULL, 0) == REG_NOMATCH) return;
}
if((filtervendorptr != NULL) || (filtervendorapptr != NULL) || (filtervendorclientptr != NULL))
{
if(isoui(zeiger->ap, zeiger->client) == false) return;
Expand Down Expand Up @@ -829,6 +848,7 @@ static void writehccapxrecord(FILE *fh_hccapx, hashlist_t *zeiger)
{
static wpakey_t *wpak;
static hccapx_t hccapx;
static char essid[ESSID_LEN_MAX+1];

if(zeiger->type == HCX_TYPE_PMKID) return;
if((zeiger->essidlen < essidlenmin) || (zeiger->essidlen > essidlenmax)) return;
Expand All @@ -846,6 +866,12 @@ if(filteressidpartptr != NULL)
{
if(ispartof(filteressidpartlen, (uint8_t*)filteressidpartptr, zeiger->essidlen, zeiger->essid) == false) return;
}
if(filteressidregexptr != NULL)
{
strncpy(essid, (char *) zeiger->essid, zeiger->essidlen);
essid[zeiger->essidlen] = '\0';
if(regexec(&essidregex, essid, 0, NULL, 0) == REG_NOMATCH) return;
}
if((filtervendorptr != NULL) || (filtervendorapptr != NULL) || (filtervendorclientptr != NULL))
{
if(isoui(zeiger->ap, zeiger->client) == false) return;
Expand Down Expand Up @@ -989,6 +1015,7 @@ return;
static void writepmkideapolhashline(FILE *fh_pmkideapol, hashlist_t *zeiger)
{
static int p;
static char essid[ESSID_LEN_MAX+1];

if((zeiger->essidlen < essidlenmin) || (zeiger->essidlen > essidlenmax)) return;
if(((zeiger->type &hashtype) != HCX_TYPE_PMKID) && ((zeiger->type &hashtype) != HCX_TYPE_EAPOL)) return;
Expand All @@ -1005,6 +1032,14 @@ if(filteressidpartptr != NULL)
{
if(ispartof(filteressidpartlen, (uint8_t*)filteressidpartptr, zeiger->essidlen, zeiger->essid) == false) return;
}
if(filteressidregexptr != NULL)
{
strncpy(essid, (char *) zeiger->essid, zeiger->essidlen);
essid[zeiger->essidlen] = '\0';
//p = regexec(&essidregex, essid, 0, NULL, 0);
//printf("%d\n", p);
if(regexec(&essidregex, essid, 0, NULL, 0) == REG_NOMATCH) return;
}
if((filtervendorptr != NULL) || (filtervendorapptr != NULL) || (filtervendorclientptr != NULL))
{
if(isoui(zeiger->ap, zeiger->client) == false) return;
Expand Down Expand Up @@ -1266,6 +1301,7 @@ static uint8_t keyver;
static uint8_t keyinfo;
static uint64_t rc;
static char *vendor;
static char essid[ESSID_LEN_MAX+1];

if((zeiger->essidlen < essidlenmin) || (zeiger->essidlen > essidlenmax)) return;
if(((zeiger->type &hashtype) != HCX_TYPE_PMKID) && ((zeiger->type &hashtype) != HCX_TYPE_EAPOL)) return;
Expand All @@ -1282,6 +1318,12 @@ if(filteressidpartptr != NULL)
{
if(ispartof(filteressidpartlen, (uint8_t*)filteressidpartptr, zeiger->essidlen, zeiger->essid) == false) return;
}
if(filteressidregexptr != NULL)
{
strncpy(essid, (char *) zeiger->essid, zeiger->essidlen);
essid[zeiger->essidlen] = '\0';
if(regexec(&essidregex, essid, 0, NULL, 0) == REG_NOMATCH) return;
}
if((filtervendorptr != NULL) || (filtervendorapptr != NULL) || (filtervendorclientptr != NULL))
{
if(isoui(zeiger->ap, zeiger->client) == false) return;
Expand Down Expand Up @@ -2359,6 +2401,7 @@ fprintf(stdout, "%s %s (C) %s ZeroBeat\n"
"--essid-partx=<part of ESSID>: filter by part of ESSID (case insensitive)\n"
" locale and wide characters are ignored\n"
"--essid-list=<file> : filter by ESSID file\n"
"--essid-regex=<regex> : filter ESSID by regular expression\n"
"--mac-ap=<MAC> : filter AP by MAC\n"
" format: 001122334455, 00:11:22:33:44:55, 00-11-22-33-44-55 (hex)\n"
"--mac-client=<MAC> : filter CLIENT by MAC\n"
Expand Down Expand Up @@ -2480,6 +2523,7 @@ static const struct option long_options[] =
{"essid-part", required_argument, NULL, HCX_FILTER_ESSID_PART},
{"essid-partx", required_argument, NULL, HCX_FILTER_ESSID_PARTX},
{"essid-list", required_argument, NULL, HCX_FILTER_ESSID_LIST_IN},
{"essid-regex", required_argument, NULL, HCX_FILTER_ESSID_REGEX},
{"mac-ap", required_argument, NULL, HCX_FILTER_MAC_AP},
{"mac-client", required_argument, NULL, HCX_FILTER_MAC_CLIENT},
{"mac-list", required_argument, NULL, HCX_FILTER_MAC_LIST_IN},
Expand Down Expand Up @@ -2542,6 +2586,7 @@ macinstring = NULL;
pmkinstring = NULL;
filteressidptr = NULL;
filteressidpartptr = NULL;
filteressidregexptr = NULL;
filtervendorptr = NULL;
filtervendorapptr = NULL;
filtervendorclientptr = NULL;
Expand Down Expand Up @@ -2700,6 +2745,16 @@ while((auswahl = getopt_long (argc, argv, short_options, long_options, &index))
essidinname = optarg;
break;

case HCX_FILTER_ESSID_REGEX:
filteressidregexptr = optarg;
p1 = regcomp(&essidregex, filteressidregexptr, REG_EXTENDED);
if(p1)
{
fprintf(stderr, "Could not compile regex\n");
exit(EXIT_FAILURE);
}
break;

case HCX_HASH_MIN:
lcmin = strtol(optarg, NULL, 10);
break;
Expand Down
37 changes: 19 additions & 18 deletions include/hcxhashtool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,25 @@
#define HCX_FILTER_ESSID 21
#define HCX_FILTER_ESSID_PART 22
#define HCX_FILTER_ESSID_PARTX 23
#define HCX_FILTER_RC 24
#define HCX_FILTER_RC_NOT 25
#define HCX_FILTER_M12 26
#define HCX_FILTER_M1234 27
#define HCX_FILTER_M1M2ROGUE 28
#define HCX_PSK 29
#define HCX_PMK 30
#define HCX_VENDOR_OUT 31
#define HCX_INFO_OUT 32
#define HCX_INFO_VENDOR_OUT 33
#define HCX_INFO_VENDOR_AP_OUT 34
#define HCX_INFO_VENDOR_CLIENT_OUT 35
#define HCX_HCCAPX_IN 36
#define HCX_HCCAPX_OUT 37
#define HCX_HCCAP_IN 38
#define HCX_HCCAP_OUT 39
#define HCX_HCCAP_SINGLE_OUT 40
#define HCX_JOHN_OUT 41
#define HCX_FILTER_ESSID_REGEX 24
#define HCX_FILTER_RC 25
#define HCX_FILTER_RC_NOT 26
#define HCX_FILTER_M12 27
#define HCX_FILTER_M1234 28
#define HCX_FILTER_M1M2ROGUE 29
#define HCX_PSK 30
#define HCX_PMK 31
#define HCX_VENDOR_OUT 32
#define HCX_INFO_OUT 33
#define HCX_INFO_VENDOR_OUT 34
#define HCX_INFO_VENDOR_AP_OUT 35
#define HCX_INFO_VENDOR_CLIENT_OUT 36
#define HCX_HCCAPX_IN 37
#define HCX_HCCAPX_OUT 38
#define HCX_HCCAP_IN 39
#define HCX_HCCAP_OUT 40
#define HCX_HCCAP_SINGLE_OUT 41
#define HCX_JOHN_OUT 42
#define HCX_PMKIDEAPOL_IN 'i'
#define HCX_PMKIDEAPOL_OUT 'o'
#define HCX_ESSID_OUT 'E'
Expand Down
Loading