github/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-05-09 03:00:07 -04:00
Code Issues Packages Projects Releases Wiki Activity
17,396 Commits 3 Branches 18 Tags
bae03ec7923572658ccd149e0cf60fa1024ddf7b
Commit Graph

17396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iceman1001
bae03ec792 type confusing 2023-11-02 17:14:37 +01:00
iceman1001
3d91806b5b use correct define 2023-11-01 23:40:33 +01:00
iceman1001
e5d2fc3fa7 some color to MFU dump output 2023-11-01 23:40:10 +01:00
iceman1001
b17f5ef45c fix nfc MFC dump file loading 2023-11-01 23:39:42 +01:00
iceman1001
e94be650aa clean 2023-11-01 23:21:04 +01:00
iceman1001
c398e20eef macos 2023-11-01 23:20:14 +01:00
iceman1001
865052b4e9 compiler optimizations from user @np0 2023-11-01 23:05:35 +01:00
iceman1001
74347be52c added O3 compiler param 2023-11-01 17:03:10 +01:00
Iceman
0720ee4267 Merge pull request #2157 from jmichelp/master 
Add alternative chip ID
 2023-11-01 14:35:43 +01:00
Jean-Michel Picod
c08e26ca26 Add alternative chip ID 2023-11-01 10:40:53 +01:00
iceman1001
6423a0ec76 file extension needed? 2023-11-01 07:57:45 +01:00
iceman1001
9f439fde4e fix some ndef decoding 2023-11-01 07:57:13 +01:00
iceman1001
98b7bd75d6 seems nfc mifare classic dumps used "blocks" instead... 2023-11-01 03:17:48 +01:00
iceman1001
a92e712cfe fix bad comparisions 2023-11-01 03:06:10 +01:00
iceman1001
ae6ba395b4 added support for loading flipper MFC/MFU dump files.\nFixed NFC DECODE to identify and handle MFU dump files properly 2023-11-01 02:43:10 +01:00
Iceman
ca04f03cb1 Merge pull request #2154 from dankar/master 
Implemented 'info' command for NTAG424
 2023-10-31 13:03:23 +01:00
Daniel Karling
5a750da4ef Removed wrapper for desfire_print_signature 
Not needed now when the unused parameter is gone.
 2023-10-31 08:19:17 +01:00
Daniel Karling
ee3a223e37 Implemented 'info' command for NTAG424 2023-10-31 08:16:07 +01:00
Iceman
03ffda08a0 Merge pull request #2156 from henrygab/bugfix_err_message 
Remove incorrect message (my own regression)
 2023-10-31 01:34:17 +01:00
Henry Gabryjelski
939d3d4a93 Remove incorrect message (my own regression) 2023-10-30 17:26:07 -07:00
iceman1001
17844afe9d more verbose output for failues when loading json files 2023-10-31 01:07:19 +01:00
iceman1001
c48f305483 more verbose output for failues when loading json files 2023-10-31 00:58:50 +01:00
iceman1001
f523d2917b fix string formatters 2023-10-31 00:43:44 +01:00
iceman1001
9835543a2f apply fix for v3 2023-10-31 00:03:53 +01:00
Iceman
b50b405128 Merge pull request #2155 from henrygab/mf_dump_fix 
Fix mf file loading error
 2023-10-30 23:59:17 +01:00
Henry Gabryjelski
f2ed7d1299 Fix mf file loading error 
Code was incorrectly checking if loop variable
`i` was greater than maximum data length,
rather than checking current buffer pointer.
 2023-10-30 15:46:37 -07:00
iceman1001
5b7486553f remove unused param in desfire_print_signature 2023-10-30 22:53:41 +01:00
iceman1001
094882454d missing structs 2023-10-30 22:23:07 +01:00
iceman1001
75a70cbf53 updating json format for mfc 2023-10-30 22:22:22 +01:00
iceman1001
82e7830e5b style 2023-10-30 22:20:55 +01:00
iceman1001
5ca29246e9 fix GH code alert 2023-10-30 16:08:42 +01:00
iceman1001
f47fb2f74d adapt data bmap to handle calls without -m. 2023-10-30 16:07:13 +01:00
iceman1001
b9dcd143d5 style 2023-10-30 13:11:52 +01:00
iceman1001
2763ead13b fix the free ctx calls 2023-10-30 13:05:46 +01:00
iceman1001
b0ee6ae67b fixes ntag424 2023-10-30 12:55:23 +01:00
Iceman
d22d6c4879 Merge pull request #2150 from dankar/master 
Partial implementation of NTAG424 commands
 2023-10-29 21:13:42 +01:00
Iceman
c3abea803b Merge branch 'master' into master 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-10-29 21:13:08 +01:00
Daniel Karling
d4f8c42d3c Added additional command examples 2023-10-29 17:13:27 +01:00
Daniel Karling
efb645636b Updated changelog 2023-10-29 16:56:04 +01:00
Daniel Karling
912c126266 Added encrypted comms to ReadData and WriteData commands 
This allows reading and writing to the "proprietary" file (number 3),
or file 2 if it's set to "full" communications mode.
 2023-10-29 16:49:11 +01:00
Daniel Karling
6d290f1bae Less magic numbers, more refactoring 2023-10-29 13:50:31 +01:00
Daniel Karling
1eaf8d0e80 Fixed incorrect order of sdm access rights in command help 2023-10-28 10:33:30 +02:00
Daniel Karling
05a2302466 Implemented style 2023-10-27 18:09:38 +02:00
Daniel Karling
ad875a8c01 Refactored communication encryption 2023-10-27 17:25:48 +02:00
Iceman
9fd539723c Merge pull request #2151 from Antiklesys/master 
Fixed keyroll mode for hf ic configcard
 2023-10-27 15:50:47 +02:00
Iceman
67f45afa0f Merge pull request #2149 from yah01/optimize-sample-performance 
Improve sampling performance
 2023-10-27 15:48:59 +02:00
yah01
9d07ee497c Improve lf sampling performance 
Signed-off-by: yah01 <yah2er0ne@outlook.com>
 2023-10-27 13:47:26 +08:00
Daniel Karling
eb29e1a17e Cleanup 
* Added some comments
 * Changed name of offsets to sdm_data since this is more apt. Not all
   of them are describing offsets
 * Fixed dumb bug in MAC refactor
 2023-10-27 07:45:40 +02:00
Antiklesys
81b116c23f Fixed keyroll mode for hf ic configcard 
Was able to compare the output of nfc-iclass and I identified two bugs in the generation of blocks 0x0D (was being overwritten with FF, it seems this was an original bug in the original pm3 code?)
Fixed the porting for block 15 generation.
 2023-10-27 13:21:49 +08:00
Daniel Karling
011d1f6a44 Refactored MAC and IV calculations 2023-10-27 06:52:30 +02:00