github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 05:13:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fm11rf08s script: optimize when default keys

Browse source
This commit is contained in:
Philippe Teuwen 2024-09-06 12:26:13 +02:00
commit 715f149413
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/pyscripts/fm11rf08s_recovery.py
View file

@ -171,7 +171,7 @@ for sec in range(NUM_SECTORS):
with (open(f"keys_{uid:08x}_{sec:02}_{nt[sec][key_type]}_filtered.dic")) as f: with (open(f"keys_{uid:08x}_{sec:02}_{nt[sec][key_type]}_filtered.dic")) as f:
while line := f.readline().rstrip(): while line := f.readline().rstrip():
keys_set.add(line) keys_set.add(line)
keys[sec][key_type] = keys_set keys[sec][key_type] = keys_set.copy()
duplicates.update(all_keys.intersection(keys_set)) duplicates.update(all_keys.intersection(keys_set))
all_keys.update(keys_set) all_keys.update(keys_set)
# Prioritize default keys # Prioritize default keys
@ -198,7 +198,7 @@ for sec in range(NUM_SECTORS):
with (open(f"keys_{uid:08x}_{sec:02}_{nt[sec][key_type]}.dic")) as f: with (open(f"keys_{uid:08x}_{sec:02}_{nt[sec][key_type]}.dic")) as f:
while line := f.readline().rstrip(): while line := f.readline().rstrip():
keys_set.add(line) keys_set.add(line)
keys[sec][key_type] = keys_set keys[sec][key_type] = keys_set.copy()
duplicates.update(all_keys.intersection(keys_set)) duplicates.update(all_keys.intersection(keys_set))
all_keys.update(keys_set) all_keys.update(keys_set)
# Prioritize default keys # Prioritize default keys
@ -219,9 +219,6 @@ for dup in duplicates:
for key_type in [0, 1]: for key_type in [0, 1]:
if dup in keys[sec][key_type]: if dup in keys[sec][key_type]:
keys_filtered[sec][key_type].add(dup) keys_filtered[sec][key_type].add(dup)
if nt[sec][0] == nt[sec][1] and key_type == 0 and keys[sec][1] == set() and found_keys[sec][1] == "":
keys_filtered[sec][1].add(dup)
continue
# Availability of duplicates dicts # Availability of duplicates dicts
duplicates_dicts = [[False, False] for _ in range(NUM_SECTORS)] duplicates_dicts = [[False, False] for _ in range(NUM_SECTORS)]
@ -233,7 +230,12 @@ for sec in range(NUM_SECTORS):
print("Saving duplicates dicts...") print("Saving duplicates dicts...")
first = False first = False
with (open(f"keys_{uid:08x}_{sec:02}_{nt[sec][key_type]}_duplicates.dic", "w")) as f: with (open(f"keys_{uid:08x}_{sec:02}_{nt[sec][key_type]}_duplicates.dic", "w")) as f:
for k in keys_filtered[sec][key_type]: keys_set = keys_filtered[sec][key_type].copy()
keys_def_set = DEFAULT_KEYS.intersection(keys_set)
keys_set.difference_update(DEFAULT_KEYS)
for k in keys_def_set:
f.write(f"{k}\n")
for k in keys_set:
f.write(f"{k}\n") f.write(f"{k}\n")
duplicates_dicts[sec][key_type] = True duplicates_dicts[sec][key_type] = True