dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,573 Commits 7 Branches 1 Tag
970b2bf2cb1c776da5ad4510696312225867bcb5
Commit Graph

8573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mwalker33
40d2a3c072 Merge pull request #32 from RfidResearchGroup/master 
Update from master
 2020-04-10 13:38:47 +10:00
Iceman
aba7c88565 Update Troubleshooting.md 2020-04-09 18:43:26 +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
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
iceman1001
69b7d798c1 colors 2020-04-08 13:48:56 +02:00
Bjoern Kerler
74cee495a5 Merge pull request #17 from bkerler/master 
Update
 2020-04-08 13:43:57 +02:00
iceman1001
285de43444 textual 2020-04-08 13:37:48 +02:00
iceman1001
a0874248c7 chg more pm3 fail codes 2020-04-08 13:27:13 +02:00
iceman1001
0aa18f3008 add test command for developing desfire 2020-04-08 13:26:44 +02:00
iceman1001
75eff352c9 MIX 2020-04-08 05:29:22 +02:00
iceman1001
342a85ef7e MIX 2020-04-08 05:27:54 +02:00
iceman1001
a42a817ff3 MIX, also removeed returning mem, since its not used. We use downloadEMbuffer instead 2020-04-08 05:27:27 +02:00
iceman1001
a086754279 earlier test 2020-04-08 05:26:39 +02:00
iceman1001
c155b62111 MIX 2020-04-08 05:15:39 +02:00
iceman1001
5ef16fe016 mix 2020-04-08 05:14:19 +02:00
iceman1001
d889a9a2d4 style 2020-04-08 05:03:27 +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
Iceman
52e94f21f0 Merge pull request #656 from uhei/legic-wrbl-out-of-bounds 
hf legic wrbl: fix Out-of-bounds check
 2020-04-08 04:33:51 +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
82fad10e16 Merge pull request #16 from RfidResearchGroup/master 
Merge pull request #655 from bkerler/mfdes_auth
 2020-04-07 18:48:29 +02:00