Commit graph

2272 commits

Author SHA1 Message Date
iceman1001 e46639ee60 fifth adjustment to tracelog 2020-05-19 00:46:10 +02:00
iceman1001 00bde060c1 fourth, making struct packed 2020-05-19 00:40:22 +02:00
iceman1001 d72d804487 third part fixing cmdtracelog 2020-05-19 00:36:30 +02:00
iceman1001 97c9638518 next attempt for tracelog. simplify 2020-05-19 00:25:40 +02:00
iceman1001 837d644b6c chg: first attempt for trace log header 2020-05-18 23:49:45 +02:00
Philippe Teuwen 2ed5f1f614 iclass bf: avoid slowdown 2020-05-17 14:18:52 +02:00
iceman1001 39258fa5c5 revert... 2020-05-15 18:00:06 +02:00
iceman1001 8c65649258 better fault text 2020-05-15 17:04:33 +02:00
iceman1001 351a8d26af adjust tests 2020-05-15 17:03:28 +02:00
iceman1001 f3b4028e8a textaul, worked return codes for tests and swaped to printandlog 2020-05-15 17:02:42 +02:00
iceman1001 ddb432ec8f textual 2020-05-15 17:00:53 +02:00
iceman1001 f7bbf8b59f chg: 'lf indala demod' -more lenient size check 2020-05-15 09:00:44 +02:00
Philippe Teuwen 982f4231f7 fix coverity 263979 logically dead code 2020-05-14 18:01:52 +02:00
Philippe Teuwen 4e2d1e66ab fix coverity 286660 logically dead code 2020-05-14 17:59:46 +02:00
iceman1001 bddd2a9fc1 removed printvar 2020-05-14 17:17:47 +02:00
iceman1001 555d970c7d clock can be negative 2020-05-14 17:05:51 +02:00
iceman1001 e444640068 printandlogex 2020-05-14 16:59:02 +02:00
Philippe Teuwen 6a387c0b1b data tune, as suggested by @iceman 2020-05-14 12:58:34 +02:00
iceman1001 827439bddf cppcheck function name mis 2020-05-14 09:20:27 +02:00
iceman1001 a40c2727e6 cppcheck fix, unused struct 2020-05-14 09:19:12 +02:00
iceman1001 977b198816 cppcheck fix 2020-05-14 09:03:54 +02:00
Philippe Teuwen ffdd338dea make style 2020-05-14 01:04:26 +02:00
iceman1001 997567a9d6 cppcheck out-of-bounds 2020-05-13 23:31:01 +02:00
Philippe Teuwen 6a006677ef fancy timers 2020-05-13 23:20:46 +02:00
iceman1001 9af1807122 chg: psk demodualtion, lets keep those starting samples to easily find the zero init bit 2020-05-13 17:29:56 +02:00
iceman1001 e2671d5b50 fix coverity 286654 wrong sized argument 2020-05-13 12:26:37 +02:00
iceman1001 96108d826a fix coverity 286922 mem leak 2020-05-13 12:24:28 +02:00
Jamie Fiedler 97901a761f use machine/endian.h with osx 2020-05-13 03:35:38 -04:00
Philippe Teuwen 2c4eda6ab9 Fix 2 issues in proxendian.h, see details:
Only some OSes include endian.h from sys/types.h, not Termux, so let's include endian.h directly.
Moreover the past logic defined BYTE_ORDER to an undef macro, so BYTE_ORDER was not undef but def to 0
and BYTE_ORDER != LITTLE_ENDIAN && BYTE_ORDER != BIG_ENDIAN was always false as (0!=0 && 0!=0)
2020-05-13 02:09:03 +02:00
Philippe Teuwen 66fd6d70a0 hardnested: more readable preprocessing 2020-05-12 13:26:16 +02:00
iceman1001 5e4c83cc2f redundant 2020-05-12 10:30:14 +02:00
Philippe Teuwen 8dcf670f72 ore hardnested switch to handle 2020-05-12 01:17:38 +02:00
Philippe Teuwen a3aa38e624 trying to help old gcc 5... 2020-05-12 00:58:02 +02:00
Philippe Teuwen 3e05d28678 more hardnested switch to handle 2020-05-12 00:50:49 +02:00
Philippe Teuwen 7f6c078de2 fix cbor enum 2020-05-12 00:44:22 +02:00
iceman1001 00cca150ed Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-05-12 00:08:12 +02:00
iceman1001 56371fe7d5 coverity fixes 2020-05-12 00:07:06 +02:00
Philippe Teuwen 1a89680e7b fix unused-but-set warning 2020-05-11 23:52:38 +02:00
Philippe Teuwen b46a99d7d7 remove switch-enum warnings 2020-05-11 23:50:14 +02:00
iceman1001 30184b2b5c cleaning 2020-05-11 22:34:54 +02:00
iceman1001 4b68ac0a90 chg: lenient nexwatch demod sizes 2020-05-11 22:34:33 +02:00
iceman1001 5fd48305de chg: lf nexwath sim/clone - now supports 88bit format direct. See helptext for samples 2020-05-11 21:58:47 +02:00
iceman1001 093065f77a chg: 'data load' - color 2020-05-11 17:23:01 +02:00
iceman1001 d739edd13e Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-05-11 15:00:09 +02:00
Philippe Teuwen b377ca763a cmdlft55xx : Fix buf overrun (gcc 10 error)
src/cmdlft55xx.c:2560:43: error: ‘ - (Unknown)’ directive output may be truncated writing 21 bytes into a region of size between 15 and 24 [-Werror=format-truncation=]
 2560 |             snprintf(retStr, sizeof(buf), "%u - " _RED_("(Unknown)"), id);
      |                                           ^~~~~~~
src/cmdlft55xx.c:2560:13: note: ‘snprintf’ output between 23 and 32 bytes into a destination of size 25
 2560 |             snprintf(retStr, sizeof(buf), "%u - " _RED_("(Unknown)"), id);
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2020-05-11 13:58:38 +02:00
iceman1001 11884df687 textual 2020-05-11 11:45:45 +02:00
iceman1001 0c20369c3f Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-05-11 10:00:36 +02:00
iceman1001 9b08f7c39b chg: 'lf nexwatch demod' - now detects type, and show parity /chksum 2020-05-11 09:29:51 +02:00
Philippe Teuwen c1209ca0f5 (clang) fix unused function warning 2020-05-11 02:16:43 +02:00
Philippe Teuwen f6245cdb79 fix appveyor multiple definition of enum error 2020-05-11 01:23:28 +02:00
iceman1001 280b7d9c46 chg: 'lf nexwatch demod' - correct parity calc 2020-05-11 01:13:58 +02:00
iceman1001 f3293c9dcd chg: lf nexwatch demod - now descrambles the id aswell 2020-05-10 22:29:29 +02:00
Philippe Teuwen dc8178d43e Remove type-limits warning 2020-05-09 15:27:35 +02:00
Philippe Teuwen 1b0fd2389a Remove tautological-type-limit-compare 2020-05-09 14:41:12 +02:00
iceman1001 cfa75a6cab missing field init 2020-05-09 12:32:19 +02:00
iceman1001 39c000fb53 missing field initialise 2020-05-09 12:27:53 +02:00
Philippe Teuwen e695223d3b mf textual 2020-05-09 11:58:47 +02:00
Philippe Teuwen c349aa0a13 make style 2020-05-09 00:24:20 +02:00
iceman1001 c687ced062 chg: lf keri demod - more leanient when it comes to bits 2020-05-08 21:14:23 +02:00
Philippe Teuwen 24c85e74ac I see coverity coming... 2020-05-08 18:14:29 +02:00
Philippe Teuwen ff7b7b3a6f proper filtering of RL markers 2020-05-08 18:12:10 +02:00
Philippe Teuwen 74f16dc092 move whereami to deps 2020-05-08 17:04:28 +02:00
iceman1001 b78e060909 textual 2020-05-08 16:43:31 +02:00
iceman1001 b028b90f03 fix coverity 286652 286658 286662 2020-05-08 15:03:08 +02:00
iceman1001 f70210ebef textual 2020-05-08 13:27:45 +02:00
iceman1001 1621b0e7c8 trace list - different alloc 2020-05-08 13:23:06 +02:00
iceman1001 f6c2516779 chg: "trace list" - adjust messages 2020-05-08 12:30:18 +02:00
Philippe Teuwen 293b638f71 fix mem corruption in trace load/list 2020-05-08 11:55:43 +02:00
Philippe Teuwen 59057b6a35 banners: clang still warns on unused static inlines fcts, change strategy 2020-05-08 00:48:20 +02:00
Philippe Teuwen 3a75de1215 rework banners 2020-05-08 00:15:41 +02:00
Philippe Teuwen 1ad5cc473f rework banners 2020-05-07 23:00:45 +02:00
Philippe Teuwen 1c136c3e93 Let's see if the prompt suffixed spaces are still needed. Please shout if it breaks. 2020-05-07 21:56:43 +02:00
Philippe Teuwen edb1c85cd3 fix colored readline prompt bug 2020-05-07 21:56:09 +02:00
Philippe Teuwen a8a9e98ca2 Revert "Let's see if the prompt suffixed spaces are still needed. Please shout if it breaks."
ok now I see where it breaks :) will debug locally...

This reverts commit 4066287b98.
2020-05-07 19:44:03 +02:00
Philippe Teuwen 4066287b98 Let's see if the prompt suffixed spaces are still needed. Please shout if it breaks. 2020-05-07 19:17:09 +02:00
Philippe Teuwen d6fd7f14d6 simpler ul_print_type 2020-05-07 19:14:53 +02:00
Philippe Teuwen eafeb47126 make style 2020-05-06 13:38:51 +02:00
dxl 4b41e36d49 Android platform adaptation(dxl) 2020-05-06 13:01:29 +02:00
Philippe Teuwen d118ba9e06 comment out unused iceIIR_Butterworth 2020-05-06 13:01:17 +02:00
dxl fcf0265704 missing include 2020-05-06 13:01:17 +02:00
iceman1001 70add3fabe fix: "trace list" too short array for explanation 2020-05-06 12:14:05 +02:00
iceman1001 6dadbb0423 chg: rpi aling warning 2020-05-05 08:19:26 +01:00
Philippe Teuwen 30e96ece74 lf nedap: fix cast align warning 2020-05-05 00:16:53 +02:00
Philippe Teuwen 2c250d5d14 hf epa: fix cast align warning 2020-05-04 23:58:58 +02:00
Philippe Teuwen e68dd9e5cb update whereami and avoid compiling unnneded troublesome parts 2020-05-04 23:18:00 +02:00
Philippe Teuwen 99381b4386 fix defined 2020-05-04 01:48:07 +02:00
Philippe Teuwen 58f71d97f5 silent some bad-function-cast 2020-05-04 01:18:26 +02:00
Philippe Teuwen 723503b74e unshadow vars 2020-05-03 22:50:03 +02:00
Philippe Teuwen c94eae0046 fix warning about cast realignment, WIP 2020-05-03 17:34:01 +02:00
Philippe Teuwen ed1fb14f5f rework C includes in C++ 2020-05-03 12:46:46 +02:00
Philippe Teuwen 19be62f7e6 stricter warnings: Wredundant-decls 2020-05-03 12:38:34 +02:00
Philippe Teuwen 3529aea157 stricter warnings, wip 2020-05-03 01:13:28 +02:00
Philippe Teuwen 9358554884 stricter warnings, wip 2020-05-03 00:33:28 +02:00
Philippe Teuwen 0e39cb8e34 stricter warnings, wip 2020-05-02 23:54:27 +02:00
iceman1001 796cd36f85 chg: better error message when serial port allocation fails 2020-05-02 19:24:52 +02:00
iceman1001 96f03b4933 chg: leanient parsing of tcp:/bt:/socket: vars 2020-05-02 17:52:22 +01:00
iceman1001 fa44eee82c chg: "lf sim" - now only fills until bigbuffer is full 2020-04-29 20:33:29 +02:00
Philippe Teuwen 31ccc7d7ca hardnested: don't drop field when in test mode 2020-04-29 20:20:06 +02:00
Philippe Teuwen b3f84bf7b3 make style 2020-04-29 19:41:45 +02:00
iceman1001 5363385845 coverity fix 286655 2020-04-29 16:35:08 +02:00
Philippe Teuwen 7ca7677568 Linux: add native support for Bluetooth in client 2020-04-29 14:26:12 +02:00
iceman1001 cdb99fe650 cppchecker fix - duplicate 2020-04-28 22:58:05 +02:00
iceman1001 4896390dde cppchecker fix 2020-04-28 22:31:45 +02:00
iceman1001 a7ececcb5d cppcheck fix - duplicate condition 2020-04-28 22:26:16 +02:00
iceman1001 78cc7e10a5 cppcheck fix - duplicate condition 2020-04-28 21:53:01 +02:00
iceman1001 cd19bf81a8 cppcheck fix 2020-04-28 21:51:13 +02:00
iceman1001 0f5e4fe220 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-28 19:58:31 +02:00
iceman1001 d2e85b0040 coverity fix: shawdowfunction (stdio)\n. unsupported command shouldn't break execution (dfnames) 2020-04-28 19:58:15 +02:00
Philippe Teuwen fbd0a7e284 typo 2020-04-28 19:58:07 +02:00
iceman1001 857526a945 coverity fix 286651 2020-04-28 19:08:07 +02:00
iceman1001 12f87938ea coverity fix 279110 2020-04-28 18:51:24 +02:00
iceman1001 084a8161d4 coverity fix: 279106 2020-04-28 18:24:52 +02:00
Bjoern Kerler 3eee351f4f Return PM3_SUCCESS if iso df names not supported 2020-04-28 18:16:52 +02:00
iceman1001 7303dd8c5d coverity fix 279922 , div by zero 2020-04-28 14:51:47 +02:00
iceman1001 fa98a10b38 coverity fix 286651 2020-04-28 14:38:32 +02:00
iceman1001 0896cee51c coverity fix 286680 2020-04-28 14:35:00 +02:00
iceman1001 0759f886f4 coverity fix 286923 2020-04-28 14:33:45 +02:00
iceman1001 5e925962d3 coverity fix 286994 2020-04-28 14:32:12 +02:00
iceman1001 25c94177f8 coverity fix 286664 2020-04-28 14:31:29 +02:00
iceman1001 6a55330398 enforce PACKED structs 2020-04-28 13:53:43 +02:00
iceman1001 662d3259ca cppchecker fix, shadow var 2020-04-28 13:46:13 +02:00
iceman1001 f1df27e6bb cppchecker fix - better return value handling 2020-04-28 13:44:25 +02:00
iceman1001 19a5a70cc8 cppchecker fix, now use res 2020-04-28 13:36:24 +02:00
iceman1001 d98f8e96f4 chg: hf iclass loclass - use defines, cppchecker happy 2020-04-28 13:28:29 +02:00
iceman1001 cf9a5a4850 coverity fix 286921, 286922, .. 2020-04-26 19:29:22 +02:00
iceman1001 e36a8ca5fb coverity fix 286920 2020-04-26 19:28:58 +02:00
iceman1001 a3a7dfa5a1 coverity / cppchecker fixes : dont like that code style 2020-04-26 14:27:44 +02:00
iceman1001 00cac87fb2 coverity fix - resource leaks 2020-04-26 14:15:59 +02:00
iceman1001 5e51a72cae coverity fix 286678 - resource leak 2020-04-26 14:13:12 +02:00
iceman1001 2e2bfc17a0 coverity fix: 286678 2020-04-26 13:54:55 +02:00
iceman1001 dd5679a53a cppchecker fixes 2020-04-26 13:49:06 +02:00
iceman1001 f416fa9b4f cppchecker fixes 2020-04-26 12:56:19 +02:00
Philippe Teuwen 7cd509c77c make style 2020-04-26 11:18:04 +02:00
Philippe Teuwen 99eadded05 Merge branch 'settings'
* settings:
  Get/display a single preference
  Lighter msg for loading prefs, json will anyway always tell the filename
  Make sure colors and emoji are disabled when not on TTY
  Comment out file path code
  Pre Filepath cleanup
  Update preferences.c
  tuning
  streamline works
  Update fileutils.c
  updates
  clean up
  device debug and tweaks
2020-04-26 11:16:29 +02:00
mwalker33 572f46ceee Merge branch 'settings' of https://github.com/RfidResearchGroup/proxmark3 into settings 2020-04-26 10:20:23 +10:00
mwalker33 ba0b28a7de Get/display a single preference 2020-04-26 10:18:00 +10:00
Philippe Teuwen ae21a3148f Lighter msg for loading prefs, json will anyway always tell the filename 2020-04-25 15:17:11 +02:00
Philippe Teuwen a15d14e038 Make sure colors and emoji are disabled when not on TTY 2020-04-25 15:10:34 +02:00
Philippe Teuwen 0e1b1e166b Remove redundant debug stdin info now that we have PROXPROMPT_CTX_STDIN 2020-04-25 11:13:39 +02:00
mwalker33 a8ff7b4815 Comment out file path code 2020-04-25 18:37:23 +10:00
Philippe Teuwen 8725807a8c minor 2020-04-24 18:58:28 +02:00
Philippe Teuwen 011f973e7f make style 2020-04-24 18:21:38 +02:00
mwalker33 7fdaa51678 Pre Filepath cleanup 2020-04-24 16:45:17 +02:00
mwalker33 3aee4fc5e9 Update preferences.c 2020-04-24 16:45:17 +02:00
mwalker33 dd09d4074c tuning
File List optimised.
2020-04-24 16:45:17 +02:00
mwalker33 600e5d7d6f streamline works 2020-04-24 16:45:17 +02:00
mwalker33 5060a52b3a Update fileutils.c
Linux file permission fix
2020-04-24 16:45:17 +02:00
mwalker33 e2c56fe26c updates
Added dump and trace path and clean a little for cleaner use and expansion.
2020-04-24 16:45:17 +02:00
mwalker33 b593d2c319 clean up 2020-04-24 16:45:17 +02:00
mwalker33 49c6806b1b device debug and tweaks 2020-04-24 16:45:17 +02:00
Philippe Teuwen 25c1f31222 fix includes 2020-04-22 14:14:13 +02:00
Philippe Teuwen 65d9408879 prompt: [usb|script] style 2020-04-22 12:24:21 +02:00
Philippe Teuwen 7760dd77e5 Add context to prompt 2020-04-22 12:22:24 +02:00
Philippe Teuwen 1f5544330c prompt: filter ansi before calling readline 2020-04-22 09:32:32 +02:00
Philippe Teuwen 8bdda55115 Fix prompt colors in log -> spurious space in color macros -> adjust lots of files... 2020-04-22 02:22:55 +02:00
Philippe Teuwen f83d4b6c16
Merge pull request #699 from bkerler/mfdes_devel
Add hf mf des chk and dump commands
2020-04-21 23:23:01 +02:00
Philippe Teuwen a68b8983f2 make style 2020-04-21 01:56:51 +02:00
Philippe Teuwen 07f3022aa6 make/cmake add common_fpga 2020-04-19 13:01:51 +02:00
Philippe Teuwen 2676740fb3 make/cmake: remove weirdy include paths like src/uart/../crypto 2020-04-19 12:53:46 +02:00
Philippe Teuwen 5f4385986c cleaning makefile & cmake 2020-04-19 12:40:46 +02:00
Nahuel Grisolia 7e18a331d9 Fix uint8 vs uint32 interval number for tearoff experiment 2020-04-18 18:56:11 -03:00
Nahuel Grisolia c73c09cbf6 Updated help and default values 2020-04-18 18:33:09 -03:00
Nahuel Grisolía da81424348 OTP-TEAR 2020-04-18 21:37:31 +02:00
Bjoern Kerler b41c5769e7 Fix DESFIRE_UNKNOWN 2020-04-18 18:35:50 +02:00
Philippe Teuwen 26c28c188a minor 2020-04-18 18:20:19 +02:00
Philippe Teuwen dc6b751ea3 cmake: rework includes, wip, need to modify more src after merge 2020-04-18 16:27:20 +02:00
Bjoern Kerler 4b3a78538c HF MFDES dump + chk commands added 2020-04-17 21:06:32 +02:00
iceman1001 69142baa7f chg: "hf topaz info" - textual 2020-04-17 10:30:18 +02:00
iceman1001 40c69b3f83 chg: "lf hitag info" - added HITAG type detection (Thanks! @cosmo61) 2020-04-17 10:29:54 +02:00
iceman1001 b0854bb3aa chg: SOCKET: connections (@xianling1998) 2020-04-16 16:46:45 +02:00
iceman1001 1bf32aad90 Chg: android adaptions from @xianglin1998 2020-04-16 16:46:09 +02:00
Bjoern Kerler 81bc0bc2b9 Reorder client src directories 2020-04-16 10:53:24 +02:00