Commit graph

20548 commits

Author SHA1 Message Date
Iceman
53b2dc7d4b
Merge pull request #2927 from Antiklesys/master
Some checks are pending
CodeQL / Analyze (push) Waiting to run
MacOS Build and Test / macos-make (push) Waiting to run
MacOS Build and Test / macos-make-btaddon (push) Waiting to run
MacOS Build and Test / macos-cmake (push) Waiting to run
Ubuntu Build and Test / ubuntu-make (push) Waiting to run
Ubuntu Build and Test / ubuntu-make-btaddon (push) Waiting to run
Ubuntu Build and Test / ubuntu-cmake (push) Waiting to run
Windows Build and Test / proxspace (push) Waiting to run
Windows Build and Test / wsl (push) Waiting to run
Updated hf iclass wrbl replay
2025-07-05 19:34:32 +02:00
Antiklesys
75c3ce61dd Update iclass.c
Fixed correctly, in the previous fix I'm checking the length of the mac, but the mac is always 4 0 bytes (set from client side as part of the variable size) and the only actual check happens on client side. I'll have to check for the mac value to be != from 00000000
2025-07-05 19:35:41 +08:00
Antiklesys
33c3988a94 Fix broken older functionality
Updated to still maintain older functionality when the macs field is passed
2025-07-05 19:26:22 +08:00
Iceman
594f127adf
Merge pull request #2928 from ry4000/master
Some checks are pending
CodeQL / Analyze (push) Waiting to run
MacOS Build and Test / macos-make (push) Waiting to run
MacOS Build and Test / macos-make-btaddon (push) Waiting to run
MacOS Build and Test / macos-cmake (push) Waiting to run
Ubuntu Build and Test / ubuntu-make (push) Waiting to run
Ubuntu Build and Test / ubuntu-make-btaddon (push) Waiting to run
Ubuntu Build and Test / ubuntu-cmake (push) Waiting to run
Windows Build and Test / proxspace (push) Waiting to run
Windows Build and Test / wsl (push) Waiting to run
R&Y: Added `GEG Connect` to `aid_desfire.json`
2025-07-05 12:20:51 +02:00
ry4000
66b7e27dec
R&Y: Re-Ordered aid_desfire.json
### Updated
- GEG Connect Card to in between SEA ORCA and ITSO AIDs

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
2025-07-05 15:40:59 +10:00
ry4000
fa2d52205b
R&Y: Added GEG Connect to aid_desfire.json
### Added
- GEG Connect Card (F21400)

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
2025-07-05 15:39:12 +10:00
Antiklesys
7ad3f6eaf2 Updated hf iclass wrbl replay
replay behavior to use privilege escalation instead of having to generate specific block/content macs for hf iclass wrbl
2025-07-05 13:25:18 +08:00
Iceman
baf22054f8
Merge pull request #2926 from Antiklesys/master
Some checks are pending
CodeQL / Analyze (push) Waiting to run
MacOS Build and Test / macos-make (push) Waiting to run
MacOS Build and Test / macos-make-btaddon (push) Waiting to run
MacOS Build and Test / macos-cmake (push) Waiting to run
Ubuntu Build and Test / ubuntu-make (push) Waiting to run
Ubuntu Build and Test / ubuntu-make-btaddon (push) Waiting to run
Ubuntu Build and Test / ubuntu-cmake (push) Waiting to run
Windows Build and Test / proxspace (push) Waiting to run
Windows Build and Test / wsl (push) Waiting to run
Fixing style fix
2025-07-04 12:38:19 +02:00
Antiklesys
f5e61410c6 Fixing style fix
Fixing 24d80f51a9 where an AND was switched to an OR
2025-07-04 18:37:46 +08:00
iceman1001
24d80f51a9 style 2025-07-04 12:22:09 +02:00
Iceman
03a3abfc64
Merge pull request #2925 from Antiklesys/master
Updated iclass restore to support replay via privilege escalation
2025-07-04 11:57:24 +02:00
Antiklesys
f5820999b4
Update iclass.c
Signed-off-by: Antiklesys <syselkitna@gmail.com>
2025-07-04 17:52:43 +08:00
Antiklesys
8e4b9b46a0
Update iclass.c
Signed-off-by: Antiklesys <syselkitna@gmail.com>
2025-07-04 17:48:23 +08:00
Antiklesys
649de11a9a
Update iclass.c
Signed-off-by: Antiklesys <syselkitna@gmail.com>
2025-07-04 17:28:01 +08:00
Antiklesys
f8bd0b4bae Updated iclass restore to support privilege escalation
Updated hf iclass restore to support privilege escalation to restore card's content using a single AA1 --nr mac value. This allows to write cards the debit key is not known.
2025-07-04 16:47:11 +08:00
Iceman
875ceab8a7
Merge pull request #2924 from 0x6r1an0y/master
Some checks are pending
CodeQL / Analyze (push) Waiting to run
MacOS Build and Test / macos-make (push) Waiting to run
MacOS Build and Test / macos-make-btaddon (push) Waiting to run
MacOS Build and Test / macos-cmake (push) Waiting to run
Ubuntu Build and Test / ubuntu-make (push) Waiting to run
Ubuntu Build and Test / ubuntu-make-btaddon (push) Waiting to run
Ubuntu Build and Test / ubuntu-cmake (push) Waiting to run
Windows Build and Test / proxspace (push) Waiting to run
Windows Build and Test / wsl (push) Waiting to run
Fix: Follow-up fix for PR #2923 (issue #2922)
2025-07-03 22:24:53 +02:00
火山大隊長
02a4594a1b
fix: reset card state
reset card state after gen2 detection in ATS based magic identification

Signed-off-by: 火山大隊長 <brian20020925@gmail.com>
2025-07-04 02:35:10 +08:00
Iceman
d39b32997f
Merge pull request #2923 from 0x6r1an0y/main
Some checks are pending
CodeQL / Analyze (push) Waiting to run
MacOS Build and Test / macos-make (push) Waiting to run
MacOS Build and Test / macos-make-btaddon (push) Waiting to run
MacOS Build and Test / macos-cmake (push) Waiting to run
Ubuntu Build and Test / ubuntu-make (push) Waiting to run
Ubuntu Build and Test / ubuntu-make-btaddon (push) Waiting to run
Ubuntu Build and Test / ubuntu-cmake (push) Waiting to run
Windows Build and Test / proxspace (push) Waiting to run
Windows Build and Test / wsl (push) Waiting to run
Fix: magic detection for SAK=0x00 cards by forcing RATS
2025-07-03 08:18:31 +02:00
火山大隊長
ea2796dc6c Fix: magic detection for SAK=0x00 cards by forcing RATS 2025-07-03 05:09:54 +08:00
iceman1001
7373c38388 hf 15 dump had an logic bug when reading the sysinfo response. It is always fixed size but the logic for handling the Information byte flags made it skip bytes when it wasnt 0x0F
Some checks are pending
CodeQL / Analyze (push) Waiting to run
MacOS Build and Test / macos-make (push) Waiting to run
MacOS Build and Test / macos-make-btaddon (push) Waiting to run
MacOS Build and Test / macos-cmake (push) Waiting to run
Ubuntu Build and Test / ubuntu-make (push) Waiting to run
Ubuntu Build and Test / ubuntu-make-btaddon (push) Waiting to run
Ubuntu Build and Test / ubuntu-cmake (push) Waiting to run
Windows Build and Test / proxspace (push) Waiting to run
Windows Build and Test / wsl (push) Waiting to run
2025-07-02 22:05:12 +02:00
Iceman
dab49248b4
Merge pull request #2921 from Antiklesys/master
Some checks are pending
CodeQL / Analyze (push) Waiting to run
MacOS Build and Test / macos-make (push) Waiting to run
MacOS Build and Test / macos-make-btaddon (push) Waiting to run
MacOS Build and Test / macos-cmake (push) Waiting to run
Ubuntu Build and Test / ubuntu-make (push) Waiting to run
Ubuntu Build and Test / ubuntu-make-btaddon (push) Waiting to run
Ubuntu Build and Test / ubuntu-cmake (push) Waiting to run
Windows Build and Test / proxspace (push) Waiting to run
Windows Build and Test / wsl (push) Waiting to run
Added sc flag detection in sam response
2025-07-01 20:17:51 +02:00
Antiklesys
0662c1a9c1 Detecting response sc flag in sam response
Added detection for Secure Channel Flag in Sam's response.
2025-07-01 23:53:54 +08:00
iceman1001
a440fbabda make clean - now removes all __pycache__ folders sprinkled all over the project when running some of the dedicated python scripts
Some checks are pending
CodeQL / Analyze (push) Waiting to run
MacOS Build and Test / macos-make (push) Waiting to run
MacOS Build and Test / macos-make-btaddon (push) Waiting to run
MacOS Build and Test / macos-cmake (push) Waiting to run
Ubuntu Build and Test / ubuntu-make (push) Waiting to run
Ubuntu Build and Test / ubuntu-make-btaddon (push) Waiting to run
Ubuntu Build and Test / ubuntu-cmake (push) Waiting to run
Windows Build and Test / proxspace (push) Waiting to run
Windows Build and Test / wsl (push) Waiting to run
2025-07-01 16:47:20 +02:00
iceman1001
630708c3eb support function 2025-07-01 16:45:55 +02:00
iceman1001
21bae5c73f fix hf 15 readmulti - wrong block count number. It is decreased before to be zero based, but in calc we need number of blocks 2025-07-01 16:45:18 +02:00
iceman1001
95814cc5b8 text 2025-07-01 16:43:42 +02:00
iceman1001
4268fe3ce1 text
Some checks are pending
CodeQL / Analyze (push) Waiting to run
MacOS Build and Test / macos-make (push) Waiting to run
MacOS Build and Test / macos-make-btaddon (push) Waiting to run
MacOS Build and Test / macos-cmake (push) Waiting to run
Ubuntu Build and Test / ubuntu-make (push) Waiting to run
Ubuntu Build and Test / ubuntu-make-btaddon (push) Waiting to run
Ubuntu Build and Test / ubuntu-cmake (push) Waiting to run
Windows Build and Test / proxspace (push) Waiting to run
Windows Build and Test / wsl (push) Waiting to run
2025-06-30 14:29:49 +02:00
iceman1001
7e2aa07b27 revamped 2025-06-30 14:29:24 +02:00
iceman1001
16cbb4a446 style 2025-06-30 14:28:24 +02:00
iceman1001
5b37fe8af6 hf mf info - dont try fudan cards
Some checks are pending
CodeQL / Analyze (push) Waiting to run
MacOS Build and Test / macos-cmake (push) Waiting to run
MacOS Build and Test / macos-make (push) Waiting to run
MacOS Build and Test / macos-make-btaddon (push) Waiting to run
Ubuntu Build and Test / ubuntu-make (push) Waiting to run
Ubuntu Build and Test / ubuntu-make-btaddon (push) Waiting to run
Ubuntu Build and Test / ubuntu-cmake (push) Waiting to run
Windows Build and Test / proxspace (push) Waiting to run
Windows Build and Test / wsl (push) Waiting to run
2025-06-29 23:38:33 +02:00
Iceman
fbdc85d6ad
Merge pull request #2916 from Antiklesys/master
Sam firmware output in decimal and unhash to detect AES key format
2025-06-29 22:46:33 +02:00
Iceman
c63c62167e
Merge pull request #2918 from gentilkiwi/patch-1
[st25tb] Update intertic.py to support Colmar (Trace / Keolis) ID
2025-06-29 22:44:48 +02:00
Iceman
22b46a4923
Merge pull request #2917 from jmichelp/master
Fix command line parsing in hf15
2025-06-29 22:44:30 +02:00
Benjamin DELPY
a33ea4dc6e
[st25tb] Update intertic.py to support Colmar (Trace / Keolis) ID
Signed-off-by: Benjamin DELPY <benjamin@gentilkiwi.com>
2025-06-27 22:04:08 +02:00
Jean-Michel Picod
6c402791f1 Fix comma instead of semicolon 2025-06-27 12:04:27 +02:00
Jean-Michel Picod
3625ee318a Fix SEGV in cmdhf15 due to argtable size being miscomputed 2025-06-27 11:57:26 +02:00
Antiklesys
89465db4b1 Update hf iclass unhash to check lsb
Updated hf iclass unhash to check lsb to be 4x 0 and 4x 1.
If it doesn't respect that format it means it never went through hash0 (as hash0 forces the key format to have 4x LSB set to 1 and 4x LSB set to 0) and likely to be an AES based key.
2025-06-27 10:30:40 +08:00
Antiklesys
f94a2cb964 Updated sam firmware version to be in decimal digits
Updated sam firmware version to be in decimal digits
2025-06-27 09:55:58 +08:00
iceman1001
5de4dd68e5 text
Some checks failed
MacOS Build and Test / macos-make-btaddon (push) Has been cancelled
MacOS Build and Test / macos-cmake (push) Has been cancelled
Ubuntu Build and Test / ubuntu-make (push) Has been cancelled
Ubuntu Build and Test / ubuntu-make-btaddon (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
MacOS Build and Test / macos-make (push) Has been cancelled
Ubuntu Build and Test / ubuntu-cmake (push) Has been cancelled
Windows Build and Test / proxspace (push) Has been cancelled
Windows Build and Test / wsl (push) Has been cancelled
2025-06-22 20:34:54 +02:00
iceman1001
488f7aa01e clear a warning for potential use of uninitialized variable 2025-06-22 17:36:40 +02:00
iceman1001
883415fc99 style 2025-06-22 17:36:39 +02:00
Iceman
091c539a8d
Merge pull request #2915 from TeCHiScy/patch-2
fix parity bit in Sie36 format unpack
2025-06-22 17:02:22 +02:00
TeCHiScy
217edd1e74
fix parity bit in Sie36 unpack
Signed-off-by: TeCHiScy <741195+TeCHiScy@users.noreply.github.com>
2025-06-22 21:41:07 +08:00
Iceman
ba14a611e0
Merge pull request #2914 from TeCHiScy/patch-1
fix card limits for S12906 format
2025-06-22 14:47:34 +02:00
TeCHiScy
f9bce6e21b
fix card limits for S12906 format
As the S12906 [pack function]( 61a993de82/client/src/wiegand_formats.c (L684)) suggests, the issue level takes 2 bits, thus ranging from 0 to 3. The card number takes 24 bits, ranging from 0 to 0xffffff. That shows an inconsistent with the limits defined in the format table. Reference from https://acre.my.site.com/knowledgearticles/s/article/x107 also confirms the CN should be ranging from 0 to 0xffffff. So I propose to fix the limits of S12906 format.

Signed-off-by: TeCHiScy <741195+TeCHiScy@users.noreply.github.com>
2025-06-22 18:23:42 +08:00
Iceman
61a993de82
Merge pull request #2913 from Antiklesys/master
Some checks failed
Ubuntu Build and Test / ubuntu-make-btaddon (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
MacOS Build and Test / macos-make (push) Has been cancelled
MacOS Build and Test / macos-make-btaddon (push) Has been cancelled
MacOS Build and Test / macos-cmake (push) Has been cancelled
Ubuntu Build and Test / ubuntu-make (push) Has been cancelled
Ubuntu Build and Test / ubuntu-cmake (push) Has been cancelled
Windows Build and Test / proxspace (push) Has been cancelled
Windows Build and Test / wsl (push) Has been cancelled
Renaming and snmp data format option for sam comms
2025-06-20 11:27:58 +02:00
Antiklesys
43943ce9a5
Update cmdhficlass.c
Signed-off-by: Antiklesys <syselkitna@gmail.com>
2025-06-20 17:22:14 +08:00
Antiklesys
c729c88f1d Renaming and snmp data format option for sam comms
Added ability to pass data to sam directly in snmp format and for the client to calculate the packet headers accordingly.
Renamed ack_mask to ok_mask as that is a generic mask for successful commands, the same bytes are used for multiple types of successful responses.
2025-06-20 17:20:40 +08:00
Iceman
cfe9c39b89
Merge pull request #2912 from Antiklesys/master
Improved sam response parsing
2025-06-20 10:49:03 +02:00
Antiklesys
f5254880b9
Update cmdhficlass.c
Improved code comments

Signed-off-by: Antiklesys <syselkitna@gmail.com>
2025-06-20 12:34:16 +08:00