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.

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

Merged tested pull requests and added manufacturer/oui functionality #186

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
attack/pmkid: removed hashcat dependency for PMKID capture PR #159
simonblack committed Dec 14, 2018
commit 04b818de40e6fd14ea0828d01bc7b4752b2db412
1 change: 0 additions & 1 deletion wifite/attack/all.py
Original file line number Diff line number Diff line change
@@ -156,4 +156,3 @@ def user_wants_to_continue(cls, targets_remaining, attacks_remaining=0):
return False # Exit
else:
return True # Continue

17 changes: 10 additions & 7 deletions wifite/attack/pmkid.py
Original file line number Diff line number Diff line change
@@ -71,7 +71,6 @@ def run(self):
from ..util.process import Process
# Check that we have all hashcat programs
dependencies = [
Hashcat.dependency_name,
HcxDumpTool.dependency_name,
HcxPcapTool.dependency_name
]
@@ -97,12 +96,17 @@ def run(self):
return False # No hash found.

# Crack it.
try:
self.success = self.crack_pmkid_file(pmkid_file)
except KeyboardInterrupt:
Color.pl('\n{!} {R}Failed to crack PMKID: {O}Cracking interrupted by user{W}')
if Process.exists(Hashcat.dependency_name):
try:
self.success = self.crack_pmkid_file(pmkid_file)
except KeyboardInterrupt:
Color.pl('\n{!} {R}Failed to crack PMKID: {O}Cracking interrupted by user{W}')
self.success = False
return True
else:
self.success = False
return False
Color.pl('\n {O}[{R}!{O}] Note: PMKID attacks are not possible because you do not have {C}%s{O}.{W}'
% Hashcat.dependency_name)

return True # Even if we don't crack it, capturing a PMKID is 'successful'

@@ -216,4 +220,3 @@ def save_pmkid(self, pmkid_hash):
pmkid_handle.write('\n')

return pmkid_file