Commit Graph
12781 Commits
Author SHA1 Message Date
iceman1001 c25dbf8f21 forget the struct changes 2025-07-10 16:02:18 +02:00
iceman1001 c216fbeeaf preferences and mqtt commands now handles mqtt server/port/topic settings. if mqtt command is called w/o any mqtt and preference is set it takes prio 2025-07-10 14:10:53 +02:00
iceman1001 2597c7576e style 2025-07-10 11:52:39 +02:00
Iceman cb8bb8d520 Merge pull request #2931 from ry4000/master
R&Y: Updated `aid_desfire.json`
2025-07-09 13:31:15 +02:00
Def c39e18a014 fixes to mqtt (win sockets) 2025-07-09 14:19:00 +03:00
ry4000 ac6916777f Merge branch 'RfidResearchGroup:master' into master 2025-07-09 20:09:56 +10:00
ry4000 36f5a0c69b R&Y: Updated aid_desfire.json
Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
2025-07-09 20:09:40 +10:00
iceman1001 815d445382 fix mqtt receive on proxspace 2025-07-09 08:21:21 +02:00
iceman1001 931e93a11b Win32 socket vs POSIX sockets is not always happy together. Seperated the two to mimic the same behavior we have for /uart/. The code compiles but the socket doesnt work on Proxspace yet. More fixes to be done 2025-07-09 00:20:43 +02:00
iceman1001 fa59b9cb6b fix mqtt receive command default behaviour 2025-07-08 21:51:48 +02:00
iceman1001 a3c2d2b815 style 2025-07-08 21:15:09 +02:00
iceman1001 c7cf62fcf1 Added support for sending and receiving MQTT messages. It enables end user to quickly upload or share JSON files between them. Given the nature of MQTT, I also worked with @KevTheHermit who has proxdump.com site, where you can upload pm3 dump files and browse. He added support for MQTT uploads, so the process to share a file and it gets also uploaded to proxdump.com is very smooth. Feel free to improve this functionality with TLS etc. For now it looks quite promising. 2025-07-08 21:15:09 +02:00
ry4000 138039b232 R&Y: Removed Gallagher Alternative Endian in aid_desfire.json
### Updates
- Removed Alternative Endian
- AIDs previously designated as `(Alternative Endian)` are now correctly listed as Gallagher AIDs

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
2025-07-08 17:08:10 +10:00
ry4000 09bdb0c566 Merge branch 'RfidResearchGroup:master' into master 2025-07-08 17:03:41 +10:00
Lucifer Voeltner ed504a76ca Fix incorrect formula for calculating Saflok years 2025-07-08 00:15:43 +07:00
iceman1001 7717dfc04d text 2025-07-06 20:12:13 +02:00
Iceman 53b2dc7d4b Merge pull request #2927 from Antiklesys/master
Updated hf iclass wrbl replay
2025-07-05 19:34:32 +02:00
ry4000 b27d3edb1a Update aid_desfire.json
Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
2025-07-05 23:59:19 +10: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
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
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
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 2025-07-02 22:05:12 +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 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 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
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
iceman1001 5de4dd68e5 text 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
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
TeCHiScy f9bce6e21b fix card limits for S12906 format
As the S12906 [pack function]( https://github.com/RfidResearchGroup/proxmark3/blob/61a993de826335db2d92d1f60c3ef4ae64439b73/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
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
Antiklesys f5254880b9 Update cmdhficlass.c
Improved code comments

Signed-off-by: Antiklesys <syselkitna@gmail.com>
2025-06-20 12:34:16 +08:00
Antiklesys c504d43398 Update cmdhficlass.c
Signed-off-by: Antiklesys <syselkitna@gmail.com>
2025-06-20 12:32:14 +08:00
Antiklesys e0b1b5b4f8 Update cmdhficlass.c
Fixed indent

Signed-off-by: Antiklesys <syselkitna@gmail.com>
2025-06-20 12:02:25 +08:00
Antiklesys 67fbd6abba Update cmdhficlass.c
Signed-off-by: Antiklesys <syselkitna@gmail.com>
2025-06-20 12:00:41 +08:00
Antiklesys 37166d6c73 Improved sam response processing
Improved sam response processing on client side, it detects when the response contains an error and highlights the error number, detects when the response is an snmp messages and does the asn.1 decoding of the snmp message.
2025-06-20 11:58:32 +08:00
iceman1001 47648c541c text 2025-06-19 20:26:13 +02:00
iceman1001 570b1fcc40 EBUSY error code is 16 2025-06-19 17:50:19 +02:00