From 48f94c26cf08c0be779ed5e3a26cfaeb984f60cf Mon Sep 17 00:00:00 2001 From: s0lst1c3 Date: Thu, 26 Nov 2020 22:26:36 -0500 Subject: [PATCH 1/2] Fixed unicode weirdness that was causing PMKID attack to fail. --- core/iw_parse/iw_parse.py | 4 +++- eaphammer | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/iw_parse/iw_parse.py b/core/iw_parse/iw_parse.py index 4b5fcb0..daabb70 100644 --- a/core/iw_parse/iw_parse.py +++ b/core/iw_parse/iw_parse.py @@ -281,4 +281,6 @@ def get_interfaces(interface="wlan0"): @return dict properties: dictionary of iwlist attributes """ - return get_parsed_cells(call_iwlist(interface).split('\n')) + result = call_iwlist(interface).decode() + result = result.split('\n') + return get_parsed_cells(result) diff --git a/eaphammer b/eaphammer index 184a73a..473088e 100755 --- a/eaphammer +++ b/eaphammer @@ -931,13 +931,14 @@ def pmkid_attack(): print('[*] Creating filter file for target...') with open(hcxdumptool_filter, 'w') as fd: - fd.write('%s' % bssid.replace(':', '')) + fd.write('%s' % bssid.replace(':', '').lower()) print('[*] Complete!') print('[*] Running hcxdumptool...') + print('%s -i %s -c %d -o %s --filtermode=2 --filterlist=%s --enable_status=3' % (hcxdumptool, interface, channel, hcxdumptool_ofile, hcxdumptool_filter)) p = subprocess.Popen('%s -i %s -c %d -o %s --filtermode=2 --filterlist=%s --enable_status=3' % (hcxdumptool, interface, channel, hcxdumptool_ofile, hcxdumptool_filter), shell=True, stdout=subprocess.PIPE, preexec_fn=os.setsid) while True: - line = p.stdout.readline() + line = p.stdout.readline().decode() print(line, end=' ') if 'FOUND PMKID CLIENT-LESS]' in line: break From 84601d7a3ca8695d35a2b477a21b6bba8f21c2af Mon Sep 17 00:00:00 2001 From: s0lst1c3 Date: Thu, 26 Nov 2020 22:29:54 -0500 Subject: [PATCH 2/2] Changelog update and version bump. --- Changelog | 2 ++ README.md | 4 ++-- __version__.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index 79519c8..0bf6517 100644 --- a/Changelog +++ b/Changelog @@ -178,4 +178,6 @@ Resolve issue #142 by updating /src/ap/wpa_auth.c - (Credit goes to github.com/r 1.13.3 - Gabriel Ryan Resolve issue #59 by fixing Python3 unicode bullshit. - (Credit goes to github.com/MarkusKrell) +1.13.4 - Gabriel Ryan +Resolve issue #59 by fixing Python3 unicode bullshit. :D diff --git a/README.md b/README.md index 43104ec..43e4159 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ by Gabriel Ryan ([s0lst1c3](https://twitter.com/s0lst1c3))(gabriel[at]solstice|d [![Foo](https://rawcdn.githack.com/toolswatch/badges/8bd9be6dac2a1d445367001f2371176cc50a5707/arsenal/usa/2017.svg)](https://www.blackhat.com/us-17/arsenal.html#eaphammer) -Current release: [v1.13.3](https://github.com/s0lst1c3/eaphammer/releases/tag/v1.13.3) +Current release: [v1.13.4](https://github.com/s0lst1c3/eaphammer/releases/tag/v1.13.4) Supports _Python 3.5+_. @@ -79,7 +79,7 @@ Features - Fast and automated PMKID attacks against PSK networks using hcxtools - Password spraying across multiple usernames against a single ESSID -### New (as of Version 1.13.3)(latest): +### New (as of Version 1.13.4)(latest): EAPHammer now has a modular captive portal with keylogging and payload delivery capabilities, as well as an integrated website cloaner for easily creating portal modules. ### WPA/2-PSK handshake captures (added as for version 1.7.0) diff --git a/__version__.py b/__version__.py index a4b5c8a..9f09d6c 100644 --- a/__version__.py +++ b/__version__.py @@ -1,4 +1,4 @@ -__version__ = '1.13.3' +__version__ = '1.13.4' __codename__ = 'Power Overwhelming' __author__ = '@s0lst1c3' __contact__ = 'gabriel<>solstice(doT)sh'