rfidrig/ChameleonUltra
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/ChameleonUltra.git synced 2026-05-12 11:22:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #275 from unkernet/python_39

Browse Source 
Restore Python 3.9 compatibility for Chameleon CLI
This commit is contained in:
GameTec-live
2025-08-13 21:59:32 +02:00
committed by GitHub
parent e12a116dea 89e098c773
commit 27e7d504c6
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
software/script/chameleon_cli_unit.py
+1 -1
View File
@@ -420,7 +420,7 @@ class LFHIDIdArgsUnit(DeviceRequiredUnit):
return parser
@staticmethod
def check_limits(format: int, fc: int | None, cn: int | None, il: int | None, oem: int | None):
def check_limits(format: int, fc: Union[int, None], cn: Union[int, None], il: Union[int, None], oem: Union[int, None]):
limits = {
HIDFormat.H10301: [0xFF, 0xFFFF, 0, 0],
HIDFormat.IND26: [0xFFF, 0xFFF, 0, 0],
software/script/chameleon_cmd.py
+2 -2
View File
@@ -409,7 +409,7 @@ class ChameleonCMD:
resp.parsed['nts']['a'].append(
{
'nt': reconstruct_full_nt(resp.data, i),
'nt_enc': int.from_bytes(resp.data[i + 3: i + 7]),
'nt_enc': int.from_bytes(resp.data[i + 3: i + 7], byteorder='big'),
'parity': parity_to_str(resp.data[i + 2])
}
)
@@ -417,7 +417,7 @@ class ChameleonCMD:
resp.parsed['nts']['b'].append(
{
'nt': reconstruct_full_nt(resp.data, i + 7),
'nt_enc': int.from_bytes(resp.data[i + 10: i + 14]),
'nt_enc': int.from_bytes(resp.data[i + 10: i + 14], byteorder='big'),
'parity': parity_to_str(resp.data[i + 9])
}
)
software/script/chameleon_utils.py
+1 -1
View File
@@ -164,7 +164,7 @@ def prng_successor(x, n):
def reconstruct_full_nt(response_data, offset):
nt = int.from_bytes(response_data[offset: offset + 2])
nt = int.from_bytes(response_data[offset: offset + 2], byteorder='big')
return (nt << 16) | prng_successor(nt, 16)
software/script/tests/test_hard_acquire.py
+2 -2
View File
@@ -69,8 +69,8 @@ def test_hardnested_acquire():
while data_check_index < len(acquire_datas):
# Memory Layout: nt_enc1(4byte) - nt_enc2(4byte) - par(1byte)...
# To integer
nt_enc1 = int.from_bytes(acquire_datas[data_check_index + 0: data_check_index + 0 + 4])
nt_enc2 = int.from_bytes(acquire_datas[data_check_index + 4: data_check_index + 4 + 4])
nt_enc1 = int.from_bytes(acquire_datas[data_check_index + 0: data_check_index + 0 + 4], byteorder='big')
nt_enc2 = int.from_bytes(acquire_datas[data_check_index + 4: data_check_index + 4 + 4], byteorder='big')
par_enc = acquire_datas[data_check_index + 8]
# check unique and sum
hardnested_utils.check_nonce_unique_sum(nt_enc1, par_enc >> 4)