rfidrig/ChameleonUltra
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/ChameleonUltra.git synced 2026-09-11 18:30:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #426 from azuwis/fix-autopwn-hardnested

Browse Source 
fix: fall back to hardnested in autopwn when nested fails
This commit is contained in:
GameTec-live
2026-09-10 08:46:37 +02:00
committed by GitHub
parent 66a36881cf f39de047be
commit ccf60753f9
1 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
software/script/chameleon_cli_unit.py
+29 -6
View File
@@ -2641,6 +2641,7 @@ class HFMFAutopwn(ReaderRequiredUnit):
nested = HFMFNested.__new__(HFMFNested) nested = HFMFNested.__new__(HFMFNested)
BaseCLIUnit.__init__(nested) BaseCLIUnit.__init__(nested)
nested._device_cmd = self.cmd nested._device_cmd = self.cmd
hardnested = None
for missing_key_num, key_type_target in missing_keys.items(): for missing_key_num, key_type_target in missing_keys.items():
if current_keys_found.get(missing_key_num) is not None: if current_keys_found.get(missing_key_num) is not None:
print(f" {CG}[+]{C0} Key {missing_key_num} found by reuse") print(f" {CG}[+]{C0} Key {missing_key_num} found by reuse")
@@ -2653,16 +2654,38 @@ class HFMFAutopwn(ReaderRequiredUnit):
key_type_target, key_type_target,
) )
if nested_key is None: if nested_key is None:
continue if hardnested is None:
print( hardnested = HFMFHardNested.__new__(HFMFHardNested)
f" {CG}[+]{C0} Found key {missing_key_num}: {nested_key.upper()}" BaseCLIUnit.__init__(hardnested)
) hardnested._device_cmd = self.cmd
current_keys_found[missing_key_num] = bytes.fromhex(nested_key) hn_key = hardnested.recover_key(
False,
block_known,
type_known,
key_known_bytes,
(missing_key_num // 2) * 4,
key_type_target,
False,
200,
3,
)
if hn_key is None:
continue
current_keys_found[missing_key_num] = bytes.fromhex(hn_key)
print(
f" {CG}[+]{C0} Found key {missing_key_num}: {hn_key.upper()}"
)
else:
print(
f" {CG}[+]{C0} Found key {missing_key_num}: {nested_key.upper()}"
)
current_keys_found[missing_key_num] = bytes.fromhex(nested_key)
current_keys_found = dict(sorted(current_keys_found.items())) current_keys_found = dict(sorted(current_keys_found.items()))
_, mask_bytes = self.mask_from_keys(missing_keys) _, mask_bytes = self.mask_from_keys(missing_keys)
new_key = current_keys_found[missing_key_num]
current_keys_found = self.merge_found_sector_keys( current_keys_found = self.merge_found_sector_keys(
current_keys_found, current_keys_found,
self.try_key(bytes.fromhex(nested_key), self.neg_bytes(mask_bytes)), self.try_key(new_key, self.neg_bytes(mask_bytes)),
) )
if len(current_keys_found) < total: if len(current_keys_found) < total:
current_keys_found = self.run_senested( current_keys_found = self.run_senested(