diff --git a/wifite/attack/wpa.py b/wifite/attack/wpa.py index 2e982ea..13d6651 100755 --- a/wifite/attack/wpa.py +++ b/wifite/attack/wpa.py @@ -61,11 +61,11 @@ class AttackWPA(Attack): self.success = False return False - Color.pl('\n{+} {C}Cracking WPA Handshake:{W} Using {C}aircrack-ng{W} via' + + Color.pl('\n{+} {C}Cracking WPA Handshake:{W} Running {C}aircrack-ng{W} with' + ' {C}%s{W} wordlist' % os.path.split(Configuration.wordlist)[-1]) # Crack it - key = Aircrack.crack_handshake(handshake, Configuration.wordlist) + key = Aircrack.crack_handshake(handshake, show_command=False) if key is None: Color.pl('{!} {R}Failed to crack handshake: {O}%s{R} did not contain password{W}' % Configuration.wordlist.split(os.sep)[-1]) self.success = False diff --git a/wifite/tools/cowpatty.py b/wifite/tools/cowpatty.py index 144c48e..10be126 100644 --- a/wifite/tools/cowpatty.py +++ b/wifite/tools/cowpatty.py @@ -28,7 +28,7 @@ class Cowpatty(Dependency): '-s', handshake.essid ] if show_command: - Color.pl('{+} {D}{C}Running %s{W}' % ' '.join(command)) + Color.pl('{+} {D}Running: {W}{P}%s{W}' % ' '.join(command)) process = Process(command) stdout, stderr = process.get_output() diff --git a/wifite/tools/hashcat.py b/wifite/tools/hashcat.py index 0e01a3d..cb58c3e 100755 --- a/wifite/tools/hashcat.py +++ b/wifite/tools/hashcat.py @@ -40,7 +40,7 @@ class Hashcat(Dependency): command.append('--force') command.extend(additional_arg) if show_command: - Color.pl('{+} {D}{C}Running %s{W}' % ' '.join(command)) + Color.pl('{+} {D}Running: {W}{P}%s{W}' % ' '.join(command)) process = Process(command) stdout, stderr = process.get_output() if ':' not in stdout: @@ -150,7 +150,7 @@ class HcxPcapTool(Dependency): ] if show_command: - Color.pl('{+} {D}{C}Running %s{W}' % ' '.join(command)) + Color.pl('{+} {D}Running: {W}{P}%s{W}' % ' '.join(command)) process = Process(command) stdout, stderr = process.get_output() @@ -173,7 +173,7 @@ class HcxPcapTool(Dependency): ] if show_command: - Color.pl('{+} {D}{C}Running %s{W}' % ' '.join(command)) + Color.pl('{+} {D}Running: {W}{P}%s{W}' % ' '.join(command)) process = Process(command) stdout, stderr = process.get_output() diff --git a/wifite/tools/john.py b/wifite/tools/john.py index 2fcdc96..fb56119 100644 --- a/wifite/tools/john.py +++ b/wifite/tools/john.py @@ -33,20 +33,20 @@ class John(Dependency): # Crack john file command = [ 'john', - '--format', john_format, + '--format=%s' % john_format, '--wordlist', Configuration.wordlist, john_file ] if show_command: - Color.pl('{+} {D}{C}Running %s{W}' % ' '.join(command)) + Color.pl('{+} {D}Running: {W}{P}%s{W}' % ' '.join(command)) process = Process(command) process.wait() # Run again with --show to consistently get the password command = ['john', '--show', john_file] if show_command: - Color.pl('{+} {D}{C}Running %s{W}' % ' '.join(command)) + Color.pl('{+} {D}Running: {W}{P}%s{W}' % ' '.join(command)) process = Process(command) stdout, stderr = process.get_output() diff --git a/wifite/util/crack.py b/wifite/util/crack.py index de25220..5a5b6a0 100755 --- a/wifite/util/crack.py +++ b/wifite/util/crack.py @@ -53,6 +53,7 @@ class CrackHelper: return hs_to_crack = cls.get_user_selection(handshakes) + any_pmkid = any([hs['type'] == 'PMKID' for hs in hs_to_crack]) # Tools for cracking & their dependencies. available_tools = { @@ -84,6 +85,8 @@ class CrackHelper: if tool_name not in available_tools: Color.pl('{!} {R}"%s"{O} tool not found, defaulting to {C}aircrack{W}' % tool_name) tool_name = 'aircrack' + elif any_pmkid and tool_name != 'hashcat': + Color.pl('{!} {O}Note: PMKID hashes will be cracked using {C}hashcat{W}') try: for hs in hs_to_crack: @@ -251,9 +254,6 @@ class CrackHelper: @classmethod def crack_pmkid(cls, hs, tool_name): - if tool_name != 'hashcat': - Color.pl('{!} {O}Note: PMKIDs can only be cracked using hashcat{W}') - key = Hashcat.crack_pmkid(hs['filename'], verbose=True) if key is not None: