Commit graph

9587 commits

Author SHA1 Message Date
Eric Betts
85aeb9da50 typo 2022-02-17 22:00:48 -08:00
iceman1001
d00e138a31 added a mifare value block decoder 2022-02-18 06:19:44 +01:00
Philippe Teuwen
3ff4c8ac16 hf mf emrtd: clarify warning when we're voluntarily skipping dump 2022-02-17 15:15:50 +01:00
Philippe Teuwen
e67215fe49 reuse MAX macro 2022-02-17 12:30:43 +01:00
Philippe Teuwen
c2092ee2ed make style 2022-02-17 01:41:56 +01:00
Philippe Teuwen
526610b51c hf mf nested: remove option --single (becomes auto if --tblk), add same mfc type default logic as chk/fchk
Note that hf mf nested seems currently broken on single sector mode (even before today's changes):
it doesn't find keys while the "all sectors" works...
2022-02-17 01:41:56 +01:00
Philippe Teuwen
d031f4bac5 hf mf chk: fix CodeQL warning, fix sector number in case of provided block, display one single block in such case too 2022-02-17 01:41:56 +01:00
Philippe Teuwen
ee7856e9eb hf mf chk/fchk: factorize and fix key loading logic, chk: don't loop if one single block 2022-02-17 01:41:56 +01:00
Philippe Teuwen
80f768b787 hf mf: add Blk info to key tables 2022-02-17 01:41:56 +01:00
Philippe Teuwen
8fb1b7f534 hf mf: use existing mfSectorNum 2022-02-17 01:41:56 +01:00
Philippe Teuwen
dc59772dba hf mf chk: change option --blk to --tblk to keep same convention as for hf mf nested 2022-02-17 01:41:56 +01:00
Philippe Teuwen
05e7eda871 Add mfSectorTrailerOfSector 2022-02-17 01:41:56 +01:00
Philippe Teuwen
72ec7bf27b fix some CodeQL warnings 2022-02-16 22:23:24 +01:00
Philippe Teuwen
623169fe02 fix some CodeQL warnings 2022-02-16 20:28:38 +01:00
Philippe Teuwen
bbf8ba5a5f emrtd: fix crash on some platforms as sprint_hex_inrow outputs twice many bytes 2022-02-16 16:50:53 +01:00
iceman1001
8248168f3a from mct tools pr 2022-02-16 16:38:33 +01:00
Philippe Teuwen
da1588f430 Do not attempt to display jpeg2000 images
jp2 could be converted to jpg with "convert" from ImageMagick
but that would require some process spawning and fallback if ImageMagick is not installed...
2022-02-16 16:15:13 +01:00
Philippe Teuwen
5a44172a35 Fix hf emrtd info when offline 2022-02-16 15:06:35 +01:00
Philippe Teuwen
fbc60ccbbb fix commands.json generator, 608 -> 687 commands! 2022-02-16 14:53:06 +01:00
iceman1001
c5658f2a0b cppcheck 2022-02-16 00:22:48 +01:00
iceman1001
2eaa60e95e cppcheck 2022-02-16 00:20:02 +01:00
Iceman
85441aeceb
Merge pull request #1603 from c-barron/master
Bugfix for NXP GET_SYSTEM_INFO command
2022-02-15 20:10:55 +01:00
iceman1001
a8175a0f57 coverity #378901, #378902 fixes 2022-02-15 20:10:39 +01:00
Christine Barron
b7c6d07ee1
Merge branch 'RfidResearchGroup:master' into master 2022-02-15 10:24:56 -08:00
Christine Barron
e2f12b1020 Style 2022-02-15 10:17:31 -08:00
Philippe Teuwen
62e95f9220 fix some CodeQL warnings 2022-02-15 16:08:39 +01:00
Philippe Teuwen
160245e0d5 fix some CodeQL warnings 2022-02-15 16:01:23 +01:00
Christine Barron
22ea1b864f Refactored to cleaner version using bit mask 2022-02-14 23:39:32 -08:00
Christine Barron
61ece3a2a1 Sketchy way to check if card is SLIX2, will revise with bitwise operators 2022-02-14 23:29:46 -08:00
iceman1001
a4bc2c5521 make style 2022-02-14 21:44:15 +01:00
iceman1001
ecf58de32b hf legic restore/eload - now acceps bin/eml/json dump files." 2022-02-14 21:41:33 +01:00
iceman1001
6da5c9d0f4 calloc should already taken care of the zeroing 2022-02-14 09:20:14 +01:00
iceman1001
63bc9b5eb2 added legic view command, and converted OLD -> NG comms 2022-02-14 09:19:35 +01:00
Philippe Teuwen
12695a984a typo 2022-02-14 02:05:12 +01:00
Christine Barron
365ffc5f69 Bugfix updating NXP GET_SYSTEM_INFO command to 0xAB instead of 0x2B (as per section 9.5.3.18 in technical docs: https://www.nxp.com/docs/en/data-sheet/SL2S2602.pdf) 2022-02-13 13:27:31 -08:00
iceman1001
9abb026d00 cleaning out unused SendCommandOLD in lua scripting 2022-02-13 20:53:32 +01:00
iceman1001
26f88b68de daddy got a new style 2022-02-13 12:56:05 +01:00
iceman1001
549779d988 textual 2022-02-13 12:19:06 +01:00
iceman1001
60b0742941 make style 2022-02-12 17:50:44 +01:00
iceman1001
ec59acf64c style 2022-02-12 17:46:34 +01:00
iceman1001
f1d45b491c text 2022-02-12 17:42:18 +01:00
iceman1001
ba408be60b hf mfu dump - now saves EML too 2022-02-12 17:41:00 +01:00
iceman1001
e174a1e1be hf mfu restore/eload/eview/view now handles bin/eml/json. Only hf mfu dump that doesnt save EML yet 2022-02-12 17:30:30 +01:00
iceman1001
e2e06ab17a hf mfu restore now takes bin/json files. and textual adaptations 2022-02-12 12:59:42 +01:00
iceman1001
3169bf2763 hf mfu view - view binary/json mfu dump files 2022-02-12 11:26:40 +01:00
iceman1001
e6eb8cf51f change hf mfu dump text output 2022-02-12 10:00:20 +01:00
iceman1001
0811ad2468 loading header data for MFU json dump files 2022-02-12 09:58:46 +01:00
merlokk
0e5382857d added encode key 2022-02-08 01:07:03 +02:00
merlokk
bc88040967 plain update key works 2022-02-08 00:25:52 +02:00
merlokk
01761cc273 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into cip_key 2022-02-07 23:52:54 +02:00