Commit Graph

9620 Commits

Author SHA1 Message Date
iceman1001 9f22131dd1 alignment 2022-02-26 20:34:18 +01:00
iceman1001 b776c98422 fix copy pasta 2022-02-26 17:40:24 +01:00
iceman1001 3e543fcc65 added new public key, thanks to @anon! 2022-02-26 17:36:14 +01:00
iceman1001 652affbfb1 rework start screen to be shorter 2022-02-26 17:17:14 +01:00
iceman1001 2671795b8b textual 2022-02-26 17:15:32 +01:00
iceman1001 0d5b7864aa coverity fixes 2022-02-25 21:03:22 +01:00
iceman1001 ec3effcb30 too small array 2022-02-25 20:15:19 +01:00
Iceman 1c6abece54 Merge branch 'master' into sha 2022-02-25 11:42:20 +01:00
Philippe Teuwen 21089fc346 flasher: skip msg about --force when --force is used 2022-02-25 00:37:54 +01:00
Philippe Teuwen da908315b0 flasher: add option --force rather than interactive prompt 2022-02-25 00:35:30 +01:00
iceman1001 a932251908 text 2022-02-24 23:38:51 +01:00
iceman1001 dfcb83a154 make style 2022-02-24 19:36:26 +01:00
iceman1001 3b5a1e8de5 added some helptexts 2022-02-24 19:31:47 +01:00
iceman1001 8141752d69 texts 2022-02-24 19:19:07 +01:00
iceman1001 07855611e4 unify text 2022-02-24 18:03:19 +01:00
iceman1001 2879b23a1c unify text 2022-02-24 17:38:01 +01:00
iceman1001 bb1a51988c fixes to "hf cipurse info" 2022-02-24 17:24:42 +01:00
iceman1001 4bd6e8f61c fixes to "hf cipurse info" 2022-02-24 17:20:27 +01:00
iceman1001 c98bdfe857 fixes to "hf cipurse info" 2022-02-24 17:16:31 +01:00
Benjamin DELPY a852f88a6e Fix support for more Mifare Desfire EV2 cards
Was tempted to make a `major` mask with 0x0f == 1,2,3,... but...
2022-02-23 23:37:47 +01:00
iceman1001 04b86073b2 ndef simple wifi record decoder 2022-02-21 15:56:49 +01:00
iceman1001 7310834b69 added a compact tlv decoder for ATR historical bytes in 14a info 2022-02-19 00:15:34 +01:00
iceman1001 1f470483ec make style 2022-02-18 22:31:34 +01:00
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 6ead44933a Flasher: factorize and prompt also wehn we can't check the version 2022-02-17 01:43:41 +01:00
Philippe Teuwen 3cbf64c894 Flasher: display and check bootloader elf as well 2022-02-17 01:43:41 +01:00
Philippe Teuwen bfffea6e6c Flasher: show the detailed firmware version 2022-02-17 01:43:41 +01:00
Philippe Teuwen 5997f23139 flasher: ask confirmation if fw mismatch, fix segfault on abort 2022-02-17 01:43:41 +01:00
Philippe Teuwen 72f7bc762d Flasher: read the firmware file in one go 2022-02-17 01:43:41 +01:00
Philippe Teuwen 2a705d3a44 make style 2022-02-17 01:43:41 +01:00
Philippe Teuwen 0ed0735709 flasher: parse ELF to check version_information and do ELF checks before looking for a proxmark3 2022-02-17 01:43:41 +01:00
Philippe Teuwen 14f62eaa88 armsrc check: skip if no src available; postpone warning 2022-02-17 01:43:41 +01:00
Philippe Teuwen bbf49ab560 Add a fingerprint of the ARM OS source files to detect when a client expects another ARM image 2022-02-17 01:43:39 +01:00
Philippe Teuwen d0526d3ba9 Remove mkversion.pl 2022-02-17 01:43:00 +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