dandri/proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-05-24 16:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,628 Commits 3 Branches 20 Tags
92e8dea09304da7ca1bbb6e2f78fbfaed97179cd
Commit Graph

19628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Iceman 92e8dea093 Merge branch 'master' into master 
Signed-off-by: Iceman <iceman@iuse.se>
 2024-12-07 05:18:41 +01:00
Iceman 489399c3fb Merge pull request #2683 from piotrva/flash-mifare-keys-extension 
SPI flash area for Mifare keys extended from 2047 to 4095 keys
 2024-12-07 05:14:25 +01:00
Piotr Rzeszut b1b10c2bea As extending SPI flash storage for Mifare need to run init_rdv4 script for a proper operation add a note under compilation instructions 2024-12-07 00:36:52 +01:00
Piotr Rzeszut 1b781aae9f Update documentation on SPI flash memory to use modern client function calls with dashes. 2024-12-07 00:35:37 +01:00
Piotr Rzeszut 565f3f1feb Extend storage allocated for Mifare keys to 4095 keys. Update documentation on the feature and memory map 2024-12-07 00:34:29 +01:00
Iceman eb12dd78a1 Merge pull request #2682 from eagle00789/patch-2 
Update CHANGELOG.md
 2024-12-06 05:39:17 +01:00
Iceman cced003405 Merge pull request #2681 from eagle00789/patch-1 
Update mfc_default_keys.dic
 2024-12-06 05:38:28 +01:00
Chris Simon 2850d2aa0f Update CHANGELOG.md 
Signed-off-by: Chris Simon <info@decomputeur.nl>
 2024-12-05 10:48:52 +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
Iceman c849a06a0b Merge pull request #2679 from nvx/d40_crypto_fix 
fis MF3ICD40 (D40) secure channel crypto
 2024-12-05 06:21:49 +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 3454992bc8 Merge pull request #2673 from nvx/fix_trace_namme 
fix pacs data in example trace filename
 2024-12-03 16:56:57 +01:00
Iceman 69e407e8d5 Merge pull request #2666 from piotrva/hf-mf-ultimatecard-script-auto-set-maxblock 
Automatically set maximum r/w block for preset configurations of Mifare Classic in hf_mf_ultimatecard.lua, add presets for 2k variants.
 2024-12-03 16:26:13 +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 7e072dc976 Merge pull request #2670 from ANTodorov/smart_spi_detect 
rework to use smart SPI flash detection
 2024-12-03 16:24:37 +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 692235beb0 Merge pull request #2678 from libin-ka/master 
Add Proxmark3 Ultimate  FPGA   xc2s50-5-tq144.ucf  files
 2024-12-03 16:20:49 +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
libin-ka 537a9f0171 Add files via upload 
Add Proxmark3 Ultimate  FPGA   xc2s50-5-tq144.ucf  files

Signed-off-by: libin-ka <46210417+libin-ka@users.noreply.github.com>
 2024-12-03 21:04:50 +08: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
Iceman 80970db7e3 Merge pull request #2672 from kitsunehunter/laundry-keys 
add static laundry card keys
 2024-12-02 20:20:17 +01:00
Iceman de3f374930 Merge pull request #2671 from Eltrick/g3apdu-sak 
Fix Gen 3 APDU block 0 SAK not being written correctly
 2024-12-02 20:19:45 +01:00
Iceman 9623a5f302 Merge pull request #2669 from Eltrick/master 
'hf mfu incr' to increment counters of UL-EV1 family; Also fix reading of NTAG counters in 'hf mfu info'
 2024-12-02 20:18:27 +01:00
Iceman c336cdc931 Merge pull request #2668 from Antiklesys/master 
Added unhash instructions after legbrute
 2024-12-02 20:14:36 +01:00
nya0 7fbcb1c30f added "lf hitag hts dump" command 2024-12-02 16:15:13 +03:00
nvx 96a1f21764 fix pacs data in example trace filename 2024-12-02 16:16:59 +10:00
Xavier 4e40d3d6a7 Update mfc_default_keys.dic 
Signed-off-by: Xavier <90627943+kitsunehunter@users.noreply.github.com>
 2024-12-01 20:27:08 -05:00
Xavier ef74de3721 add static laundry card keys 
these cards are stored value and manipulating the data is useful

Signed-off-by: Xavier <90627943+kitsunehunter@users.noreply.github.com>
 2024-12-01 20:17:05 -05:00
Lucifer Voeltner 4adf663300 Fix Gen 3 APDU block 0 SAK not being written correctly 2024-12-01 16:27:35 +07:00
Lucifer Voeltner d8d090612d 'hf mfu incr' to increment counters of UL-EV1 family; Also fix reading of NTAG counters in 'hf mfu info' 2024-12-01 15:29:00 +07:00
Philippe Teuwen ca15bbd019 Rework theremin script 2024-11-30 22:49:31 +01:00
Antiklesys e4a3a244ce Added unhash instructions after legbrute 
Added unhash instructions after legbrute
 2024-11-30 07:53:52 +08:00
Piotr Rzeszut a11f3173cc Add preset for 2k MIFARE Classic tags hf_mf_ultimatecard.lua when using preset configurations, update changelog 2024-11-29 01:45:58 +01:00
Piotr Rzeszut a3eb3bfbe9 Automatically set maximum read/write block by hf_mf_ultimatecard.lua when using preset configurations 2024-11-29 01:43:56 +01:00
Philippe Teuwen 23e6aa40b7 hf/lf tune: fix segfault when called from script 2024-11-28 17:35:45 +01:00
Iceman b75818116a Merge pull request #2664 from piotrva/hf-mf-ultimatecard-script-max-rw-blocks 
Add option to set and get maximum read/write block number using hf_mf_ultimatecard script
 2024-11-28 15:21:09 +01:00
Iceman 80f40492fc Merge branch 'master' into hf-mf-ultimatecard-script-max-rw-blocks 
Signed-off-by: Iceman <iceman@iuse.se>
 2024-11-28 15:20:56 +01:00
Iceman 099602f421 Merge pull request #2665 from ANTodorov/spi_flash_W25Q64JV 
added JEDEC information for SPI flash W25Q64JV
 2024-11-28 15:19:54 +01:00
Iceman e1e5bfd82c Merge pull request #2662 from ry4000/master 
R&Y: Added GRB Tap-N-Go to aid_desfire.json
 2024-11-28 15:18:46 +01:00
Iceman 447bb7804a Merge pull request #2663 from douniwan5788/fix_concatbits_again 
fix Hitag S concatbits and `lf em 410x clone --hts`
 2024-11-28 15:17:56 +01:00