mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2024-09-20 23:36:31 +08:00
fm11rf08s_recovery: no need to turn ANSI off anymore with the native output grabber
This commit is contained in:
parent
8b520de838
commit
f1ceff852e
|
@ -62,22 +62,14 @@ args = parser.parse_args()
|
||||||
start_time = time.time()
|
start_time = time.time()
|
||||||
p = pm3.pm3()
|
p = pm3.pm3()
|
||||||
|
|
||||||
restore_color = False
|
|
||||||
p.console("prefs get color")
|
|
||||||
p.console("prefs set color --off")
|
|
||||||
for line in p.grabbed_output.split('\n'):
|
|
||||||
if "ansi" in line:
|
|
||||||
restore_color = True
|
|
||||||
p.console("hf 14a read")
|
p.console("hf 14a read")
|
||||||
uid = None
|
uid = None
|
||||||
for line in p.grabbed_output.split('\n'):
|
if p.grabbed_output is not None:
|
||||||
if "UID:" in line:
|
for line in p.grabbed_output.split('\n'):
|
||||||
uid = int(line[10:].replace(' ', ''), 16)
|
if "UID:" in line:
|
||||||
|
uid = int(line[10:].replace(' ', ''), 16)
|
||||||
if uid is None:
|
if uid is None:
|
||||||
print("Card not found")
|
print("Card not found")
|
||||||
if restore_color:
|
|
||||||
p.console("prefs set color --ansi")
|
|
||||||
_ = p.grabbed_output
|
|
||||||
exit()
|
exit()
|
||||||
print("UID: " + color(f"{uid:08X}", fg="green"))
|
print("UID: " + color(f"{uid:08X}", fg="green"))
|
||||||
|
|
||||||
|
@ -136,9 +128,6 @@ for sec in range(NUM_SECTORS):
|
||||||
nt_enc[sec][key_type] == "" or
|
nt_enc[sec][key_type] == "" or
|
||||||
par_err[sec][key_type] == ""):
|
par_err[sec][key_type] == ""):
|
||||||
print("Error, could not collect nonces, abort")
|
print("Error, could not collect nonces, abort")
|
||||||
if restore_color:
|
|
||||||
p.console("prefs set color --ansi")
|
|
||||||
_ = p.grabbed_output
|
|
||||||
exit()
|
exit()
|
||||||
|
|
||||||
print("Running staticnested_1nt & 2x1nt when doable...")
|
print("Running staticnested_1nt & 2x1nt when doable...")
|
||||||
|
@ -330,9 +319,6 @@ for sec in range(NUM_SECTORS):
|
||||||
print_key(sec, key_type_target, found_keys[sec][key_type_target])
|
print_key(sec, key_type_target, found_keys[sec][key_type_target])
|
||||||
if abort:
|
if abort:
|
||||||
break
|
break
|
||||||
if restore_color:
|
|
||||||
p.console("prefs set color --ansi")
|
|
||||||
_ = p.grabbed_output
|
|
||||||
|
|
||||||
if abort:
|
if abort:
|
||||||
print("Brute-forcing phase aborted via keyboard!")
|
print("Brute-forcing phase aborted via keyboard!")
|
||||||
|
|
Loading…
Reference in a new issue