Commit graph

112 commits

Author SHA1 Message Date
douniwan5788
214ded2b97 Replace all μ(greek small letter mu, UTF-8 \xce\xbc) to µ(micro sign, UTF-8 \xc2\xb5) 2025-03-19 19:21:01 +08:00
douniwan5788
4bde83b89d Added lf hitag htu support for Hitag µ/8265 2025-03-19 18:56:23 +08:00
iceman1001
cef07dedf6 code style, code clean up of redundant functions, comments, its many minor fixes across the platform. Sorry for not making 20 commits 2025-02-21 15:38:33 +01:00
iceman1001
4c6e74c3ce revert 2025-02-18 19:47:51 +01:00
n-hutton
8dbe1c7b06 more 2025-01-21 23:52:33 +00:00
n-hutton
acb7de9d8d more cleanup noticed just now 2025-01-21 23:51:26 +00:00
n-hutton
3eb0238481 appears to work - using normal mifare sim init
working demo

works

seems to work so far

more cleanup and works

working copy

working, clean one more pass

cleanup continues

back in buisness babyyy

final cleanup before PR I hope
2025-01-21 23:39:25 +00:00
nvx
29e0c51393 Changed hf mf info - now differentiates between full USCUID and cut down ZUID chips 2025-01-14 22:36:59 +10:00
klks
df3916c7b6 Add annotations for FMCOS2.0 CPU Card
Adding annotations for the FMCOS 2.0 CPU Card that is used/sold in China.
2024-12-20 22:50:20 +08:00
nvx
6d7fcc642a add gdm flag to hf mf c* commands
this enables the use of hf mf c* commands with gdm/uscuid cards when the alt wake up mode 20(7)/23 is enabled rather than gen1 wake up
2024-11-02 22:22:13 +10:00
douniwan5788
252d6a29db fix: switch Hitag S UID REQUEST to HITAGS_UID_REQ_ADV1 for Hitag 1 compatibility 2024-10-15 13:35:47 +08:00
douniwan5788
75420482e4 refactor: Move Hitag 1 cmds to protocols.h 2024-08-24 02:15:28 +08:00
douniwan5788
c279f88f13 refactor: Move Hitag 2 cmds to protocols.h 2024-08-23 23:49:47 +08:00
douniwan5788
ad5a4134ec refactor: Move Hitag S cmds to protocols.h 2024-08-23 19:54:34 +08:00
douniwan5788
d15537bbf1 Unified hitag naming style 2024-08-22 02:01:43 +08:00
iceman1001
87c6633de1 add support for generation 2 magic command when setting UID on ISO15693 cards. ref:: https://github.com/RfidResearchGroup/proxmark3/issues/1604#issuecomment-2068444071 2024-04-22 09:04:01 +02:00
iceman1001
700d558432 move hitag2 crypto parts to the common folder in order to be able to use it on the client side. Some textual and minor adaptations across the bord 2024-03-27 09:32:00 +01:00
iceman1001
c66e781a9c annotation of the hitag2 protocol now properly identifies different parts without shifting of whole hex arrays. Took the idea from RFIdler (@adamLLaurie) where he treats it like a binary string instead. It works. Problem: We use whole bytes in our logging protocol and Hitag2 uses 5, 10, 32, 64 bits commands. START_AUTH is 11000, which as a MSB aligned byte is 0xC0. Now we shift it down to LSB centered and 11000 becomes 0x18. This reduces all issues with handing the rest of the array. \n\nTake note that our protocol uses whole bytes. I had to print out number of actually captured bits in the trace log now. Otherwise 65 or 71 bits would not look any different but will not work when used with other tools. This also means we abuse the logging protocol by using the parity byte arry to store number of "left over bits" in the par[0] position. 2024-03-26 15:04:39 +01:00
iceman1001
c4c1601446 added rudimentary functions for doing AES authentication against MIFARE UL AES tags. (wip) 2024-02-15 16:20:47 +01:00
iceman1001
81ce1fd4ab changed magic detection to use flags. Fixes previous problems with magic ntag, also renamed defines to seperate them better. 2024-02-02 15:53:57 +01:00
iceman1001
5de626992f extended read block and read block annotation. Adapt select_card to keep antenna on when dump/info 2024-01-26 22:09:37 +01:00
iceman1001
68d9fe3232 annotate xerox reads 2024-01-26 21:10:11 +01:00
iceman1001
d5b1ff013f annotate XEROX wup 2024-01-26 20:33:08 +01:00
iceman1001
98f64a4ca5 annotate XEROX a bit better 2024-01-26 20:26:43 +01:00
iceman1001
61573a014e fix decoding of info in view command and turning off at select card 2024-01-14 20:26:56 +01:00
iceman1001
a6c1d90ba8 forgot one 2024-01-01 21:40:48 +01:00
nvx
8f577ad963 Improved magic detection
Magic detection no longer stops when a single type is found as cards may support multiple types of magic, so all detected types will be reported now.
GDM/USCUID chips are now detected when GDM magic auth is disabled but magic WUP (40 or 20) is enabled.
Gen2/CUID/DirectWrite is now detected when default keys and ACLs are used by attempting to write to block 0 but aborting before actually completing the write.
2023-12-30 19:53:23 +10:00
iceman1001
0ff41fa652 style 2023-10-12 14:53:26 +02:00
iceman1001
7b3e84c0d6 better fix for the PAGEMAP issue 2023-10-09 15:14:53 +02:00
iceman1001
d41f0c394e hf iclass wrbl - the pagemap bit maps isnt the best to handle all four cases. This atleast fixes one issue with them 2023-10-09 15:04:49 +02:00
kormax
96eededb8c Remove duplicate MFP command definitions 2023-08-24 21:40:53 +03:00
iceman1001
5e9e7c6b90 added missing ISO14443a command WTX 2023-08-24 10:21:11 +02:00
kormax
d9d03aaf1f Add new DESFire command code
Update file formatting
2023-07-31 12:48:40 +03:00
DidierA
b314d1ef1c Add MIFARE Plus commands in trace list 2023-07-19 21:15:07 +02:00
nvx
edd8e36d80 Cleanup arm-side reader-mode mifare classic block read/write code. 2023-07-04 00:11:01 +10:00
iceman1001
5de6fa443c missing define for QL88 2023-06-28 15:11:48 +02:00
AloneLiberty
f3a3707c06
Merge branch 'master' into mf-supercard
Signed-off-by: AloneLiberty <111039319+AloneLiberty@users.noreply.github.com>
2023-03-26 14:58:33 +00:00
iceman1001
71ddee1386 added "hf mf gdmsetcfg" to write GDM configuration 2023-03-26 16:50:59 +02:00
AloneLiberty
d434eeae60 Supercard gen1/gen2 detection in MifareCIdent 2023-03-26 17:50:17 +03:00
iceman1001
97e16ba764 renamed gdm getblk to config since that is what it does 2023-03-26 03:41:12 +02:00
iceman1001
7b93de7a81 added GDM read configuration block 2023-03-25 15:00:58 +01:00
iceman1001
07f6162780 added support for the magic card called GDM. 2023-03-21 19:49:52 +01:00
Matthew Jackson
147475ab40 CHANGELOG.md and text changes 2023-02-20 02:07:07 -06:00
Matthew Jackson
3399cbd4f0 support for NTAG213TT tamper feature 2023-02-18 23:48:32 -06:00
iceman1001
875b1a0aed annotate new magic command (WIP) 2023-01-15 12:27:34 +01:00
Philippe Teuwen
c9984985fd make miscchecks 2023-01-14 22:23:40 +01:00
Philippe Teuwen
5d5d9d9be0 make style 2023-01-14 22:22:04 +01:00
iceman1001
e74a025a27 added some more ISO7816 error return codes, swapped to defines in 14a.c 2023-01-14 12:10:48 +01:00
iceman1001
fe63c503fd added some ISO7816 error code defines 2023-01-14 12:04:09 +01:00
DidierA
9a0427d4d2 Add Magic Gen4 GTU detection and symbols for Gen4 GTU protocol. 2022-11-25 10:13:33 +01:00