Skip to content

Commit

Permalink
Merge pull request #158 from s0lst1c3/pmkid-fix-2
Browse files Browse the repository at this point in the history
Fixed Python3 unicode errors affecting PMKID attack
  • Loading branch information
s0lst1c3 authored Nov 27, 2020
2 parents 051bd66 + 84601d7 commit 00321a0
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
2 changes: 2 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
Resolve issue #59 by fixing Python3 unicode bullshit. - (Credit goes to github.com/MarkusKrell)

1.13.4 - Gabriel Ryan <[email protected]>
Resolve issue #59 by fixing Python3 unicode bullshit. :D

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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+_.

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion __version__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '1.13.3'
__version__ = '1.13.4'
__codename__ = 'Power Overwhelming'
__author__ = '@s0lst1c3'
__contact__ = 'gabriel<<at>>solstice(doT)sh'
Expand Down
4 changes: 3 additions & 1 deletion core/iw_parse/iw_parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
5 changes: 3 additions & 2 deletions eaphammer
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 00321a0

Please sign in to comment.