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

6122 commits

Author SHA1 Message Date
iceman1001 16f5107915 cppcheck mem leak 2020-05-13 23:30:42 +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
Philippe Teuwen 2819792f8e Revert "fix osx" 
This reverts commit 09903384fa.
 2020-05-12 00:27:21 +02:00
Philippe Teuwen d2f9fb6084 fix hardnested switch-enum 2020-05-12 00:26:55 +02:00
iceman1001 09903384fa fix osx 2020-05-12 00:25:44 +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
Philippe Teuwen b40c8dd5d2 tinycbor: avoid overriding cflags, hide warnings 2020-05-11 13:47:19 +02:00
iceman1001 11884df687 textual 2020-05-11 11:45:45 +02:00
iceman1001 e94c61ee1a Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-05-11 11:45:04 +02:00
Philippe Teuwen 2f293e211a show compiler version 2020-05-11 10:21:32 +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 4d34c8d4d5 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-05-11 01:14:04 +02:00
iceman1001 280b7d9c46 chg: 'lf nexwatch demod' - correct parity calc 2020-05-11 01:13:58 +02:00
Philippe Teuwen 8a9c7d2efc argtable3: fix buffer overrun 
This bug was suddently triggered by Appveyor compilation and seems to make sense.

[-] CC argtable3.c

    inlined from 'arg_cat_option' at argtable3.c:4208:13,
    inlined from 'arg_print_syntax' at argtable3.c:4392:9:
argtable3.c:4149:11: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=]
 4149 |     *dest = 0;
      |     ~~~~~~^~~
argtable3.c: In function 'arg_print_syntax':
argtable3.c:4381:14: note: at offset 200 to object 'syntax' with size 200 declared here
 4381 |         char syntax[200] = "";
      |              ^~~~~~
 2020-05-10 23:59:46 +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
Philippe Teuwen 394397c54e silent tinycbor warnings 2020-05-09 12:56:40 +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
iceman1001 36cad6f51a textual 2020-05-08 18:12:39 +02:00
Philippe Teuwen ff7b7b3a6f proper filtering of RL markers 2020-05-08 18:12:10 +02:00
Philippe Teuwen f97516ca38 textual coherence 2020-05-08 17:42:37 +02:00
Philippe Teuwen 68cb1efe14 Clean deps just in case 2020-05-08 17:40:13 +02:00
Philippe Teuwen c24df1547a android cmake: remove c99 restriction 2020-05-08 17:04:28 +02:00
Philippe Teuwen a2b776ed1e Remove redundant def 2020-05-08 17:04:28 +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 94d4f2b75e fix cmake for reveng 2020-05-07 14:45:53 +02:00
Philippe Teuwen b9f6f096aa hook reveng outputs to pm3 machinery, add regression test 2020-05-07 14:20:49 +02:00
Philippe Teuwen a9964f4f51 Merge branch 'android_lib' 
* android_lib:
  make style
  cmake android: add backslashes for host compatibility
  Translation some comments from Chinese to English.
  Android cmake: use common cmake files for deps
 2020-05-07 12:20:02 +02:00
Philippe Teuwen b34851d281 make style 2020-05-07 12:19:46 +02:00
Philippe Teuwen 00b5841597 cmake android: add backslashes for host compatibility 2020-05-07 12:13:52 +02:00
dxl e8999f3318 Translation some comments from Chinese to English. 2020-05-07 16:57:15 +08:00
Philippe Teuwen 3c9a19d4c1 Revert "update argtable3" 
It was an attempt to solve the mysterious reveng getopt bug
but it brings more troubles and throws away multi-platform pm3 tuning

This reverts commit f3790a89a5.
 2020-05-07 01:00:40 +02:00
Philippe Teuwen 2fcad93efc proper way to fix reveng getopt bug 2020-05-07 00:23:19 +02:00
Philippe Teuwen a2a5700a85 fix reveng getopt bug 2020-05-06 23:33:55 +02:00
Philippe Teuwen f3790a89a5 update argtable3 2020-05-06 23:33:30 +02:00
Philippe Teuwen 59453aea8b Android cmake: use common cmake files for deps 2020-05-06 15:33:31 +02:00
Philippe Teuwen 53af4304c1 cmake deps: add prefix pm3rrg_rdv4_ 2020-05-06 15:21:29 +02:00
Philippe Teuwen 9478dbc071 cmake deps: add -fPIC so they can be integrated in a pm3 shared lib 2020-05-06 15:20:43 +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
dxl 78ee43c9c4 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
dxl 021ee95e07 don't mix ifdef and defined 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 4d4984657e activate more warnings and ease their mgmt 2020-05-03 19:46:11 +02:00
Philippe Teuwen c94eae0046 fix warning about cast realignment, WIP 2020-05-03 17:34:01 +02:00
Philippe Teuwen 82ad1b683a bug ifneq <> ifeq 2020-05-03 12:50:33 +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 6221d28e43 cflags 2020-05-03 12:19:42 +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
Philippe Teuwen 6d0afbdbf3 Revert "client Makefile: link with pthread only if needed" 
This reverts commit 43b69bd4e4.
 2020-05-01 00:28:28 +02:00
Philippe Teuwen 43b69bd4e4 client Makefile: link with pthread only if needed 2020-05-01 00:25:04 +02:00
Philippe Teuwen f158f347e5 reveng Makefile: allow to skip test (e.g. for cross-compilation) 2020-05-01 00:13:56 +02:00
Philippe Teuwen 40c596e8af client Makefile: allow to add includes (e.g. for termux) 2020-05-01 00:08:07 +02:00
Uli Heilmeier f9eb1d3d77 Makefile: fix PKG_CONFIG_ENV 
renaming PKG_CONFIG_PATH to PKG_CONFIG_ENV was too greedy
 2020-04-29 22:52:41 +02: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 07f41da74d fix coverity 226490 even if in practice next_common_bits is never > 7 2020-04-29 20:11:43 +02:00
Philippe Teuwen b3f84bf7b3 make style 2020-04-29 19:41:45 +02:00
Philippe Teuwen 250418f64b client Makefile: make sure to rebuild deps when needed 2020-04-29 19:18:01 +02:00
iceman1001 85f2233161 coverity fix 226496 226492 226490 2020-04-29 17:27:17 +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
netvader eea4e5b147
Update aid_desfire.json 2020-04-26 09:08:43 +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 9bd5f27414 Rename PKG_CONFIG_PATH so it can be overruled by env 2020-04-26 01:24:33 +02: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 ad3267cec1 fix osx, hopefully 2020-04-25 01:16:39 +02:00
Philippe Teuwen ebd476a9c5 hardnested make: fix default compiler 2020-04-24 21:45:46 +02: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 fbe4e20326 remove c99 and c++11 restrictions 2020-04-24 16:43:21 +02:00
Philippe Teuwen 8c84d21a92 makefile: limit -D_ISOC99_SOURCE to Mingw 2020-04-24 16:42:41 +02:00
Philippe Teuwen d6564e8eca fix cmake for mingw 2020-04-24 00:08:42 +02:00
Philippe Teuwen 02d83c2ebf Moving mfc_gen3_writer.lua to a branch till it becomes useable 2020-04-23 20:26:07 +02:00
netvader b5d07ab914
Update aid_desfire.json 2020-04-23 17:27:16 +02:00
unknown d041f3fc82 Fixed a block key check 2020-04-22 18:59:02 +03:00
Philippe Teuwen 7c27931685 cmake qt fix regression 2020-04-22 15:31:44 +02:00
Philippe Teuwen 05e7def3d5 cmake & rpi, take 2 2020-04-22 14:57:30 +02:00
Philippe Teuwen 869d96f118 cmake: fix rpi 2020-04-22 14:14:28 +02:00
Philippe Teuwen 25c1f31222 fix includes 2020-04-22 14:14:13 +02:00
Philippe Teuwen 00248d9aa7 cmake: less verbose when no Qt present 2020-04-22 13:55:28 +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 3235468e05 make style 2020-04-21 23:24:01 +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 31d3f519c7 rename scritp accordingly to its own help 2020-04-21 22:51:36 +02:00
Philippe Teuwen 73c4a37684
Merge pull request #707 from Windslab/master 
A lot of improvements
 2020-04-21 21:22:07 +02:00
Philippe Teuwen a68b8983f2 make style 2020-04-21 01:56:51 +02:00
Philippe Teuwen 31e79905f8 Clean more old paths 2020-04-21 01:44:31 +02:00
unknown aae1f3c881 A lot of improvements 2020-04-20 20:29:32 +03:00
Philippe Teuwen 69b6a8f7f9 make clean: remove also old stuff 2020-04-19 16:31:25 +02:00
Philippe Teuwen e4dea67cf3 rework reveng<>cliparser 2020-04-19 13:13:13 +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 4967096e3b make/cmake cliparser lib and remove redundant getopt from reveng 2020-04-19 12:40:50 +02:00
Philippe Teuwen 5f4385986c cleaning makefile & cmake 2020-04-19 12:40:46 +02:00
Philippe Teuwen 8ea0f19181 minor 2020-04-19 00:59:02 +02:00
Philippe Teuwen 43d88c40e5 minor 2020-04-19 00:58:13 +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
Philippe Teuwen a04c8cb41c cosmetic 2020-04-18 20:42:38 +02:00
Philippe Teuwen f94a98b9c6 cmake qt5: no need for custom command if AUTOMOC? 2020-04-18 20:14:18 +02:00
Philippe Teuwen 17aacae8d3 fix clean path after src reorg 2020-04-18 20:13:46 +02:00
Philippe Teuwen 45134859cf cmake: remove unneeded PIC in hardnested lib 2020-04-18 20:01:51 +02:00
Philippe Teuwen c2ff11f321 hardnested compilation reorganized to be similar with cmake approach 2020-04-18 19:41:14 +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 f9857a8b0c cmake: add cflags 2020-04-18 17:37:11 +02:00
Philippe Teuwen dc6b751ea3 cmake: rework includes, wip, need to modify more src after merge 2020-04-18 16:27:20 +02:00
Philippe Teuwen f32974bb07 cmake libs static 2020-04-18 16:27:20 +02:00
Philippe Teuwen 2aa587f35f cmake: reveng keep includes local 2020-04-18 16:27:20 +02:00
Philippe Teuwen b5ce5c1d99 cmake: mbedtls keep includes local 2020-04-18 16:27:20 +02:00
Philippe Teuwen 1ccd764837 cmake: hardnested 2020-04-18 16:27:20 +02:00
Philippe Teuwen c5d2655ebe cmake: fix reveng defines, keep them local 2020-04-18 16:27:20 +02:00
Philippe Teuwen 0b68f3b81e cmake: fix zlib defines, keep them local 2020-04-18 16:27:20 +02:00
Philippe Teuwen b7fb3b0746 cmake: fix jansson defines, keep them local 2020-04-18 16:27:20 +02:00
Philippe Teuwen 0fc5c41a49 cmake: fix liblua platform definitions to match regular Makefile 2020-04-18 16:27:20 +02:00
Philippe Teuwen 397f46c0ef cmake: Fix the (not yet used) amiibo srcs 2020-04-18 16:27:20 +02:00
Philippe Teuwen 01432fd84b Lower cmake min version to 3.10 for WSL 2020-04-18 16:24:29 +02:00
Philippe Teuwen 1a344a933d Remove header files from CMakeLists 2020-04-18 16:24:29 +02:00
Uli Heilmeier 18f875cb84 cmake macOS: use brew installed readline 2020-04-18 16:24:29 +02:00
Uli Heilmeier c888fcdb7e Fix cmake qt: remove REQUIRED 2020-04-18 16:24:29 +02:00
TrustedUser 5003434885 ¨fix: osc cmake 2020-04-18 16:24:29 +02:00
Uli Heilmeier 6562c22029 Fix qt5_found handling 2020-04-18 16:24:29 +02:00
Uli Heilmeier 64e7aa4c46 cmake: fix qt handling for macos 
This is like we find qt in the Wireshark project.

Tested it with macOS. Not tested with Linux, Windows etc.
 2020-04-18 16:24:29 +02:00
Iceman 4e233c682d Update CMakeLists.txt 2020-04-18 16:24:29 +02:00
Philippe Teuwen ad28dc1fa0 cmake: remove custom rule for .ui, we already have AUTOUIC 2020-04-18 16:24:29 +02:00
Philippe Teuwen fdccfb2b88 add cmake build in Travis 2020-04-18 16:24:29 +02:00
Bjoern Kerler 78a5e666bb Fix QT5 GUI CMake 2020-04-18 16:24:29 +02:00
Bjoern Kerler 6b1a8b8390 Add cmake support 2020-04-18 16:24:29 +02:00
Philippe Teuwen edb96e75cf Add QT_NO_DEBUG flag 2020-04-18 12:20:42 +02:00
Philippe Teuwen 7acc43fe9f Removing debug flag 2020-04-18 12:10:03 +02:00
Bjoern Kerler 0762d29bb3 Another key 2020-04-17 21:37:16 +02:00
Bjoern Kerler 68747f5bbd More keys 2020-04-17 21:25:13 +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
Philippe Teuwen 315cda0754
Merge pull request #692 from kalekume/patch-2 
Added new AID F001D0
 2020-04-16 11:58:35 +02:00
Bjoern Kerler 81bc0bc2b9 Reorder client src directories 2020-04-16 10:53:24 +02:00
kalekume 68f269ee3d
Added new AID F001D0 2020-04-16 10:36:42 +02:00
Philippe Teuwen 94192d0976 make style 2020-04-16 09:01:14 +02:00
iceman1001 588f7e98f5 more aid:s-... 2020-04-16 08:12:08 +02:00
netvader 6ad5c1f872
Update aid_desfire.json 2020-04-15 09:55:55 +02:00
Iceman 4a7d2838ec
Merge pull request #688 from mwalker33/Settings-2 
Quick Fix
 2020-04-15 09:47:28 +02:00
mwalker33 bdc4aae6a6 Typo 2020-04-15 17:42:11 +10:00
Iceman 5c511d35a9
Merge pull request #687 from mwalker33/Settings-2 
Settings - full path name
 2020-04-15 09:34:51 +02:00
mwalker33 5545219f82 Update Full Path 2020-04-15 16:40:28 +10:00
iceman1001 71e1c5e53b added more DESFire aids 2020-04-15 07:56:55 +02:00
Iceman 23a0a6ece8
Merge branch 'master' into master 2020-04-14 22:03:04 +02:00
Ahmet Bilal Can 169d788fe9
add istanbulkart aid 2020-04-14 22:32:00 +03:00
Uli Heilmeier d67af053fc AID Desfire: Add clipper card 2020-04-14 21:27:41 +02:00
mwalker33 0b43252a02 Test code for full path 2020-04-14 19:17:00 +10:00
iceman1001 7ee49df717 Chg: updates from whereami repo. I am sure I broke something now 2020-04-14 09:24:08 +02:00
Bjoern Kerler 5fc922f6f9 Add Key display on enum 2020-04-14 00:35:22 +02:00
Bjoern Kerler 5c4148ec15 Fixes after pull 2020-04-13 23:56:04 +02:00
Bjoern Kerler 0ff31a9fa8 changes 2020-04-13 23:54:05 +02:00
Bjoern Kerler 49f93cbbd0 Implement several commands 2020-04-13 23:50:05 +02:00
iceman1001 abfcb524b5 minor coverity fixes 2020-04-13 14:47:36 +02:00
Iceman ba926addfb
Merge pull request #679 from uhei/clang-warn3 
cmdhfmfdes: Fix clang tautological-pointer-compare warning
 2020-04-13 14:25:48 +02:00
Uli Heilmeier dc002d224a cmdhfmfdes: Fix clang tautological-pointer-compare warning 
Fixes:  RfidResearchGroup/proxmark3#676
 2020-04-13 12:56:36 +02:00
Iceman ced45cf865
Merge pull request #678 from mwalker33/Settings-2 
getwd quick fix compile error
 2020-04-13 12:50:10 +02:00
mwalker33 fd5fe61462 getwd fix 2020-04-13 20:46:01 +10:00
Iceman e1c65296a3
Merge pull request #677 from mwalker33/Settings-2 
Settings 2
 2020-04-13 12:34:42 +02:00
mwalker33 acf4c09aa3 Update proxguiqt.h 
Cleanup
 2020-04-13 19:43:15 +10:00
mwalker33 dded69c989 Update proxmark3.c 
Disable use_prefence_file
 2020-04-13 19:35:19 +10:00
mwalker33 3b4f851d2d tweak save 2020-04-13 16:17:57 +10:00
mwalker33 0cc2bda952 Update preferences.c 
Error msg and show help if invalid option detected
 2020-04-13 14:39:16 +10:00
mwalker33 82bbea3874 Update preferences.c 2020-04-13 14:12:54 +10:00
mwalker33 c924e2d589 save on exit 2020-04-13 13:51:03 +10:00
mwalker33 b72123a093 Update preferences.c 2020-04-13 12:44:34 +10:00
mwalker33 0b360d4dc0 Preference commands rework 2020-04-13 12:12:47 +10:00
mwalker33 69eef755d3 Window Size/Pos Tracking 2020-04-13 09:32:47 +10:00
Bjoern Kerler 9c4cf973ab NONE is NULL 2020-04-13 01:26:44 +02:00
Bjoern Kerler e543637897 PICC Format fixes 2020-04-13 01:19:26 +02:00
Bjoern Kerler 30a044445a Add mifare desfire CreateStdDataFile 2020-04-13 00:59:01 +02:00
Bjoern Kerler 11ca483617
Merge pull request #25 from RfidResearchGroup/master 
Update
 2020-04-12 21:29:33 +02:00
iceman1001 99d7a0a1c9 chg: hf mfu ndef - better message when failed to find a mfu tag 2020-04-12 21:27:32 +02:00
iceman1001 4cc6d3858d fix: no error message when para was zero 2020-04-12 21:23:52 +02:00
Bjoern Kerler b90539f2f0 Port des on client to mbedtls_des 2020-04-12 21:02:15 +02:00
Bjoern Kerler f234c34d1c Update 2020-04-12 20:59:27 +02:00
Bjoern Kerler c06864dcc7 Rename due to name conflict 2020-04-12 18:09:14 +02:00
Bjoern Kerler 44e9d13d1a Make style 2020-04-12 17:41:36 +02:00
Bjoern Kerler f76de40982 Rework auth for client and device 2020-04-12 17:39:11 +02:00
Bjoern Kerler b0af460a6e
Merge pull request #24 from bkerler/master 
Update
 2020-04-12 17:11:47 +02:00
Bjoern Kerler 7aa27cfefb Auth of des, 3des and aes working. 2020-04-12 17:10:27 +02:00
mwalker33 4177f51770 Update proxguiqt.cpp 2020-04-12 20:59:18 +10:00
mwalker33 ce38dd92ba Update proxguiqt.cpp 2020-04-12 20:42:10 +10:00
mwalker33 87e58442fb Update proxguiqt.cpp 2020-04-12 20:36:05 +10:00
mwalker33 7fa8587dd2 Plot Windows Move Realtime 2020-04-12 20:24:56 +10:00
mwalker33 5df9d3d8f7 fix 
use autocreate pref file.
user pref for color/emoji linux
 2020-04-12 19:49:17 +10:00
iceman1001 682bded18a starting with a application id file for desfire, for known application id:s. 2020-04-12 11:14:10 +02:00
iceman1001 3454076901 chg: make which key to use more promenent 2020-04-12 11:07:20 +02:00
iceman1001 3cae25aa87 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-12 10:56:39 +02:00
mwalker33 6d08936f04 Update cmdhfmf.c 
key table format fix. (extra space)
 2020-04-12 17:56:29 +10:00
iceman1001 2476ce509b Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-12 09:55:46 +02:00
Iceman 04f8adbf32
Merge pull request #671 from mwalker33/Settings-2 
Settings - Update
 2020-04-12 09:06:51 +02:00
mwalker33 ac8c139867 Update preferences.c 2020-04-12 13:08:02 +10:00
mwalker33 c9bd43c4b6 Edit and Updates 
Changed from settings to preferences.
Added UTF8 Banner support
Added Show/Edit draft
 2020-04-12 13:07:25 +10:00
iceman1001 309020c64c more error messages when failing parsing 2020-04-11 20:41:05 +02:00
Iceman de0768fadc
Merge pull request #669 from bkerler/authtest 
Fix bug for file id handling in hf mf des enum :)
 2020-04-11 13:26:14 +02:00
Bjoern Kerler 0c407504b3 Fix file ids handling 2020-04-11 13:14:16 +02:00
Iceman b387196cf2
Merge pull request #666 from bkerler/authtest 
Rewrite and fix hf mfdes auth
 2020-04-11 11:52:09 +02:00
Bjoern Kerler 637103224d Fixes 2020-04-11 11:32:31 +02:00
mwalker33 1900f6b16a Overlay 2020-04-11 17:26:43 +10:00
Iceman b643c70f0d
Merge pull request #668 from mwalker33/Settings-2 
Settings Update
 2020-04-11 07:40:46 +02:00
Bjoern Kerler f71e7438f7 Improve DecodeFileSettings log 2020-04-11 03:10:02 +02:00
Bjoern Kerler 37aa19ad6c Add 2k3 des iso support preparation 2020-04-11 02:56:08 +02:00
Bjoern Kerler 4c2f98ac3d Add first 3K3 support. Improve algo error handling 2020-04-11 02:32:55 +02:00
Bjoern Kerler 9b26fab1c2 Further auth info fixes 2020-04-11 01:41:39 +02:00
Bjoern Kerler 327d8a8bfe Further aid and auth info fixes 2020-04-11 01:38:47 +02:00
Bjoern Kerler 93e4a66971 Improve UI handling and fix AID/FID display 2020-04-11 00:31:55 +02:00
mwalker33 7fa7eeba97 Update settings.c 2020-04-11 08:21:16 +10:00
Bjoern Kerler c6323a5fe1 Fix bad bug. Don't check dest for NULL 2020-04-10 23:45:54 +02:00
Bjoern Kerler 52b41fc883
Merge pull request #22 from RfidResearchGroup/master 
Update
 2020-04-10 23:01:52 +02:00
Bjoern Kerler 70b000bc79 Make style 2020-04-10 22:59:55 +02:00
Bjoern Kerler 8f3a02fc50 Add Deselect on info and enum 2020-04-10 22:56:45 +02:00
Bjoern Kerler 08469f940a Replace MIX and OLD Commands 2020-04-10 22:52:16 +02:00
Bjoern Kerler 68faa88e6a Auth test 2020-04-10 21:02:46 +02:00
mwalker33 933d7523f7 Tweaks and supports_colors 2020-04-10 19:51:08 +10:00
iceman1001 bb0b368e68 fix... 2020-04-10 10:50:17 +02:00
iceman1001 8e74978855 code fixes, better handling of card identification and outputs accordingly. 2020-04-10 10:31:18 +02:00
iceman1001 69732ef709 better identification of PLus vs Plus EV1. Be verycareful of that WRITEPERSO cmd inside INFO to detect card type. No good at all 2020-04-10 10:30:37 +02:00
iceman1001 df0aaa020d fix: string too short 2020-04-10 10:28:52 +02:00
iceman1001 0e2ac41717 annotage desfire more 2020-04-10 10:28:15 +02:00
mwalker33 9fc232390b Update Client debug level 2020-04-10 18:20:02 +10:00
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
Bjoern Kerler cd35b60d13 Minor typo 2020-04-10 01:26:37 +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 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
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
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
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 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
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
iceman1001 285de43444 textual 2020-04-08 13:37:48 +02:00
iceman1001 0aa18f3008 add test command for developing desfire 2020-04-08 13:26:44 +02:00
iceman1001 a086754279 earlier test 2020-04-08 05:26:39 +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
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 61f3ef61de Fix issue #646 2020-04-07 18:27:46 +02:00
iceman1001 42063994e9 add: hf mfdes list 2020-04-07 09:23:34 +02:00
Bjoern Kerler f01c37aff4
Merge pull request #13 from RfidResearchGroup/master 
fix:  'trace list des' - now deals with wrapped native commands
 2020-04-07 09:18:35 +02:00
Bjoern Kerler 26975187ee Fix desfire aes authentification 2020-04-07 09:14:44 +02:00
iceman1001 ab8b9884a6 fix: 'trace list des' - now deals with wrapped native commands 2020-04-07 09:07:18 +02:00
iceman1001 53178e8b23 chg: hf mfdes enum - now get fileids and settings 2020-04-06 18:23:42 +02:00
Bjoern Kerler 1620a889f7 Log and Typos corrected 2020-04-06 16:26:01 +02:00
iceman1001 85c4f63015 chg: in preparation for EV3 2020-04-06 15:44:58 +02:00
iceman1001 3519dea0cf simpler 2020-04-06 15:25:56 +02:00
Bjoern Kerler 0bcc2a9025 Revert DropField commit 2020-04-06 15:14:16 +02:00
Bjoern Kerler 27ed590d73 Add DropField() when errors happen 2020-04-06 14:30:21 +02:00
Bjoern Kerler b4b56aa34f
Merge pull request #7 from bkerler/master 
Update
 2020-04-06 14:04:13 +02:00
Bjoern Kerler 50c6a9223d Add NTAG handling, fix TNP3xxx, remove ISO 14443-B card uids 2020-04-06 13:59:01 +02:00
iceman1001 b6e85c865d more settings emoji, hints. 2020-04-06 10:54:58 +02:00
Iceman 2427d1430e
Merge pull request #650 from mwalker33/Settings 
Settings Base
 2020-04-06 10:45:58 +02:00
Iceman d10f2b5a2a
Merge pull request #649 from bkerler/improve_14a_info 
Improve 14443-a info
 2020-04-06 10:44:44 +02:00
iceman1001 173583a548 fix coverity 278900 2020-04-06 09:46:22 +02:00
mwalker33 f0b0d10ee1 Comment out test calls 2020-04-06 16:36:12 +10:00
mwalker33 7b14fd7212 Code Clean 2020-04-06 16:20:57 +10:00
iceman1001 f461a4e5fb fix coverity 278907, 278906 2020-04-06 08:03:30 +02:00
iceman1001 fcf7bd24a6 fix coverity 278907, 278906 2020-04-06 08:02:48 +02:00
iceman1001 97ef641fad coverity fix, format specifier 2020-04-06 07:29:39 +02:00
iceman1001 b8bbc1d0a5 filename checks 2020-04-06 07:29:12 +02:00
iceman1001 97f06ddcfb coverity fixes 2020-04-06 07:15:34 +02:00
iceman1001 e1c64d3eef text 2020-04-06 06:56:23 +02:00
iceman1001 a32f1520db chg: hf legic eload/esave - always available 2020-04-06 06:55:51 +02:00
iceman1001 961eb193d1 text 2020-04-06 06:55:12 +02:00
iceman1001 227900efee eload/esave skeleton for cryptorf 2020-04-06 06:54:53 +02:00
iceman1001 5e9e6a9ad8 prepp hookup for cryptorf cmds 2020-04-06 06:17:05 +02:00
iceman1001 e0ff7d0338 cryptorf skeleton cmds -WIP- 2020-04-06 06:16:32 +02:00
iceman1001 4df7c3bf03 coverity fixes 2020-04-06 06:05:02 +02:00
Bjoern Kerler ca51fee02e Add ST uid infos 2020-04-06 00:00:53 +02:00
Bjoern Kerler e4187ef8a1
Merge pull request #5 from RfidResearchGroup/master 
Update
 2020-04-05 21:36:44 +02:00
Bjoern Kerler 25bcd6b89c Improve 14444-3a card detection 2020-04-05 21:33:41 +02:00
iceman1001 aa642d5d1e ax 2020-04-05 18:27:54 +02:00
iceman1001 0029f6fceb minor fixes. wrong params, helptext 2020-04-05 17:02:41 +02:00
iceman1001 0263273ec3 fix: wrong paramname 2020-04-05 17:00:16 +02:00
iceman1001 214bb46e9c fix: hf mfu ndef - ul ev1 48 bytes with a NDEF otp. e1101200, max size mismatch. Now it will select smallest 2020-04-05 16:59:14 +02:00
iceman1001 3a2723ac63 style 2020-04-05 14:53:32 +02:00
iceman1001 acfe18e7e9 rename to lower 2020-04-05 14:18:07 +02:00
Iceman 7e585eab6c
Merge pull request #647 from uhei/legic-clone 
Legic_clone.lua: Refactor to work with current command set
 2020-04-05 14:14:41 +02:00
Uli Heilmeier eac19be414 Legic_clone.lua: Adopt last command changes 2020-04-05 13:16:14 +02:00
Uli Heilmeier 16b14aa0e6 Legic_clone.lua: Refactor to work with current command set 
Refactored to work with current command set and MIM256 and MIM1024 tags
 2020-04-05 13:07:30 +02:00
iceman1001 175a5718b0 colors 2020-04-05 12:56:35 +02:00
iceman1001 2474385ab0 colors 2020-04-05 12:49:25 +02:00
iceman1001 95bc1230d7 colors 2020-04-05 12:41:38 +02:00
mwalker33 8fea6cddf7 Concept 2020-04-05 20:36:39 +10:00
iceman1001 2010f8db03 colors 2020-04-05 12:28:49 +02:00
iceman1001 3464dc2ebe helptext colors 2020-04-05 10:05:14 +02:00
iceman1001 7d9c0ebc91 text 2020-04-05 08:52:53 +02:00
iceman1001 33f94612eb color 2020-04-05 08:50:31 +02:00
iceman1001 79515b40b9 color 2020-04-05 08:50:16 +02:00
iceman1001 f13308783f textual @ikarus 2020-04-05 07:58:00 +02:00
Bjoern Kerler 99838b958e Minor fixes, styles adaption 2020-04-05 00:07:05 +02:00
Bjoern Kerler ee60aece68 Improve logging, fix key labels 2020-04-04 18:23:51 +02:00
iceman1001 00bd76e99d text, colors 2020-04-04 12:39:22 +02:00
iceman1001 34adf411c3 layout, text, colors - mfu info, 15 info 2020-04-04 12:17:55 +02:00
ikarus cf44a44575 fix: legic deobfuscate length. 2020-04-04 12:05:26 +02:00
iceman1001 4e3976bab1 textual 2020-04-04 07:22:03 +02:00
iceman1001 945bbe6311 fix: using the right sized param, helps.. 2020-04-04 07:03:30 +02:00
iceman1001 a4ce672d12 cmds list rearrange 2020-04-03 21:34:30 +02:00
iceman1001 260ae4ac19 chg: hf legic rdbl - short params now used. hf legic rdbl o 0 l 16 2020-04-03 21:30:11 +02:00
iceman1001 45223ee5d5 added obsfuscation optionally for dump/restore/eload/esave, consider it wip. As of byte 22. 2020-04-03 20:51:01 +02:00
iceman1001 e0d27d0ea3 remake of HF LEGIC commands input parameters, filename templates and renaming of commands in order to be unified across the client\nhf legic wrbl\nhf legic rdbl\nhf legic esave\nhf legic eload\n WIP, 2020-04-03 19:51:31 +02:00
iceman1001 1ac4c54d93 chg: 'hf legic dump' - now save BIN/EML/JSON, and uses new filename template. filename parameter is changed from O to F, to follow better client\n hf legic dump\n hf legic dump f mydump 2020-04-03 17:59:54 +02:00
iceman1001 24f2f1d341 Chg: 'hf topas reader' got split up into two, 'hf topaz info' which prints detailed information, and reader just prints UID. Now also prints NDEF 2020-04-03 17:39:10 +02:00
iceman1001 c819121d2b Chg: hf search - now continues to search, in case of dual tech cards. Thanks to @ikarus23 2020-04-03 17:37:46 +02:00
iceman1001 dfb3755db5 removed some test code 2020-04-03 14:07:32 +02:00
iceman1001 731e711e34 updated helptexts 2020-04-03 09:23:34 +02:00
iceman1001 0f662846f4 updated helptexts 2020-04-03 09:11:12 +02:00
iceman1001 98553439aa change 'hf iclass readtagfile' - improved param handling, better helptext, f filename s startblock e endblock 2020-04-03 08:36:55 +02:00
iceman1001 1b6164be07 change, sprint_hex no long has an extra space in the end. This will break some output designs 😄 2020-04-03 08:35:32 +02:00
iceman1001 3484cf1655 text and return codes 2020-04-03 07:22:54 +02:00
iceman1001 4418281284 chg: 'hf mfu ndef' - text record now correctly decode language and text parts. Thanks @bettse! 2020-04-02 21:16:28 +02:00
Iceman ae44e21f93
Merge pull request #634 from dunderhay/master 
Add colour to hf mf chk and fchk output
 2020-04-02 19:50:17 +02:00
merlokk 13d3b38eee byte order according to http://apps4android.org/nfc-specifications/NFCForum-TS-Type-2-Tag_1.1.pdf 
page 10,
sample: page 31
 2020-04-02 20:26:46 +03:00
merlokk 627499247f TLV ndef lock and memory control decoding 2020-04-02 20:21:51 +03:00
merlokk e64e5fb65c added some ndef tlv types 2020-04-02 18:42:44 +03:00
Daniel Underhay f0ffe79569 Add colour to hf mf chk and fchk output 2020-04-03 00:14:15 +11:00
iceman1001 16110985ca text 2020-04-02 09:34:52 +02:00
iceman1001 47d43cfc56 text 2020-04-02 09:34:03 +02:00
iceman1001 61e59fa913 fix: 'hf mfu ndef - sig2 uses wrong index 2020-04-02 09:25:04 +02:00
iceman1001 3b4d5b5676 remove dublicate 2020-04-02 08:25:24 +02:00
iceman1001 b91c4977af textual 2020-04-02 08:14:31 +02:00
iceman1001 761860656e more pulic keys (@anon) 2020-04-02 08:09:18 +02:00
iceman1001 1bb9b2b112 chg: fixed the h param in filename became help bug 2020-04-02 07:55:35 +02:00
iceman1001 0c7ae02da4 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-02 06:39:40 +02:00
iceman1001 d67c55cd2a entries from taginfo app\n removed duplicates 2020-04-02 06:38:45 +02:00
iceman1001 cc6fda9b75 added checks for unknown public keys 2020-04-01 15:54:59 +02:00
iceman1001 07d16bba51 added some more originality keys 2020-04-01 15:10:50 +02:00
iceman1001 3f54fdf252 textual 2020-04-01 09:49:11 +02:00
iceman1001 b0a76d5f02 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-01 09:28:14 +02:00
iceman1001 d633340a1a Chg: 'data ndef' - cleaner output if called with no hex 2020-04-01 09:26:39 +02:00
iceman1001 83e92c6455 Add: 'hf mfu ndef' - read and parse NDEF type2 records 2020-04-01 09:25:54 +02:00
merlokk 737ebf9ab8 ndef signature1 length fix 2020-03-31 19:26:09 +03:00
merlokk 6d3c13c49a fix mfp behavior in info command 2020-03-31 19:13:03 +03:00
merlokk 5b9c51fb7e signature decode r and s works 2020-03-31 18:30:44 +03:00
merlokk 38004f9db5 decode works 2020-03-31 18:25:17 +03:00
merlokk 74243fcb03 signatures v1 and v2 2020-03-31 18:09:41 +03:00
iceman1001 8dd19a00c5 support v2.0 ndef sigs 2020-03-31 16:11:01 +02:00
iceman1001 5618f71ac7 textual 2020-03-31 15:56:34 +02:00
iceman1001 160f150dce fixing NDEF 2020-03-31 15:47:33 +02:00
iceman1001 6eb36c5438 added new command 'data ndef' - for easy decoding of NDEF messages inside pm3 client 2020-03-31 15:33:07 +02:00
iceman1001 e13a25902f added more sigs 2020-03-31 08:11:27 +02:00
iceman1001 978dde98a9 added more sigs 2020-03-31 08:06:45 +02:00
iceman1001 8eef5d188c fix coverity 226432 2020-03-30 22:25:00 +02:00
iceman1001 4178017536 chg: hf legic dump - change filename template 2020-03-30 15:18:25 +02:00
Iceman a1ae0523ac
Merge pull request #626 from Windslab/patch-1 
textual
 2020-03-29 07:53:13 +02:00
iceman1001 a79a11256a revert 2020-03-29 07:48:01 +02:00
Winds 9356549bc6
textual 
Correcting a script name
 2020-03-28 18:23:05 +03:00
iceman1001 82d99522b4 textual 2020-03-27 11:56:47 +01:00
iceman1001 ffb8ad9873 defaults 2020-03-26 21:04:58 +01:00
iceman1001 063b393eba textual 2020-03-26 20:36:38 +01:00
iceman1001 a9571d26b0 fix coverity 274113 2020-03-25 16:49:19 +01:00
iceman1001 6e49d94a82 fix coverity 205241 2020-03-25 16:35:31 +01:00
iceman1001 19a43d4726 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-03-25 11:20:47 +01:00
iceman1001 dc4bd2c1f7 fix: bizarr behavior in Proxspace lua, where io.read("*l") default behavior swaps to io.read("*L") . So lets make *L default a strip away all newlines... 2020-03-25 11:20:35 +01:00
iceman1001 0c25f85c9f empty string. 2020-03-25 11:19:20 +01:00
Iceman 04715cb2ea
Merge pull request #624 from darconeous/patch-1 
Updates to the Tesla AIDs
 2020-03-24 17:20:26 +01:00
Robert Quattlebaum f593efebf4
Re-added teslaStore AID, also added TeslaDAP AID 2020-03-24 09:18:16 -07:00
iceman1001 0033715a59 cppchecker 2020-03-24 13:35:33 +01:00
iceman1001 10243d9bce cppchecker - too many shifts 2020-03-24 13:16:47 +01:00
iceman1001 5acd681f8f cppchecker - too many shifts 2020-03-24 13:11:50 +01:00