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

Jump to bottom

Fixes for WPA2 handshake capture and new version of tshark #77

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixes for WPA2 handshake capture and new version of tshark #77

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7f3273
modified for new version of tshark
Und3rf10w Feb 12, 2016
a94f269
added pcapfix for wpa2 handshakes
Und3rf10w Feb 12, 2016
ab92c28
made pcapfix a requirement
Und3rf10w Feb 12, 2016
65dda8f
Fixed minor typo in comments
Und3rf10w Feb 12, 2016
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
16 changes: 15 additions & 1 deletion wifite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@ def initial_check(self):
print R + ' [!]' + O + ' please re-install reaver or install walsh/wash separately' + W

# Check handshake-checking apps
recs = ['tshark', 'pyrit', 'cowpatty']
recs = ['tshark', 'pyrit', 'cowpatty', 'pcapfix']
for rec in recs:
if program_exists(rec): continue
printed = True
Expand Down Expand Up @@ -2021,6 +2021,7 @@ def get_essid_from_cap(bssid, capfile):
cmd = ['tshark',
'-r', capfile,
'-R', 'wlan.fc.type_subtype == 0x05 && wlan.sa == %s' % bssid,
'-2',
'-n']
proc = Popen(cmd, stdout=PIPE, stderr=DN)
proc.wait()
Expand Down Expand Up @@ -2048,6 +2049,7 @@ def get_bssid_from_cap(essid, capfile):
cmd = ['tshark',
'-r', capfile,
'-R', 'wlan_mgt.ssid == "%s" && wlan.fc.type_subtype == 0x05' % (essid),
'-2',
'-n', # Do not resolve MAC vendor names
'-T', 'fields', # Only display certain fields
'-e', 'wlan.sa'] # souce MAC address
Expand All @@ -2059,6 +2061,7 @@ def get_bssid_from_cap(essid, capfile):
cmd = ['tshark',
'-r', capfile,
'-R', 'eapol',
'-2',
'-n']
proc = Popen(cmd, stdout=PIPE, stderr=DN)
proc.wait()
Expand Down Expand Up @@ -2255,6 +2258,15 @@ def wpa_get_handshake(self):
if not os.path.exists(self.RUN_CONFIG.temp + 'wpa-01.cap'): continue
copy(self.RUN_CONFIG.temp + 'wpa-01.cap', self.RUN_CONFIG.temp + 'wpa-01.cap.temp')

# Spawn pcapfix, if broken, fix wpa-01.cap.temp, rewrite fixed pcap to original location
if program_exists('pcapfix'):
cmd = ['pcapfix', self.RUN_CONFIG.temp + 'wpa-01.cap.temp']
proc = Popen(cmd, stdout=DN, stderr=DN)
proc.wait() # wait until pcapfix is complete
# Rename fixed pcap file only if it exists
if os.path.isfile(self.RUN_CONFIG.temp + 'fixed_wpa-01.cap.temp'):
rename(self.RUN_CONFIG.temp + 'fixed_wpa-01.cap.temp', self.RUN_CONFIG.temp + 'wpa-01.cap.temp')

# Save copy of cap file (for debugging)
#remove_file('/root/new/wpa-01.cap')
#copy(temp + 'wpa-01.cap', '/root/new/wpa-01.cap')
Expand Down Expand Up @@ -2341,6 +2353,7 @@ def has_handshake_tshark(self, target, capfile):
cmd = ['tshark',
'-r', capfile, # Input file
'-R', 'eapol', # Filter (only EAPOL packets)
'-2',
'-n'] # Do not resolve names (MAC vendors)
proc = Popen(cmd, stdout=PIPE, stderr=DN)
proc.wait()
Expand Down Expand Up @@ -2541,6 +2554,7 @@ def strip_handshake(self, capfile):
cmd = ['tshark',
'-r', capfile, # input file
'-R', 'eapol || wlan_mgt.tag.interpretation', # filter
'-2',
'-w', capfile + '.temp'] # output file
proc_strip = call(cmd, stdout=DN, stderr=DN)

Expand Down