dandri/proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-10-20 08:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,697 Commits 3 Branches 21 Tags
2ccfa187abd732b6a473c35c43158601d966e91f
Commit Graph
12292 Commits
Author SHA1 Message Date
Piotr Rzeszut 2ccfa187ab Remove unused definitions related to fixed-size SPI flash, improve comments for documentation 2024-12-29 22:19:32 +01:00
Iceman 7eaab824f5 Merge branch 'master' into move-keys-library-to-spiffs 
Signed-off-by: Iceman <iceman@iuse.se>
 2024-12-28 19:21:22 +01:00
Iceman 9e21f1b070 Merge branch 'master' into lf-em-410x-sim-default-help-imp 
Signed-off-by: Iceman <iceman@iuse.se>
 2024-12-28 19:19:46 +01:00
iceman1001 afcd57b1a1 identify MIFARE Duox 2024-12-28 19:18:27 +01:00
Piotr Rzeszut 69606aeb07 Changed lf em 410x sim to use default gap value of 0 and extended help, addressing #2197 2024-12-27 00:28:07 +01:00
Iceman 59751900f5 Merge branch 'master' into move-keys-library-to-spiffs 
Signed-off-by: Iceman <iceman@iuse.se>
 2024-12-26 21:16:51 +01:00
Iceman f36d8152c8 Merge branch 'master' into master 
Signed-off-by: Iceman <iceman@iuse.se>
 2024-12-26 21:15:14 +01:00
Piotr Rzeszut 4b5d532c9a Revert to strcpy instead of strcpy_s for compatibility. 2024-12-26 04:13:03 +01:00
Piotr Rzeszut 5ed4804044 Fix missing header file for strcpy_s 2024-12-26 04:10:10 +01:00
Piotr Rzeszut 470536f0fd Upload also iClass and T55XX keys to spiffs files 2024-12-26 02:10:49 +01:00
Piotr Rzeszut d9a3e4f050 Refactor keys in flash statistics to check for files 2024-12-26 01:11:46 +01:00
Piotr Rzeszut 3b9ba0ffe5 Increase timeout to about 1400s in hf mf fchk to be able to run much more than 2100 keys check 2024-12-26 00:16:21 +01:00
Piotr Rzeszut 9242d2f956 Increase timeout to about 1400s in hf mf fchk to be able to run much more than 2100 keys check 2024-12-25 23:51:54 +01:00
Piotr Rzeszut 5af815f271 Mifare dictionary uploaded to spiffs using legacy function 2024-12-25 21:08:44 +01:00
Philippe Teuwen 825dea27a0 hf mf isen: fix timeout when used over slow link (tcp/bt) 2024-12-24 23:56:13 +01:00
ry4000 b275895e21 R&Y: Added DAY RTA Tapp Card and Additional BKK BEM Stored Value Card AIDs to aid_desfire.json 
Added to `aid_desfire.json`
- DAY RTA Tapp Card AID
- Additional BKK BEM Stored Value Card AIDs

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-12-21 11:41:04 +11: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
Jonathan Lassoff cab81f4c91 Fix hf 15 view command examples 2024-12-18 11:26:53 +00:00
Philippe Teuwen 59ae5d2285 hf 15 info: show all type matches and check ST25TVxC signature 2024-12-15 20:54:28 +01:00
Philippe Teuwen be79654eb9 Add initial support for ST25TN and its signature verification 2024-12-15 17:14:41 +01:00
Philippe Teuwen 67ee460137 limit hf st suggstion to st25ta, if STA 2024-12-15 15:16:07 +01:00
Philippe Teuwen a4b595c79b got DESFire Light with that pk... 2024-12-15 15:14:17 +01:00
Philippe Teuwen 571ac28229 st25ta02kb getsignature: handle locked tags 2024-12-15 14:02:52 +01:00
Philippe Teuwen c9f2c17841 relax ecdsa_publickey_ng_t, should help MacOS compilation 2024-12-14 14:53:08 +01:00
Philippe Teuwen f26727eb28 Refactor originality checks. Notes: 
- removed pk "NTAG424DNA, NTAG424DNATT, DESFire Light Ev2", "04B304...3B" which is a typo of "DESFire Ev2", "04B3...3A"},
- MIKRON pk currently not used because I don't know if it's for MFC, MFUL or sth else
- ST25TN pk added but currently not used, need to be implemented/tested
- ST25TV pk currently not used, need to be implemented/tested
 2024-12-14 14:29:50 +01:00
Philippe Teuwen 0e819f75a4 UL AES alt pk 2024-12-13 10:32:07 +01:00
Antiklesys de01578c4b Update cmdhficlass.c 
Signed-off-by: Antiklesys <syselkitna@gmail.com>
 2024-12-13 16:03:45 +08:00
Antiklesys afed67ca2c Added hf iclass trbl 2024-12-12 18:54:56 +08:00
Nathan N d965d5064e Remove duplicated condition 
Signed-off-by: Nathan N <noproto@users.noreply.github.com>
 2024-12-12 00:25:44 -05:00
WillyJL 11848a521e Remove duplicate keys 
Signed-off-by: WillyJL <49810075+Willy-JL@users.noreply.github.com>
 2024-12-10 05:20:26 +01:00
Philippe Teuwen a13b1db49f make style 2024-12-09 15:16:46 +01:00
Philippe Teuwen 09b31b5978 hf mfp info: fix support for real 4b cards 2024-12-09 14:41:51 +01:00
ry4000 6de7bd2cba R&Y: Added BDL Go CT and CMH COTA Smartcard AIDs to aid_desfire.json 
Added with thanks to TheDingo8MyBaby:
- BDL Go CT AID
- CMH COTA Smartcard AID

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-12-08 15:14:05 +11:00
Iceman 92e8dea093 Merge branch 'master' into master 
Signed-off-by: Iceman <iceman@iuse.se>
 2024-12-07 05:18:41 +01:00
Chris Simon b1a5df53d3 Update mfc_default_keys.dic 
Added Dutch Statistics Agency

Signed-off-by: Chris Simon <info@decomputeur.nl>
 2024-12-05 10:45:49 +01:00
Iceman 587761fdf0 Merge pull request #2680 from Eltrick/new-keys 
Add facility static hotel key
 2024-12-05 06:22:30 +01:00
Lucifer Voeltner 5bfd1239ae Add new facility static hotel key 2024-12-05 10:41:26 +07:00
nvx 34b2a3175f fis MF3ICD40 (D40) secure channel crypto 2024-12-04 22:21:22 +10:00
Philippe Teuwen 87266654f7 MIFARE Plus 4b UID: fix signature check 2024-12-04 08:19:17 +01:00
Iceman 8079153ee6 Merge branch 'master' into hf-mf-ultimatecard-script-auto-set-maxblock 
Signed-off-by: Iceman <iceman@iuse.se>
 2024-12-03 16:26:01 +01:00
Iceman 4cd914ad95 Merge branch 'master' into smart_spi_detect 
Signed-off-by: Iceman <iceman@iuse.se>
 2024-12-03 16:23:56 +01:00
Iceman 3727f63781 Merge pull request #2677 from ry4000/master 
R&Y: Updated DEN MyRide AID in aid_desfire.json
 2024-12-03 16:20:10 +01:00
Iceman dca915808c Merge pull request #2676 from Eltrick/g3-apdu-help 
modify 'hf mf gen3blk' help to comply with the sak change
 2024-12-03 16:19:42 +01:00
Iceman db4844e889 Merge pull request #2675 from Nya0/hts-dump 
added "lf hitag hts dump" command
 2024-12-03 16:19:10 +01:00
ry4000 2950d78703 R&Y: Updated DEN MyRide AID in aid_desfire.json 
- Updated Vendor to its legal name (Masabi Ltd)
- Added a standardised description to identify the AID as being issued by Masabi Ltd for its Justride platform.

Thank you.

-R&Y.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-12-03 22:51:29 +11:00
ANTodorov bd803ce8fd rework to use smart SPI flash detection 
Check JEDEC ID is in range between 0x0001 ... 0xFFFE,
Compare the output from 0x90 and 0x9F,
Then the size from the JEDEC ID

Otherwise fall-back to 256 kB

Extend the spi_flash_decode.py to handle more (known) SPI flash ICs
 2024-12-03 09:40:57 +02:00
Lucifer Voeltner e416080ae8 make the help message even clearer, and fix a bug featuring me being unable to count 2024-12-03 10:23:41 +07:00
Lucifer Voeltner cbc7d61781 modify 'hf mf gen3blk' help to comply with the sak change 2024-12-03 10:13:09 +07:00
Piotr Rzeszut 416770c170 Remove support for 2k MIFARE tags, as it will be better to add this together with other variants of MIFARE Plus in the future 2024-12-02 22:43:05 +01:00
Piotr Rzeszut 7d9d783420 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into hf-mf-ultimatecard-script-auto-set-maxblock 
# Conflicts:
#	CHANGELOG.md
 2024-12-02 22:41:47 +01:00