Python improvements, messaging improvements.
Small code changed as proposed in #128. This should close #128. Slowly moving towards Camel-case in script output.
This commit is contained in:
@@ -28,7 +28,7 @@ class Hashcat(Dependency):
|
||||
|
||||
key = None
|
||||
# Crack hccapx
|
||||
for additional_arg in [ [], ['--show']]:
|
||||
for additional_arg in ([], ['--show']):
|
||||
command = [
|
||||
'hashcat',
|
||||
'--quiet',
|
||||
@@ -65,7 +65,7 @@ class Hashcat(Dependency):
|
||||
|
||||
# Run hashcat once normally, then with --show if it failed
|
||||
# To catch cases where the password is already in the pot file.
|
||||
for additional_arg in [ [], ['--show']]:
|
||||
for additional_arg in ([], ['--show']):
|
||||
command = [
|
||||
'hashcat',
|
||||
'--quiet', # Only output the password if found.
|
||||
|
||||
@@ -443,7 +443,7 @@ executing pixiewps -e d0141b15656e96b85fcead2e8e76330d2b1ac1576bb026e7a328c0e1ba
|
||||
|
||||
(pin, psk, ssid) = Reaver.get_pin_psk_ssid(new_stdout)
|
||||
assert pin == '11867722', 'pin was "%s", should have been "11867722"' % pin
|
||||
assert psk == None, 'psk was "%s", should have been "None"' % psk
|
||||
assert psk is None, 'psk was "%s", should have been "None"' % psk
|
||||
assert ssid == 'belkin.00e', 'ssid was "%s", should have been "belkin.00e"' % repr(ssid)
|
||||
result = CrackResultWPS('AA:BB:CC:DD:EE:FF', ssid, pin, psk)
|
||||
result.dump()
|
||||
|
||||
Reference in New Issue
Block a user