alexandre/wifite2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaning up handshake code

Browse Source
This commit is contained in:
derv82
2018-04-01 01:03:10 -04:00
parent 2cd6116a8c
commit 5db801b414
1 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
wifite/model/handshake.py
View File

@@ -119,17 +119,10 @@ class Handshake(object):
'''Prints analysis of handshake capfile''' '''Prints analysis of handshake capfile'''
self.divine_bssid_and_essid() self.divine_bssid_and_essid()
pairs = self.tshark_handshakes() Handshake.print_pairs(self.tshark_handshakes(), self.capfile, 'tshark')
Handshake.print_pairs(pairs, self.capfile, 'tshark') Handshake.print_pairs(self.pyrit_handshakes(), self.capfile, 'pyrit')
Handshake.print_pairs(self.cowpatty_handshakes(), self.capfile, 'cowpatty')
pairs = self.pyrit_handshakes() Handshake.print_pairs(self.aircrack_handshakes(), self.capfile, 'aircrack')
Handshake.print_pairs(pairs, self.capfile, 'pyrit')
pairs = self.cowpatty_handshakes()
Handshake.print_pairs(pairs, self.capfile, 'cowpatty')
pairs = self.aircrack_handshakes()
Handshake.print_pairs(pairs, self.capfile, 'aircrack')
def strip(self, outfile=None): def strip(self, outfile=None):
@@ -168,27 +161,21 @@ class Handshake(object):
Prints out BSSID and/or ESSID given a list of tuples (bssid,essid) Prints out BSSID and/or ESSID given a list of tuples (bssid,essid)
''' '''
tool_str = '' tool_str = ''
if tool: if tool is not None:
tool_str = '{C}%s{W}: ' % tool.rjust(8) tool_str = '{C}%s{W}: ' % tool.rjust(8)
if len(pairs) == 0: if len(pairs) == 0:
Color.pl("{!} %s.cap file {R}does not{O} contain a valid handshake{W}" Color.pl("{!} %s.cap file {R}does not{O} contain a valid handshake{W}" % (tool_str))
% (tool_str))
return return
for (bssid, essid) in pairs: for (bssid, essid) in pairs:
out_str = '{+} %s.cap file {G}contains a valid handshake{W} for' % tool_str
if bssid and essid: if bssid and essid:
Color.pl('{+} %s.cap file' % tool_str + Color.pl('%s {G}%s{W} ({G}%s{W})' % (out_str, bssid, essid))
' {G}contains a valid handshake{W}' +
' for {G}%s{W} ({G}%s{W})' % (bssid, essid))
elif bssid: elif bssid:
Color.pl('{+} %s.cap file' % tool_str + Color.pl('%s {G}%s{W}' % (out_str, bssid))
' {G}contains a valid handshake{W}' +
' for {G}%s{W}' % bssid)
elif essid: elif essid:
Color.pl('{+} %s.cap file' % tool_str + Color.pl('%s ({G}%s{W})' % (out_str, essid))
' {G}contains a valid handshake{W}' +
' for ({G}%s{W})' % essid)
if __name__ == '__main__': if __name__ == '__main__':