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

8894 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mwalker33 40d2a3c072
Merge pull request #32 from RfidResearchGroup/master 
Update from master
 2020-04-10 13:38:47 +10:00
Bjoern Kerler 865364ab08 Merge branch 'mfdes_test' of https://github.com/bkerler/proxmark3 into mfdes_test 2020-04-10 01:26:45 +02:00
Bjoern Kerler cd35b60d13 Minor typo 2020-04-10 01:26:37 +02:00
Bjoern Kerler a0bce83628
Merge branch 'master' into mfdes_test 2020-04-10 01:24:50 +02:00
Bjoern Kerler 090223d35a Update CHANGELOG 2020-04-10 01:20:59 +02:00
Bjoern Kerler d88db10aaf Make style 2020-04-10 01:19:16 +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 c9b27732f5 Make ISO auth work 2020-04-10 00:14:45 +02:00
Bjoern Kerler c4831ccd9b Do not deselect at end of auth 2020-04-10 00:03:23 +02:00
Bjoern Kerler 8983324c21 Make host cmds more flexible 2020-04-09 23:49:14 +02:00
Bjoern Kerler 8571a770fe Make auth random 2020-04-09 23:30:49 +02:00
Bjoern Kerler d49885dd12 Fix des auth 2020-04-09 23:16:18 +02:00
Bjoern Kerler 7aba4ffff1 Fix frame command for auth 2020-04-09 22:39:31 +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
Iceman aba7c88565
Update Troubleshooting.md 2020-04-09 18:43:26 +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
Iceman 910c87429a
Merge pull request #662 from uhei/hfmfdes-clang-warn 
cmdhfmfdes: fix clang warnings
 2020-04-09 16:17:21 +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
Iceman c2d651aeed
Merge pull request #661 from uhei/legic-lua 
legic.lua: updated to work again
 2020-04-09 13:15:32 +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 5c167cdd57
Merge pull request #20 from RfidResearchGroup/master 
Update
 2020-04-09 09:31:48 +02:00
Iceman a356952919
Merge pull request #660 from bkerler/mfdes_auth 
Improve hf mfdes client, complete restructure. Introduce client debugging.
 2020-04-09 09:07:41 +02:00
Bjoern Kerler 9b73514f71 Merge branch 'mfdes_auth' of https://github.com/bkerler/proxmark3 into mfdes_auth 2020-04-08 22:51:42 +02:00
Bjoern Kerler d9d92b1ec0 Update Changelog 2020-04-08 22:51:29 +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
Bjoern Kerler ec1598a99d
Merge pull request #18 from RfidResearchGroup/master 
Update
 2020-04-08 14:13:57 +02:00
iceman1001 f870abf454 text 2020-04-08 13:59:20 +02:00
iceman1001 43936042e9 text 2020-04-08 13:49:18 +02:00