RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-25 01:36:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
8689 commits 3 branches 14 tags 85 MiB
Commit graph

5408 commits

Author SHA1 Message Date
Bjoern Kerler 4c2f98ac3d Add first 3K3 support. Improve algo error handling 2020-04-11 02:32:55 +02:00
Bjoern Kerler 9b26fab1c2 Further auth info fixes 2020-04-11 01:41:39 +02:00
Bjoern Kerler 327d8a8bfe Further aid and auth info fixes 2020-04-11 01:38:47 +02:00
Bjoern Kerler 93e4a66971 Improve UI handling and fix AID/FID display 2020-04-11 00:31:55 +02:00
mwalker33 7fa7eeba97 Update settings.c 2020-04-11 08:21:16 +10:00
Bjoern Kerler c6323a5fe1 Fix bad bug. Don't check dest for NULL 2020-04-10 23:45:54 +02:00
Bjoern Kerler 52b41fc883
Merge pull request #22 from RfidResearchGroup/master 
Update
 2020-04-10 23:01:52 +02:00
Bjoern Kerler 70b000bc79 Make style 2020-04-10 22:59:55 +02:00
Bjoern Kerler 8f3a02fc50 Add Deselect on info and enum 2020-04-10 22:56:45 +02:00
Bjoern Kerler 08469f940a Replace MIX and OLD Commands 2020-04-10 22:52:16 +02:00
Bjoern Kerler 68faa88e6a Auth test 2020-04-10 21:02:46 +02:00
mwalker33 933d7523f7 Tweaks and supports_colors 2020-04-10 19:51:08 +10:00
iceman1001 bb0b368e68 fix... 2020-04-10 10:50:17 +02:00
iceman1001 8e74978855 code fixes, better handling of card identification and outputs accordingly. 2020-04-10 10:31:18 +02:00
iceman1001 69732ef709 better identification of PLus vs Plus EV1. Be verycareful of that WRITEPERSO cmd inside INFO to detect card type. No good at all 2020-04-10 10:30:37 +02:00
iceman1001 df0aaa020d fix: string too short 2020-04-10 10:28:52 +02:00
iceman1001 0e2ac41717 annotage desfire more 2020-04-10 10:28:15 +02:00
mwalker33 9fc232390b Update Client debug level 2020-04-10 18:20:02 +10:00
mwalker33 970b2bf2cb debug level fix 2020-04-10 16:14:43 +10:00
mwalker33 1b8b8f0128 Settings Added 2020-04-10 15:04:11 +10:00
mwalker33 070636f196 Fix Sync 2020-04-10 14:36:29 +10:00
mwalker33 978f57b505 Revert "Merge pull request #32 from RfidResearchGroup/master" 
This reverts commit 40d2a3c072, reversing
changes made to 15d584e060.
 2020-04-10 13:59:56 +10:00
mwalker33 0542825567 Revert "Add settings" 
This reverts commit 430ca985d3.
 2020-04-10 13:58:57 +10:00
mwalker33 430ca985d3 Add settings 
Plot Windows, log level, emoji, hints
 2020-04-10 13:52:50 +10:00
Bjoern Kerler cd35b60d13 Minor typo 2020-04-10 01:26:37 +02:00
Bjoern Kerler 82323b14e2 Make style 2020-04-10 01:18:48 +02:00
Bjoern Kerler 7af0f07c4e Add useful signature info. 2020-04-10 00:59:06 +02:00
Bjoern Kerler 685b1e47ef Fix unnecessary stuff. 2020-04-10 00:58:08 +02:00
Bjoern Kerler 7191aa8b14 Fix signature command. Special response 0x9190 ? 2020-04-10 00:56:37 +02:00
Bjoern Kerler 3098a6bca0 Format PICC working 2020-04-10 00:36:15 +02:00
Bjoern Kerler 58af8c004d FormatPICC not working. Other things look good 2020-04-09 22:08:17 +02:00
Bjoern Kerler 68733cd7cf Minor fixes. Create AID and Delete AID working. 2020-04-09 20:03:59 +02:00
Bjoern Kerler 3b915d343b Add delete aid and minor fix 2020-04-09 19:51:35 +02:00
Bjoern Kerler b14dbf1997 Add fixes 2020-04-09 19:22:57 +02:00
Bjoern Kerler 2959f91fb6 Add file settings decoder 2020-04-09 19:15:17 +02:00
Bjoern Kerler 705cb9e18a Remove non-sense 2020-04-09 17:21:22 +02:00
Bjoern Kerler 057e611b6d Fix bugs, improve error reporting, add format picc and createapplication 2020-04-09 17:15:45 +02:00
Uli Heilmeier c96af80e44 Merge remote-tracking branch 'upstream/master' into hfmfdes-clang-warn 2020-04-09 14:39:46 +02:00
iceman1001 8f07ac80d1 fix: null 2020-04-09 13:28:43 +02:00
Uli Heilmeier dcede2f8e3 cmdhfmfdes: fix clang warnings 
Make clang happy and fix several
error: expression which evaluates to zero treated as a null pointer constant of type 'uint8_t *' (aka 'unsigned char *')
      [-Werror,-Wnon-literal-null-conversion]
and
cmdhfmfdes.c:732:31: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]

Fixes RfidResearchGroup/proxmark3#659
 2020-04-09 13:26:43 +02:00
iceman1001 0904cce336 fix: null 2020-04-09 13:23:36 +02:00
Uli Heilmeier 43b5ee5918 legic.lua: updated to work again 
Fixed/changed things:

* added info that virtual tag is always MIM1024
* changed reading files to read binary files (as written by 'hf legic dump')
* changed extension for writing files (*.bin and *.eml) to be on par with 'hf legic dump'
* CRC was calculated wrong when data was not padded with 0 for one char hex strings
* readTag (rt) can now be called multiple times without using the wrong filename
* tag length was calculated wrong as segment header length field includes the header itself
* bytes are XORed before writing them to a tag
* default name for file contains now the tag id
 2020-04-09 10:24:58 +02:00
Bjoern Kerler 4128a98cdb
Merge pull request #19 from RfidResearchGroup/master 
Update
 2020-04-08 22:47:32 +02:00
Bjoern Kerler a3ea353dab Improve hf mfdes and cleanup 2020-04-08 22:44:51 +02:00
iceman1001 68a890d0e9 textual 2020-04-08 19:16:42 +02:00
iceman1001 df83c71470 chg: hf mfp info - need all data from getversion. Layout changes 2020-04-08 19:07:17 +02:00
iceman1001 f216fc7f5e chg: hf mfp info - need all data from getversion. Layout changes 2020-04-08 19:07:11 +02:00
iceman1001 133e2a6bc4 fix: 'hf mfp info' - now support GetVersion command (Plus EV1) 2020-04-08 17:13:05 +02:00
iceman1001 7643b24ca7 chg: 'hf mfp info' - colors and now checks originality for Plus EV1 2020-04-08 15:21:40 +02:00
iceman1001 cdf920b289 coverity fix 2020-04-08 14:18:21 +02:00
iceman1001 f870abf454 text 2020-04-08 13:59:20 +02:00
iceman1001 43936042e9 text 2020-04-08 13:49:18 +02:00
iceman1001 69b7d798c1 colors 2020-04-08 13:48:56 +02:00
iceman1001 285de43444 textual 2020-04-08 13:37:48 +02:00
iceman1001 0aa18f3008 add test command for developing desfire 2020-04-08 13:26:44 +02:00
iceman1001 a086754279 earlier test 2020-04-08 05:26:39 +02:00
iceman1001 e2370d7866 style 2020-04-08 05:03:19 +02:00
iceman1001 832770e3d9 chg: MIX 2020-04-08 05:02:57 +02:00
iceman1001 c7bbe9914e chg: use protocols.h for protocols defines 2020-04-08 05:02:41 +02:00
Iceman 743659aebf
Merge pull request #657 from bkerler/mfdes_auth 
Mifare Desfire DF Name display support and hf mfdes enum output improvement
 2020-04-08 04:36:47 +02:00
Bjoern Kerler 7085e3a3f1 Fix display of DF and minor bug 2020-04-07 21:52:59 +02:00
Bjoern Kerler 3833b8ee3b Add Mifare Desfire GetDFNames and improve HF MFDES Enum output 2020-04-07 21:30:12 +02:00
Uli Heilmeier 75943044a5 hf legic wrbl: fix Out-of-bounds check 
Check was off-by-one so that the last byte was not writable.
 2020-04-07 19:58:23 +02:00
Bjoern Kerler 61f3ef61de Fix issue #646 2020-04-07 18:27:46 +02:00
iceman1001 42063994e9 add: hf mfdes list 2020-04-07 09:23:34 +02:00
Bjoern Kerler f01c37aff4
Merge pull request #13 from RfidResearchGroup/master 
fix:  'trace list des' - now deals with wrapped native commands
 2020-04-07 09:18:35 +02:00
Bjoern Kerler 26975187ee Fix desfire aes authentification 2020-04-07 09:14:44 +02:00
iceman1001 ab8b9884a6 fix: 'trace list des' - now deals with wrapped native commands 2020-04-07 09:07:18 +02:00
iceman1001 53178e8b23 chg: hf mfdes enum - now get fileids and settings 2020-04-06 18:23:42 +02:00
Bjoern Kerler 1620a889f7 Log and Typos corrected 2020-04-06 16:26:01 +02:00
iceman1001 85c4f63015 chg: in preparation for EV3 2020-04-06 15:44:58 +02:00
iceman1001 3519dea0cf simpler 2020-04-06 15:25:56 +02:00
Bjoern Kerler 0bcc2a9025 Revert DropField commit 2020-04-06 15:14:16 +02:00
Bjoern Kerler 27ed590d73 Add DropField() when errors happen 2020-04-06 14:30:21 +02:00
Bjoern Kerler b4b56aa34f
Merge pull request #7 from bkerler/master 
Update
 2020-04-06 14:04:13 +02:00
Bjoern Kerler 50c6a9223d Add NTAG handling, fix TNP3xxx, remove ISO 14443-B card uids 2020-04-06 13:59:01 +02:00
iceman1001 b6e85c865d more settings emoji, hints. 2020-04-06 10:54:58 +02:00
Iceman 2427d1430e
Merge pull request #650 from mwalker33/Settings 
Settings Base
 2020-04-06 10:45:58 +02:00
Iceman d10f2b5a2a
Merge pull request #649 from bkerler/improve_14a_info 
Improve 14443-a info
 2020-04-06 10:44:44 +02:00
iceman1001 173583a548 fix coverity 278900 2020-04-06 09:46:22 +02:00
mwalker33 f0b0d10ee1 Comment out test calls 2020-04-06 16:36:12 +10:00
mwalker33 7b14fd7212 Code Clean 2020-04-06 16:20:57 +10:00
iceman1001 f461a4e5fb fix coverity 278907, 278906 2020-04-06 08:03:30 +02:00
iceman1001 fcf7bd24a6 fix coverity 278907, 278906 2020-04-06 08:02:48 +02:00
iceman1001 97ef641fad coverity fix, format specifier 2020-04-06 07:29:39 +02:00
iceman1001 b8bbc1d0a5 filename checks 2020-04-06 07:29:12 +02:00
iceman1001 97f06ddcfb coverity fixes 2020-04-06 07:15:34 +02:00
iceman1001 e1c64d3eef text 2020-04-06 06:56:23 +02:00
iceman1001 a32f1520db chg: hf legic eload/esave - always available 2020-04-06 06:55:51 +02:00
iceman1001 961eb193d1 text 2020-04-06 06:55:12 +02:00
iceman1001 227900efee eload/esave skeleton for cryptorf 2020-04-06 06:54:53 +02:00
iceman1001 5e9e6a9ad8 prepp hookup for cryptorf cmds 2020-04-06 06:17:05 +02:00
iceman1001 e0ff7d0338 cryptorf skeleton cmds -WIP- 2020-04-06 06:16:32 +02:00
iceman1001 4df7c3bf03 coverity fixes 2020-04-06 06:05:02 +02:00
Bjoern Kerler ca51fee02e Add ST uid infos 2020-04-06 00:00:53 +02:00
Bjoern Kerler e4187ef8a1
Merge pull request #5 from RfidResearchGroup/master 
Update
 2020-04-05 21:36:44 +02:00
Bjoern Kerler 25bcd6b89c Improve 14444-3a card detection 2020-04-05 21:33:41 +02:00
iceman1001 aa642d5d1e ax 2020-04-05 18:27:54 +02:00
iceman1001 0029f6fceb minor fixes. wrong params, helptext 2020-04-05 17:02:41 +02:00
iceman1001 0263273ec3 fix: wrong paramname 2020-04-05 17:00:16 +02:00