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
10948 commits 3 branches 14 tags 86 MiB
Commit graph

6739 commits

Author SHA1 Message Date
iceman1001 1689a73101 hf iclass chk , textual 2020-08-18 11:11:43 +02:00
iceman1001 6b8c5e0d24 adapting epa cnonces 2020-08-17 22:06:54 +02:00
iceman1001 e0c5995ab2 fix hf14braw 2020-08-17 22:04:35 +02:00
iceman1001 179ef4cf84 f 2020-08-17 14:05:15 +02:00
iceman1001 b941e6aab9 fix #874 - 14a, mifare, shows bits if a partial byte 2020-08-17 12:35:42 +02:00
iceman1001 0f94fa5a54 fix coverity 298566 2020-08-17 09:01:18 +02:00
iceman1001 2be85939f7 fix: hf 15 cetsuid. hf 15 sim 2020-08-17 08:52:24 +02:00
iceman1001 4cc30de788 textual 2020-08-16 21:32:16 +02:00
iceman1001 7c9711eb08 14b colors 2020-08-16 21:14:37 +02:00
iceman1001 49aa198c88 annotate cryptorf 2020-08-16 09:59:41 +02:00
iceman1001 006f9c4f20 disable felica in hf search until it is more stable 2020-08-15 11:54:13 +02:00
iceman1001 4965f40c24 14b, handle sof 2020-08-15 11:03:59 +02:00
iceman1001 2c29f95077 annotation 15 only when we got bytes 2020-08-15 11:02:06 +02:00
iceman1001 b12727349b fix timeout for hf 15 info/reader 2020-08-15 10:59:21 +02:00
iceman1001 b3348a74e9 textual 2020-08-15 08:49:39 +02:00
iceman1001 edc9727e4b make travis happy 2020-08-14 19:26:44 +02:00
iceman1001 eaf0ecfe6e trace list 15 annotation 2020-08-14 14:57:30 +02:00
iceman1001 ede0059b10 more params 2020-08-14 14:57:02 +02:00
iceman1001 61201a3aaf textual 2020-08-14 14:55:07 +02:00
iceman1001 cf36e26add hf 15 client side got some love 2020-08-14 14:54:47 +02:00
iceman1001 2b903a77bd really fix dt_dir on proxspace 2020-08-14 06:31:19 +02:00
iceman1001 6921fdafde fix DT_DIR on mingw / proxspace 2020-08-14 05:44:40 +02:00
Philippe Teuwen b59becbeb6 Add LF before first pm3 dbg msg when there is a pending prompt 2020-08-14 00:14:46 +02:00
Philippe Teuwen 6d3c1d0223 script list: recurse in subdirs 2020-08-13 23:10:11 +02:00
Philippe Teuwen 80d9b4c5de PrintAndLogEx: Allow to skip carriage return by appending NOLF 2020-08-13 23:10:11 +02:00
iceman1001 6bd0138f14 add a clear screen for ansi enabled terms 2020-08-13 17:42:46 +02:00
iceman1001 700f0624a4 coverity 298509, 298508, 294394 2020-08-13 14:04:09 +02:00
Philippe Teuwen 4ed57c7c4d make style 2020-08-13 12:25:04 +02:00
iceman1001 8a602ed99d coverity 294114 2020-08-13 12:21:40 +02:00
Philippe Teuwen 85fd28eb2c fix SKIPREADLINE compilation err 2020-08-13 09:42:50 +02:00
iceman1001 27553ba34a less cpu usage, thanks @mwalker33 2020-08-13 09:04:02 +02:00
iceman1001 042caabe12 iclass replay params 2020-08-12 13:18:59 +02:00
iceman1001 483fed90fe hf iclass replay works. A bit bad in not reading AA2. Assumes a KD mac 2020-08-11 23:46:11 +02:00
iceman1001 ffa27049b7 chg: trace list color in list 2020-08-11 21:39:51 +02:00
iceman1001 c1a5f93dab send arguments to standalone mode 2020-08-08 23:45:09 +02:00
iceman1001 ccbfdf9e88 add: mem spiffs wipe 2020-08-08 12:33:12 +02:00
iceman1001 146c8f4e8e dump size bugs 2020-08-08 11:46:22 +02:00
iceman1001 4698e9a595 print lock bit for block 2020-08-06 08:14:40 +02:00
iceman1001 62d9b403b4 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 into fpga 2020-08-03 21:22:13 +02:00
iceman1001 d93364bc22 textual chk, loopup. Sim working on reva,b,c readers 2020-08-03 17:42:05 +02:00
iceman1001 53b9bd37c2 sorted 2020-08-03 17:39:31 +02:00
iceman1001 7236762cd6 help commands grouped 2020-08-03 17:38:58 +02:00
Philippe Teuwen 00938e06ff Fix btpin usage 2020-08-02 11:29:21 +02:00
iceman1001 3581cd6d4c textual 2020-07-29 15:28:42 +02:00
iceman1001 e147bdc71b renamed readtagfile to view\nrenamed clone to restore\nrefactored reader, info, dump, rdbl, wrbl to be on device side. Commands now also seamless works with NON_SECURE_MPAGE 2020-07-29 11:02:30 +02:00
iceman1001 445d5a46df less logs 2020-07-29 10:19:48 +02:00
iceman1001 c5c3d819d5 helptext update 2020-07-23 11:27:25 +02:00
iceman1001 06c02d3b40 added iclass esave, textual 2020-07-21 14:09:05 +02:00
iceman1001 a85fd925b7 colors to wiegand decode 2020-07-21 13:01:19 +02:00
iceman1001 1f2c03ce8a iclass rdbl textual 2020-07-21 13:00:52 +02:00
iceman1001 ca14b92dd5 iclass info - some cards configured to take all available mem. ie no AA2 area. 2020-07-21 10:53:19 +02:00
iceman1001 e94cbd8da5 list 15693 2020-07-21 10:48:29 +02:00
iceman1001 0f5e58a81c fix iclass sof tracelog 2020-07-20 17:42:10 +02:00
iceman1001 2d368ba2d8 fix sim reply 2020-07-20 00:52:46 +02:00
iceman1001 20ad16bfca fix iclass dump.. 2020-07-19 23:09:21 +02:00
iceman1001 a1529b44ca fix auth and 2020-07-19 20:45:47 +02:00
David Berdik 8ed1f13119 Added missing 'u' parameter to file generated by gen_pm3mfsim_script.sh 2020-07-18 19:34:17 -04:00
David Berdik 1cef42b742 Changed file extension used on output file usage example in gen_pm3mfsim_script.sh 2020-07-18 19:26:45 -04:00
iceman1001 1f3e671443 fix #905 - memory corruptions when generating filename 2020-07-16 10:54:30 +02:00
iceman1001 85be784d26 ev3 detection enabled 2020-07-15 11:55:21 +02:00
iceman1001 d9571d8df7 loclass, print helptxt 2020-07-15 11:35:03 +02:00
iceman1001 c99ed14c6e textual 2020-07-15 01:29:44 +02:00
iceman1001 5039d69c6b rename fct 2020-07-14 23:12:54 +02:00
iceman1001 091f9fb94c chg: adapt the eml block size based on filename 2020-07-14 23:11:44 +02:00
iceman1001 889d1c93cb fix: coverity mem leak 2020-07-14 15:25:56 +02:00
iceman1001 0f507c24e1 chg: readblock assuming better 2020-07-14 00:16:25 +02:00
iceman1001 2fa9bd585f style 2020-07-13 22:06:50 +02:00
iceman1001 4493153dbb verbose.. 2020-07-13 20:58:24 +02:00
iceman1001 b62c060727 chg: hf iclass rdbl, wrbl - got some love 2020-07-13 20:13:25 +02:00
iceman1001 88c14b9c08 iclass doesnt need 4500 timout anymore, can put earlier in hf search. 2020-07-13 18:20:43 +02:00
iceman1001 aaa6f25ab6 chg: 'trace list' - now support relative times, us/fc (@piwi) 2020-07-13 13:55:19 +02:00
iceman1001 52e9d7a750 rework iclass dump 2020-07-13 12:29:31 +02:00
iceman1001 e055858fb8 clean up 2020-07-13 12:25:44 +02:00
iceman1001 f866a847fb fix coverity 294114 2020-07-11 20:46:37 +02:00
Philippe Teuwen eb61524923 Merge branch 'master' into fpga 
* master: (27 commits)
  fix a bug in demodParadox()
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  fix #833  - missing some configblocks and spelling
  remove verichip.
  chg 'lf t55xx info' - detection of t55x7 configuration blocks
  remove
  disable verichip stuff.  should be inside FDX already
  textual
  lf t55 configblock detection updated
  textual
  fix: missing define on some mingw
  chg: hf mf decrypt - helptext (thanks @AdamLaurie)
  Update bt_manual_v10.md
  textual
  ...
 2020-07-11 15:25:20 +02:00
Iceman 7106b48065
Merge pull request #834 from tharexde/4x50_wipe 
added 4x50_wipe
 2020-07-11 09:47:41 +02:00
jumpycalm 23a5beb3c3 fix a bug in demodParadox() 2020-07-10 23:22:52 -04:00
iceman1001 a25a5322dd fpga: added iCLASS on deviceside 2020-07-10 16:37:56 +02:00
iceman1001 1feb34617b hunting down why logtrace is missing 2020-07-09 19:43:00 +02:00
iceman1001 b627d91fc2 adapt 2020-07-09 19:42:34 +02:00
tharexde 1394ffc3a0 added new command "4x50_wipe" 2020-07-09 02:00:09 +02:00
tharexde 9d8c7a8de5 added new command "4x50_wipe" 2020-07-09 01:58:50 +02:00
tharexde a659e7576d added new command "4x50_wipe" 2020-07-09 01:58:38 +02:00
iceman1001 d67bc94e20 hf iclass sniff 2020-07-09 00:21:26 +02:00
iceman1001 8934fd522d fix #833 - missing some configblocks and spelling 2020-07-08 20:30:53 +02:00
iceman1001 f4b3dec0c8 remove verichip. 2020-07-08 18:09:34 +02:00
iceman1001 c56245d1aa chg 'lf t55xx info' - detection of t55x7 configuration blocks 2020-07-08 18:04:51 +02:00
iceman1001 327af5764d remove 2020-07-08 17:37:35 +02:00
iceman1001 2fcc9b07ef disable verichip stuff. should be inside FDX already 2020-07-08 17:37:01 +02:00
iceman1001 584fe52153 lf t55 configblock detection updated 2020-07-08 13:41:38 +02:00
iceman1001 aa0baa26c6 fix: missing define on some mingw 2020-07-08 11:09:20 +02:00
iceman1001 ce24e6acbb fpga merge hell, all compiles 2020-07-08 09:45:49 +02:00
iceman1001 fef3a764ae chg: hf mf decrypt - helptext (thanks @AdamLaurie) 2020-07-07 15:36:51 +02:00
iceman1001 d83a45f0cb fpga merge changes 2020-07-06 15:16:00 +02:00
iceman1001 ae8be54fca clean 2020-07-06 05:43:38 +02:00
iceman1001 927cd71ed9 use reflect fct 2020-07-06 05:43:12 +02:00
iceman1001 7d3cab1669 clean 2020-07-06 05:42:43 +02:00
iceman1001 9d204897d1 fix #830 - 'lf em 4x50_info/read' - now print msb and lsb again. 2020-07-06 05:41:44 +02:00
iceman1001 7d1a278197 merge hell p.x 2020-07-03 21:33:17 +02:00
dxl 64068ba430 android adapt changed. 2020-07-03 16:46:40 +08:00
iceman1001 e6c046e17c adapt banner to smaller views 2020-07-01 12:31:57 +02:00
iceman1001 1ec2a83e39 style 2020-06-30 18:50:38 +02:00
iceman1001 88d4d037f1 enable EV3 tests 2020-06-30 17:59:35 +02:00
iceman1001 aa0b3c67ba chg: lf em 4x50_write - output flow 2020-06-30 17:59:06 +02:00
iceman1001 86bfdcf260 chg: lf em 4x50_read / info - remake output 2020-06-30 17:43:47 +02:00
iceman1001 a3a7f0d4ad hw tia, status - textual 2020-06-30 12:50:31 +02:00
tharexde 9c263b3fb8 fixed simple compilation errors 2020-06-30 01:51:24 +02:00
tharexde da44e0fc96 Merge branch 'master' into dav-tmp 
solved merge conflict
 2020-06-30 01:05:10 +02:00
iceman1001 2abd7e08b4 chg: disable ctrl-c on mingw/ps 2020-06-29 22:23:46 +02:00
iceman1001 8d7a0c7fc7 pref show - textual 2020-06-29 18:16:28 +02:00
iceman1001 2fe42173de chg: when pressing ctrl-c, the command history is saved 2020-06-29 18:10:40 +02:00
iceman1001 ac12a892b0 fix coverity 290964, 286679, 286658, 286652 2020-06-29 12:11:17 +02:00
iceman1001 a6cc73a4d5 fix coverity 293468 2020-06-29 11:58:24 +02:00
iceman1001 714652b1f2 fix coverity 226321 2020-06-29 11:56:56 +02:00
iceman1001 a9b2752673 fix coverity 292483 2020-06-29 11:56:18 +02:00
iceman1001 e6bb7a8a87 fix coverity 292481 2020-06-29 11:32:38 +02:00
iceman1001 d5b379207e fix coverity 2020-06-29 11:22:09 +02:00
iceman1001 682de4eee0 fix coverity 290962, 290961 2020-06-29 11:21:46 +02:00
iceman1001 5d08dae554 fix coverity 290769, 290768 2020-06-29 11:10:02 +02:00
iceman1001 b5b5520546 fix coverity 286922 2020-06-29 10:42:22 +02:00
iceman1001 29a4a888a4 fix coverity 290965 2020-06-29 10:32:35 +02:00
iceman1001 8fd4bb6e33 preparing ndef command for desfire 2020-06-29 10:29:12 +02:00
iceman1001 8bd1a44ba7 textual 2020-06-29 10:26:58 +02:00
iceman1001 18ca4cb883 textal 2020-06-29 10:26:27 +02:00
iceman1001 4eb7776a07 text and cleanup 2020-06-29 10:25:51 +02:00
Iceman 7df20bc61e
Merge pull request #822 from tharexde/dev-em4x50_sread 
EM4x50 function "sread" (standard/selective read)
 2020-06-29 10:10:53 +02:00
iceman1001 f57a304362 fix #823 2020-06-29 08:05:43 +02:00
tharexde 844efbb9ac Merge branch 'master' into dev-em4x50_sread 2020-06-28 21:50:37 +02:00
tharexde 9aafc094b6 deleted nearly all EM4x50 code; new EM4x50 code is in 'cmdlfem4x50.c' (device side instead GraphBuffer) 2020-06-28 21:43:13 +02:00
tharexde 78511df9f2 integrated 'lread' into 'lf search' process and renamed 'lread' to 'read' 2020-06-28 21:41:21 +02:00
tharexde 91ff0350df introduced 'IfPm3EM4x50' function 2020-06-28 21:39:59 +02:00
tharexde c572a2bab8 introduced 'IfPm3EM4x50' function 2020-06-28 21:39:27 +02:00
tharexde a01c5aff0e deleted EM4x50 functions due to switch to new 'read' function for EM4x50 tag (device side) 2020-06-28 21:37:12 +02:00
tharexde c6435d2f96 output changes due to integration of 'read' into 'lf search' process 2020-06-28 21:35:06 +02:00
tharexde 955c7a642d renamed 'sread' to 'read' 2020-06-28 21:33:37 +02:00
iceman1001 fe3e77915d hf iclass reader - output redesign 2020-06-28 19:13:01 +02:00
iceman1001 c3a833b101 text 2020-06-27 22:22:15 +02:00
iceman1001 b300899f8c hf 14a info - MIFARE DESFire MF3ICD40 detection 2020-06-27 18:14:29 +02:00
tharexde 81cd478883 Merge branch 'master' into dev-em4x50_sread 
update
 2020-06-27 00:37:32 +02:00
tharexde f264473b69 formal adjustments 2020-06-27 00:21:56 +02:00
iceman1001 d4b752e23b text 2020-06-26 23:53:34 +02:00
iceman1001 5e7911becb text 2020-06-26 23:50:36 +02:00
iceman1001 e7514ecbc0 text 2020-06-26 23:50:22 +02:00
iceman1001 2aa7c8f660 textual 2020-06-26 23:31:32 +02:00
iceman1001 06aecb09b7 chg: hf iclass reader - textual 2020-06-26 22:20:32 +02:00
iceman1001 5cce99db99 cleaning 2020-06-26 21:50:49 +02:00
iceman1001 71e30a8c4f layout 2020-06-26 21:49:50 +02:00
iceman1001 669bb1d597 client/src/cmdhficlass.c 2020-06-26 21:49:19 +02:00
iceman1001 f330f3925b text 2020-06-26 18:33:56 +02:00
tharexde e1f571e8da forgot to terminate string variable 2020-06-26 14:58:08 +02:00
tharexde 445a367b49 added 4x50_sread 2020-06-26 14:21:09 +02:00
tharexde 871fa6b733 added 4x50_sread 2020-06-26 14:20:46 +02:00
tharexde 8376b67ea0 added 4x50_sread 2020-06-26 14:20:19 +02:00
iceman1001 42415e41ab text 2020-06-26 13:23:37 +02:00
iceman1001 c65c683d06 text 2020-06-26 13:21:32 +02:00
iceman1001 ba8f60298a text 2020-06-26 13:17:41 +02:00
iceman1001 5643eb685d text, color 2020-06-26 13:01:17 +02:00
iceman1001 dbc2fb188a text,color 2020-06-26 12:02:57 +02:00
iceman1001 9ad944c4a1 color,text 2020-06-26 12:02:32 +02:00
iceman1001 f4c91bc3aa space 2020-06-26 00:43:56 +02:00
iceman1001 6484bd641c textual 2020-06-26 00:04:41 +02:00
Iceman 845d6a445c
Merge pull request #820 from aczid/master 
Show usage menu for invalid/missing hitag commands
 2020-06-25 23:45:30 +02:00
Aram 7c2fe1e8e6 Show usage menu for invalid/missing commands 2020-06-25 21:09:18 +02:00
Monster 173c1702e9
Add support for new "Mikron JSC Russia" UL tag. 2020-06-25 12:15:51 +03:00
iceman1001 2878a8d481 missing semi 2020-06-24 22:18:41 +02:00
iceman1001 c47679b5dd addition 2020-06-24 22:13:41 +02:00
iceman1001 c2df7ed824 chg: trigger colorsmode (proxspace) in direct calls to client 2020-06-24 11:51:00 +02:00
Bjoern Kerler 36fcb8ef2b Fixes num_keys 2020-06-24 07:22:03 +02:00
iceman1001 d06029c63f textual 2020-06-23 11:24:00 +02:00
iceman1001 1c7de4a8c3 fix: "lf search" / "lf hitag" - no more stack overflow in hitag reader 2020-06-23 11:13:49 +02:00
Philippe Teuwen e79537ba46 cmake tuning 2020-06-23 10:13:23 +02:00
tharexde 3b7d654553 increased readability by introducing defines 2020-06-23 00:36:19 +02:00
tharexde cdb57c9c2b Merge branch 'master' into dev_em4x50_info_write 
merge conflict
 2020-06-22 21:04:48 +02:00
iceman1001 fddf8ae6aa textual 2020-06-22 18:04:40 +02:00
iceman1001 f900b1078e textual 2020-06-22 18:00:20 +02:00
iceman1001 b59131d349 chg: 'lf em/hid/io/awid watch' - colors, unified, NG 2020-06-22 14:56:13 +02:00
iceman1001 683954316a chg: 'lf em 410x_watch' - now uses NG and on deviceside only 2020-06-22 13:24:33 +02:00
iceman1001 ba6bc0ecef chg: 'lf io watch' - uses NG and reports back to client 2020-06-22 12:57:28 +02:00
iceman1001 18da534554 chg: 'hf sniff' - now malloc and is interupable 2020-06-21 18:13:14 +02:00
iceman1001 a93053c573 textual 2020-06-21 16:40:12 +02:00
iceman1001 2bc64e997f renamed sc to smart, and colors. 2020-06-21 16:36:12 +02:00
iceman1001 56e171b9dc chg: data ndef - now decodes w and wo NDEF header 2020-06-21 16:34:56 +02:00
tharexde 26b7c667b7 deleted function check_bit_in_byte(...) -> overhead 2020-06-20 18:38:44 +02:00
tharexde d38711aea6 added cmdlfem4x50.c 2020-06-20 15:37:56 +02:00
tharexde dc69880801 minor text and color changes 2020-06-20 14:44:24 +02:00
tharexde 9e2e1db6e1 changes due to replaced reply command (reply_mix(...) -> reply_ng(...)) 2020-06-20 14:33:49 +02:00
Philippe Teuwen f69739da79 make style 2020-06-19 18:34:47 +02:00
tharexde d8d56d9e74 corrected comments 
used param_gethex(...) and param_getdec(...) instead of scanf and strncpy constructs
 2020-06-19 01:22:39 +02:00
Philippe Teuwen f1ae469cd7 readline tuning 2020-06-18 21:36:20 +02:00
Philippe Teuwen b2a6fca0ee Fix bug when cmake android and CMAKE_BUILD_TYPE=Release, see comments: 
The presence of "filter" from crypto1.c as an exported function depends on the chosen compilation optimization level.
So if the common/crapto1/ and the code using it (here hardnested) are not using the same level, there will be a mismatch,
in this case hardnested_bruteforce.c expecting crypto1.c to provide filter()
 2020-06-18 19:27:33 +02:00
Philippe Teuwen 35cfd4931f remove debug statement 2020-06-18 17:55:09 +02:00
Philippe Teuwen 0c17413a96 cmake android: we only need libtinfo, not full libncurses 2020-06-18 16:19:54 +02:00
Philippe Teuwen f70b94c4aa cmake android: remove make -j2 overruling main make 2020-06-18 16:02:27 +02:00
Philippe Teuwen 94edc41c3c cmake android: add statically terminfo stuff, so no need for termux or similar to be installed 2020-06-18 16:01:41 +02:00
tharexde 171bf6912b deleted function msb2lsb 2020-06-18 13:53:25 +02:00
iceman1001 e1f0f89240 chg: 'hf sniff' - remake to mallc and report back size, also use NG 2020-06-18 11:54:19 +02:00
iceman1001 be9a5920d8 chg: downloading samples more fine grained 2020-06-18 11:05:21 +02:00
Philippe Teuwen 658b77d5b5
Merge pull request #799 from xianglin1998/cross 
Disable external libary compile warnning.
 2020-06-18 10:02:02 +02:00
Philippe Teuwen 04517b3fe1 minor 2020-06-18 10:00:44 +02:00
Philippe Teuwen 490d5d26ae minor 2020-06-18 09:57:50 +02:00
dxl 8bcdecb7f9 Disable external libary compile warnning. 2020-06-18 15:46:44 +08:00
Philippe Teuwen 3106fa3d3d cmake: use system libjansson if available 2020-06-18 02:07:25 +02:00
Philippe Teuwen cdf1bc3ce7 cmake: use system libwhereami if available 2020-06-18 01:51:36 +02:00
Philippe Teuwen e6be31529a cmake: find bzip2 2020-06-18 00:51:33 +02:00
tharexde 0d61572f6d replaced old "SendCommandMIX" by "SendCommandNG" 2020-06-17 23:50:52 +02:00
tharexde daa39dff0e replaced function msb2lsb(...) by already existing function reflect8(...) 2020-06-17 23:39:00 +02:00
tharexde 572cc7c63e replaced "passed" by "ok" 2020-06-17 23:22:03 +02:00
tharexde 25b0c2e1eb replaced blue color by green or yellow 2020-06-17 23:20:10 +02:00
tharexde d684347429 changed timeout return value from PM3_ESOFT to PM3_ETIMEOUT 2020-06-17 23:13:13 +02:00
tharexde 89f15432b0 Merge branch 'master' into dev_em4x50_info_write 
update
 2020-06-16 23:32:56 +02:00
tharexde e81999da1a added write and write_password functions 2020-06-16 23:28:09 +02:00
tharexde 4023c2b8f9 added write and write_password functions 2020-06-16 23:25:27 +02:00
tharexde 0ddcab51aa added write and write_password functions 2020-06-16 23:25:17 +02:00
iceman1001 2555f46328 chg: "lf em 4x50_read" - acquire data is useful... 2020-06-16 09:24:39 +02:00
iceman1001 fd5f821a46 helptext 2020-06-16 09:13:30 +02:00
tharexde e707ceb906 added EM4x50 info function 2020-06-15 14:32:11 +02:00
tharexde 2b1bfc58f9 added EM4x50 info function 2020-06-15 14:31:43 +02:00
tharexde 79b20a35c1 added EM4x50 info function 2020-06-15 14:31:34 +02:00
tharexde dfe6941a8d added EM4x50 info function 2020-06-15 14:31:27 +02:00
iceman1001 4c2483cd3f helptext 2020-06-14 11:05:43 +02:00
iceman1001 4f50591784 chg; pages is not offset 2020-06-14 10:47:40 +02:00
iceman1001 fef8ef6aa4 chg: fileutils tries to add pack when converting old -> new dump format 2020-06-14 08:17:10 +02:00
iceman1001 aeb8e5beb7 chg, "hf mf eload" - uses same dump printer 2020-06-14 08:16:19 +02:00
Iceman e0eaff453f
Merge pull request #787 from bkerler/DesAuth 
Mifare Des authentification fixes
 2020-06-13 18:26:23 +02:00
Bjoern Kerler e7b2dbd5e8 Remove unnecessary crc 2020-06-13 17:58:47 +02:00
iceman1001 a9bfcb015c style 2020-06-13 17:49:33 +02:00
Bjoern Kerler 9a07c06596 Fix htole32 issue 2020-06-13 17:16:17 +02:00
Bjoern Kerler 0b204f5d1d Merge branch 'DesAuth' of https://github.com/bkerler/proxmark3 into DesAuth 2020-06-13 16:55:45 +02:00
Bjoern Kerler b0d969da24 Fix unsigned vs. signed 2020-06-13 16:55:30 +02:00
Bjoern Kerler 1ca5706c59
Merge pull request #5 from RfidResearchGroup/master 
Update
 2020-06-13 15:12:16 +02:00
Bjoern Kerler 631be7af32 Fixes 2020-06-13 15:11:10 +02:00
Philippe Teuwen 797fa7d01a Tolerate exit-like calls from embedded Python script 
Now sys.exit(0) is silently accepted, while
quit() / raise SystemExit / sys.exit() / sys.exit(n) / exit()
will output sth a warning such as
"Script terminated by SystemExit -1"

Still, don't call os._exit(0), it immediately exits.
 2020-06-13 14:53:47 +02:00
Bjoern Kerler e0bf636aaf Make style 2020-06-13 14:25:40 +02:00
Bjoern Kerler 5adc8e876a Fix DES authentification and format picc 2020-06-13 14:19:21 +02:00
Conlan e8c88d47ef
Additional CharlieCard Key 2020-06-12 20:01:55 -04:00
Philippe Teuwen 25fb6df229 Android cross-compilation to client cmake 2020-06-12 23:28:38 +02:00
iceman1001 94403bee59 textual 2020-06-12 22:49:42 +02:00
iceman1001 2bb110fef3 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-06-12 22:35:18 +02:00
iceman1001 9c6ce5be50 chg: "hf mf cwipe" - speed up using backdoor wipe cmd 2020-06-12 22:35:08 +02:00
Philippe Teuwen 020c6882ce colors 2020-06-12 19:52:13 +02:00
Philippe Teuwen 8c5be2678f Yet another color management, settings autodetection done earlier 2020-06-12 19:45:18 +02:00
Philippe Teuwen 30c0345c31 Fix fix colors 2020-06-12 18:21:03 +02:00
Philippe Teuwen bb5c588935 Fix colors detection under Windows (when no ref & when redirected IOs) 2020-06-12 18:17:39 +02:00
Philippe Teuwen ce61b67910 Remove spurious color 2020-06-12 18:01:06 +02:00
iceman1001 20c46d1af5 chg: in order to be able to upgrade fw on smartcard it must be available 2020-06-12 17:49:52 +02:00
iceman1001 60c47a7e7d textual 2020-06-12 17:29:34 +02:00
iceman1001 9ba03aec74 fix: "emv scan" - better fix for filename 2020-06-12 09:44:50 +02:00
iceman1001 cdbe6bc35b fix: "emv scan" - now dont save in execution folder 2020-06-12 09:27:55 +02:00
iceman1001 c460dcf12d test prox 2020-06-12 00:37:48 +02:00
iceman1001 6dc0aa53c7 textual... 2020-06-11 20:58:31 +02:00
iceman1001 c716bb9e31 textual, color, and "hf iclass info" does something 2020-06-11 20:11:44 +02:00
iceman1001 6a8ea64feb text 2020-06-11 19:53:21 +02:00
iceman1001 fc5feffa4b color 2020-06-11 19:23:15 +02:00
slurdge 5f148bb835 Happy colors for messages coming from pm3 2020-06-11 16:21:27 +02:00
Iceman 291238a2f0
Merge pull request #772 from slurdge/bigbigbuf 
[WIP] Make BigBuf take dynamically the available space with a fixed (4K) stack
 2020-06-11 13:09:20 +02:00
Philippe Teuwen 73b6138f7f cmddata: Adjust bigbuf size on client side as before but fix 1b overflow 2020-06-11 01:18:50 +02:00
Lukas Kuzmiak edff230d55 fix a bug in MADInfoByteDecode (did not return 0x00), textual fixes 2020-06-10 14:59:53 -07:00
slurdge c11c7ab545 Add support for client getting bigbufsize 2020-06-10 23:03:03 +02:00
iceman1001 6f1c074801 textual 2020-06-10 22:47:47 +02:00
Philippe Teuwen 8ccc592ca0 mf ndef examples 03e1 -> e103 2020-06-10 14:02:14 +02:00
iceman1001 d7377e7ccc textual 2020-06-10 13:33:08 +02:00
iceman1001 61be7c7c30 chg: cliparse should have atleast same file_max_path_len 2020-06-10 13:31:57 +02:00
Philippe Teuwen cb614f3f11 cliparser: generalize ctx usage 2020-06-10 11:34:33 +02:00
Philippe Teuwen 569107579e Fix cliparser buffer allocation 2020-06-10 11:33:15 +02:00
iceman1001 cd9b26af17 helptext 2020-06-10 08:44:13 +02:00
iceman1001 cb22004635 chg "hf mf cwipe" - textual and also use magic wipe card 2020-06-10 08:43:29 +02:00
Lukas Kuzmiak 9d71f66d16 Mifare MAD Card Holder Information 2020-06-09 18:34:59 -07:00
Philippe Teuwen 8d1027e0c9 typo 2020-06-10 02:15:16 +02:00
Philippe Teuwen 2a29a1431d theremin.py: quit when pm3 button is pressed 2020-06-10 01:18:26 +02:00
Philippe Teuwen b55c186b3a make style 2020-06-10 01:17:49 +02:00
Lukas Kuzmiak ca30ff9bc2 highlight sector line instead of printing it twice, update Changelog 2020-06-09 15:39:17 -07:00
Lukas Kuzmiak 33662bdd59 Decode MAD Info Byte and show info about sector it points to 2020-06-09 14:43:00 -07:00
iceman1001 61f09d0ec4 add theremin.py script, (@rosco) 2020-06-09 22:16:35 +02:00
iceman1001 dcabb7e37d chg: hf 14a info - dont print some hints if magic 2020-06-09 21:29:59 +02:00
Philippe Teuwen def475e747 Add SKIPREADLINE support to make and cmake 
It's mostly for headless support.
At the moment, for interactive uage without readline, some commands will exit the client prematurely if they use kbd_enter_pressed().
 2020-06-09 21:21:15 +02:00
Philippe Teuwen 4372a728f7 mad ndef no swap and restore official AID 0xE103 2020-06-09 21:19:31 +02:00
Philippe Teuwen 92f4c445e4 mfc ndef needs swapped mad according to our default way to treat mad... 2020-06-09 21:07:53 +02:00
Philippe Teuwen 9a15632689 MAD swap again 2020-06-09 20:53:33 +02:00
Philippe Teuwen 35c6ee1bbb rework a bit mfc mad 2020-06-09 20:17:08 +02:00
Philippe Teuwen 33144d1be8 mfc mad get_aid_description: add verbose passthru 2020-06-09 18:46:07 +02:00
Philippe Teuwen 242c276bfb mfc mad_print compare 2020-06-09 18:45:37 +02:00
iceman1001 a93e54374e working case-insense 2020-06-09 17:52:32 +02:00
iceman1001 cb4369f3ec fix: hf mf mad - return value 2020-06-09 17:38:29 +02:00
iceman1001 a71f4cd475 fix coverity resource leak 2020-06-09 17:01:31 +02:00
iceman1001 17f56479ea fix coverity 2020-06-09 16:59:20 +02:00
iceman1001 5ada65bb20 textual 2020-06-09 16:46:46 +02:00
iceman1001 241309291b chg: hf iclass , use fileutils 2020-06-09 16:25:56 +02:00
iceman1001 33965f51d8 minor <> 2020-06-09 16:24:12 +02:00
iceman1001 e9fba19915 fileutils should be searching for json 2020-06-09 16:23:28 +02:00
iceman1001 76791bde0a textual 2020-06-09 16:22:35 +02:00
iceman1001 158251b2d9 look up mad directory json 2020-06-09 16:21:54 +02:00
iceman1001 bfc6a2c513 add: a MAD Directory in json 2020-06-09 13:31:09 +02:00
iceman1001 5b10df9b4c textual 2020-06-09 11:32:19 +02:00
iceman1001 d12606cb26 reverse crc check 2020-06-09 11:14:40 +02:00
Lukas Kuzmiak 3cbad6fa4c Merge remote-tracking branch 'public/master' into mifare-mad-fix 2020-06-09 02:06:27 -07:00
iceman1001 849be2376c textual 2020-06-09 09:19:25 +02:00
iceman1001 a0cbaee138 chg: mad makeover 2020-06-09 08:51:12 +02:00
Lukas Kuzmiak e3d16649b8 MAD application code & cluster code were swapped 2020-06-08 21:22:40 -07:00
Lukas Kuzmiak eb35636f49 remove duplicated key (first occurrence kept) 2020-06-08 17:26:03 -07:00
Philippe Teuwen de100fc8e7 Add SKIPPYTHON support to cmake 2020-06-09 00:47:34 +02:00
Philippe Teuwen 66505988a2 Add SKIPPTHREAD support to cmake 2020-06-09 00:39:35 +02:00
Philippe Teuwen 6358c07ec1 Add SKIPQT support to cmake 2020-06-09 00:34:41 +02:00
Philippe Teuwen 45b5bbed7b Add SKIPBT support to cmake 2020-06-09 00:27:50 +02:00
Philippe Teuwen c76b3061da Fix more deps/liblua Android cross-compilation 2020-06-08 20:20:16 +02:00
Philippe Teuwen 526407ed5c Fix deps/liblua Android cross-compilation 2020-06-08 19:18:08 +02:00
iceman1001 86c649f955 chg: "lf viking demod" - prepping for lib 2020-06-08 18:43:34 +02:00
iceman1001 618a945e55 fix missing semi 2020-06-08 13:19:01 +02:00
Philippe Teuwen 6894749978 Android: Fix bug introduced in e0371987ac 2020-06-08 12:44:14 +02:00
iceman1001 a7799a5bf8 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-06-08 09:23:16 +02:00
iceman1001 8f8d42652b remove dependency 2020-06-08 09:23:08 +02:00
Iceman e0371987ac
Update CMakeLists.txt 
We swapped from zlib to  bz2
 2020-06-08 09:11:13 +02:00
Philippe Teuwen 224cb2ffd7 make style 2020-06-08 03:15:10 +02:00
Philippe Teuwen 15012198f9 client: replace zlib by bzip2 2020-06-08 02:50:43 +02:00
iceman1001 93dbb24103 ftell return signed 2020-06-07 20:46:29 +02:00
iceman1001 d0b22cbd95 coverty 290397, 290399 2020-06-07 20:11:36 +02:00
iceman1001 307e39bb22 exposing function 2020-06-07 19:47:36 +02:00
iceman1001 8dd56a9004 fix resource leak 2020-06-07 19:29:14 +02:00
iceman1001 ae10e76cb5 fix resource leak 2020-06-07 19:25:56 +02:00
iceman1001 c84f81de76 chg: 'sc raw' - print response bytes 2020-06-06 23:32:09 +02:00
iceman1001 5bd300bb59 hint on failed serial port 2020-06-05 14:20:52 +02:00
Philippe Teuwen 8852e1f9cd Remove readline from libamiibo, no reason to be there 2020-06-05 13:13:27 +02:00
iceman1001 f354f480de chg; return codes 2020-06-05 11:05:46 +02:00
iceman1001 d2a499ce5e chg: 'trace save' - use .trace extension 2020-06-04 11:52:58 +02:00
iceman1001 fd93222fdb chg: 'trace save' - if client has no log, try download from device before saveing 2020-06-04 11:50:41 +02:00
iceman1001 66fd599c70 fix: 'hf mfu ndef' - now prints ID field correct if present 2020-06-04 11:32:33 +02:00
iceman1001 bbd9271fa3 chg: 'hf lto restore' - now uses save loads and case-ignore extensions 2020-06-03 17:28:29 +02:00
iceman1001 4ba4c76081 added a loadEML_safe fct 2020-06-03 17:27:38 +02:00
iceman1001 64322896f2 chg, textual 2020-06-03 15:31:41 +02:00
iceman1001 519d2e4917 fiddle 2020-06-03 15:27:22 +02:00
iceman1001 173f2d472d chg; remove unused fcts 2020-06-03 15:27:07 +02:00
iceman1001 dcdd9ce364 nothing special 2020-06-03 15:02:35 +02:00
iceman1001 d5731b3aec chg, strange wait 2020-06-03 14:52:48 +02:00
iceman1001 12425aaf60 chg, hf fido remake 2020-06-03 14:52:27 +02:00
iceman1001 17d6ce5007 coverity 290398 2020-06-03 14:26:09 +02:00
iceman1001 8898000dac chg: 'hf mfu restore' - now uses fileutils 2020-06-03 13:10:34 +02:00
iceman1001 e26f57628a Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-06-03 13:05:52 +02:00
iceman1001 f6566f89f2 chg: 'sc upgrade' - now uses fileutils 2020-06-03 13:05:33 +02:00
Philippe Teuwen 8667b34da6 document mingw tweak 2020-06-03 12:54:59 +02:00
iceman1001 843ab094bb chg: 'trace load' - use fileutils 2020-06-03 12:29:52 +02:00
iceman1001 4683f84991 chg: 'hf 15 restore' - now also can use addressed mode 2020-06-03 12:06:41 +02:00
iceman1001 cfa176dd3e frees 2020-06-03 11:18:17 +02:00
iceman1001 04bf1b8db7 cppchecker 2020-06-02 18:18:33 +02:00
iceman1001 653f5b4e5d chg: make define 2020-06-02 13:35:16 +02:00
iceman1001 7064b73b48 chg parsing free Thanks @doegox! 2020-06-02 13:27:54 +02:00
iceman1001 f830843442 coverity.. 2020-06-02 13:09:29 +02:00
iceman1001 295286e68a cppchecker 2020-06-02 13:02:21 +02:00
iceman1001 5c1b99b048 cppchecker 2020-06-02 13:01:11 +02:00
iceman1001 05c5179b41 cppchecker 2020-06-02 13:00:36 +02:00
iceman1001 cc6f497897 cppcheck 2020-06-02 12:56:38 +02:00
iceman1001 422e018718 cppcheck 2020-06-02 12:56:20 +02:00
iceman1001 c6072d7a45 chg, textual 2020-06-02 11:54:42 +02:00
iceman1001 f5efcc43f0 fix coverity 290111 2020-06-02 11:54:31 +02:00
iceman1001 96076c1945 chg: remove unused code from "hf mf sim" 2020-06-02 11:46:59 +02:00
iceman1001 2daa2c09fd fix coverity 290266 2020-06-02 11:27:47 +02:00
iceman1001 19f2c0ef89 fix coverity 290271 2020-06-02 11:09:10 +02:00
iceman1001 bd8edced9b fix coverity 290273 2020-06-02 11:07:29 +02:00
iceman1001 d8ef01b69d fix coverity 290272 2020-06-02 11:06:24 +02:00
iceman1001 c81f0c7d0f fix coverity 290270 2020-06-02 11:05:21 +02:00
iceman1001 cff9e2381d fix coverity 290268 2020-06-02 11:02:37 +02:00
iceman1001 e42e8e4c92 fix coverity 290267 2020-06-02 11:02:23 +02:00
iceman1001 fae2438559 fix cppcheck 2020-06-02 10:38:18 +02:00
iceman1001 d840084492 rearrange 2020-06-02 09:37:53 +02:00
iceman1001 8ed6afa99a fix cppcheck 2020-06-02 09:37:23 +02:00
iceman1001 5b1e16b14e cppcheck warning 2020-06-02 09:24:23 +02:00
iceman1001 c53c79f0ba fix coverity 290111 2020-06-02 09:18:45 +02:00
iceman1001 071ab7193c fix coverity 290110 - missing break 2020-06-02 09:17:10 +02:00
iceman1001 a62199ac0f fix: coverity 290109 resouce leak 2020-06-02 09:15:56 +02:00
iceman1001 c3ab0b6527 fix: #752 MINGW env needs to be using gnu printf 2020-06-02 08:54:59 +02:00
Philippe Teuwen aff86a2939 cleaner paths in cmake 2020-06-02 01:16:21 +02:00
Philippe Teuwen 72987d562f Implement real callbacks for load/save prefs 2020-06-02 00:52:00 +02:00
Philippe Teuwen 447105511a less global vars 2020-06-02 00:51:42 +02:00
Philippe Teuwen d234e2a8f5 less global vars 2020-06-02 00:51:32 +02:00
Philippe Teuwen b6077df68e less global vars 2020-06-02 00:51:21 +02:00
Philippe Teuwen b9b230bb99 cmdhfmfdes: remove global unused vars 2020-06-02 00:51:06 +02:00
Philippe Teuwen 6326c4126c cliparser: remove global vars 2020-06-02 00:49:54 +02:00
Philippe Teuwen ff1f945291 desfire_crypto: remove global vars 2020-06-02 00:49:54 +02:00
Philippe Teuwen e3eb8b7401 char* port for OpenProxmark and remove global gui_serial_port_name 2020-06-02 00:49:40 +02:00
iceman1001 f1da47336e fix: 'emv scan -w' - calculats hash correct 2020-05-29 12:42:52 +02:00
iceman1001 dc1bf1408a chg, printf 2020-05-29 10:34:28 +02:00
iceman1001 d65f2287f4 chg, output 2020-05-29 10:23:34 +02:00
iceman1001 529b33b234 chg, prints 2020-05-29 10:23:14 +02:00
iceman1001 54827d3ec9 chg, printf 2020-05-29 10:15:40 +02:00
iceman1001 fd6ac2f024 chg, emv print, styles, 2020-05-29 09:46:06 +02:00
iceman1001 7e70b53dd4 chg, scope 2020-05-29 09:28:09 +02:00
iceman1001 51e6440bed chg, printing style in emv 2020-05-29 09:27:58 +02:00
iceman1001 38a8e6021f fix, emv roca hash mismatch https://github.com/Proxmark/proxmark3/pull/781 (@pwpiwi) 2020-05-29 08:41:05 +02:00
iceman1001 691c1735a4 chg, printf 2020-05-29 08:39:13 +02:00
iceman1001 c3a706b8cf fix: 'lf ti demod - crc is now fixed 2020-05-28 10:16:22 +02:00
iceman1001 036544e49e fix another realloc 2020-05-27 23:26:57 +02:00
iceman1001 17c9bc8fc2 fix redundantassignment 2020-05-27 22:46:22 +02:00
iceman1001 2635ae43b7 fix redundantassignment 2020-05-27 22:43:48 +02:00
iceman1001 f61ca64681 fix clarify 2020-05-27 22:40:53 +02:00
iceman1001 9d355a9b4e fix out-of-bound 2020-05-27 22:36:14 +02:00
iceman1001 4073b88ed7 fix realloc properly 2020-05-27 22:33:50 +02:00
iceman1001 e7feadf32c fix out of bound 2020-05-27 22:33:16 +02:00
iceman1001 d0489da611 fix realloc properly 2020-05-27 20:53:04 +02:00
iceman1001 988b61cfa5 fix clarify condition 2020-05-27 20:41:55 +02:00
iceman1001 f6f9140c79 already empty 2020-05-27 20:26:52 +02:00
iceman1001 72170720fb fix memleak on realloc 2020-05-27 20:24:02 +02:00
iceman1001 49687f4749 fix clarify bool usage 2020-05-27 20:22:26 +02:00
iceman1001 12a4c5f202 fix clarify bool usage 2020-05-27 20:22:07 +02:00
iceman1001 dded3953ef fix memleak on realloc and uninit variable 2020-05-27 20:21:42 +02:00
iceman1001 f96361f8f1 fix memleak 2020-05-27 20:08:22 +02:00
iceman1001 a7260029be OLD->MIX 2020-05-27 17:53:02 +02:00
iceman1001 25890c3567 OLD->MIX 2020-05-27 17:49:18 +02:00
iceman1001 5860cb5e92 OLD->MIX 2020-05-27 17:48:02 +02:00
iceman1001 46f191e13f OLD->MIX 2020-05-27 17:46:50 +02:00
iceman1001 b42c5f59e1 OLD->MIX 2020-05-27 17:44:54 +02:00
iceman1001 54d3ea9c8f OLD->MIX 2020-05-27 12:02:59 +02:00
iceman1001 abff3c2ea1 OLD-MIX 2020-05-27 11:59:24 +02:00
iceman1001 f3cc84220f OLD->MIX 2020-05-27 11:58:04 +02:00
iceman1001 045f2a8587 OLD->MIX 2020-05-27 11:55:32 +02:00
iceman1001 f32620a04b OLD->MIX 2020-05-27 11:53:17 +02:00
iceman1001 fa2e952dc9 chg, swapped prefix for HINT 2020-05-27 10:19:45 +02:00
iceman1001 a8c3859ed1 chg, 'script run' - added hint 2020-05-27 10:19:22 +02:00
Philippe Teuwen fcfdd92407 python: adjust help, hide more if no python available, search lua/cmd/py if no extension given 2020-05-27 01:15:20 +02:00
Philippe Teuwen b4c715d8fb script run: look for all three extensions if not specified 2020-05-27 00:40:01 +02:00
Philippe Teuwen 24bdecac8e cmake: use less hardcoded items 2020-05-26 22:21:59 +02:00
Philippe Teuwen 02c76f39e2 fix cmake for osx+python 2020-05-26 22:20:34 +02:00
iceman1001 125e05ec0e chg, clean up 2020-05-26 21:58:50 +02:00
iceman1001 1781837bf9 chg, cmake for OSX, (Thanks @doegex!) 2020-05-26 21:57:26 +02:00
Philippe Teuwen 25c5eebfcf attempt to fix cmake+osx+python 2020-05-26 18:54:58 +02:00
Philippe Teuwen 8498c32a78 cmake support python < 3.8 and 3.8 2020-05-26 18:41:24 +02:00
Philippe Teuwen 0464fd476b Makefile python 2020-05-26 17:41:30 +02:00
iceman1001 176f0dfe75 chg, function available in v3.6 Travis has v3.5... 2020-05-26 17:35:27 +02:00
iceman1001 646a4cc4a6 more version info 2020-05-26 17:32:16 +02:00
iceman1001 9edb30f166 chg, python3-embed checks (@doegox) 2020-05-26 17:01:53 +02:00
iceman1001 feafa62ded chg, cmake compiles 2020-05-26 16:57:54 +02:00
iceman1001 e7230fa5d7 chg, cmake woodo. almost there 2020-05-26 16:47:54 +02:00
iceman1001 748c077268 chg, python3 in cmake? 2020-05-26 15:49:28 +02:00
iceman1001 698a56a919 moved and modified some existing pyton scripts for testing 2020-05-26 14:43:40 +02:00
iceman1001 f7537519ff chg, make python aware of pm3 search paths 2020-05-26 14:41:58 +02:00
iceman1001 3f02fa6e34 chg, right number of args.. 2020-05-26 13:37:28 +02:00
iceman1001 5fcb031a68 chg, python scripts can not have "exit" calls... 2020-05-26 13:10:33 +02:00
iceman1001 4aa4006167 chg, python should close the script file 2020-05-26 13:09:18 +02:00
iceman1001 366ac6a41f creating argc/argv 2020-05-26 12:35:26 +02:00
iceman1001 e106a5717c simple script working 2020-05-26 12:17:41 +02:00
iceman1001 6b8f1b141e change, search in python dir.. 2020-05-26 12:07:01 +02:00
iceman1001 6e3e1baef7 logsss 2020-05-26 12:00:42 +02:00
iceman1001 f852bf41c3 adapt to optional python, Thanks @doegox! 2020-05-26 11:49:26 +02:00
iceman1001 0e57a1c6cd optional python.. Thanks @doegox! 2020-05-26 11:48:37 +02:00
iceman1001 06927f983a added python3 as script engine, if installed on system 2020-05-26 11:30:17 +02:00
iceman1001 26e8a5a1e0 added check for systemlib python3 in makefile 2020-05-26 11:29:44 +02:00
iceman1001 e95f807251 sign-compare 2020-05-26 10:59:12 +02:00
iceman1001 b3ff89e41e sign-compare 2020-05-26 10:57:11 +02:00
Philippe Teuwen 162b7b58df Makefile: more info 2020-05-25 13:28:08 +02:00
Philippe Teuwen fc2ff7bb0a Makefile: remove /usr/local/lib 2020-05-25 13:05:44 +02:00
Philippe Teuwen 68da06f721 makefile reorder 2020-05-25 10:15:51 +02:00
Philippe Teuwen 79f3cec717 use system zlib if available (client only) 2020-05-25 02:44:12 +02:00
Philippe Teuwen b4716f78a8 remove unused polarssl file 2020-05-25 02:18:16 +02:00
Philippe Teuwen 72acec5806 Makefile & CMake rework 2020-05-25 02:15:06 +02:00
Philippe Teuwen 9d97962759 use system jansson if available 2020-05-24 23:21:30 +02:00
Philippe Teuwen 0653feaec8 Use system whereami if available 2020-05-24 20:37:40 +02:00
iceman1001 bde4198184 fix hf mfu 2020-05-24 12:51:51 +02:00
iceman1001 e7585b5944 fix #747, 'hf mfu eload' - now detects and converts between plain/old/new mfu binary format 2020-05-24 11:17:11 +02:00
Philippe Teuwen a6f76444de Put logfiles in subdir 2020-05-24 01:20:43 +02:00
iceman1001 94aa7cde2b Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-05-23 12:26:50 +02:00
iceman1001 9e756c5957 chg: hf mf eload - made messages more clear.\n added color to hf mf helptext 2020-05-23 12:26:33 +02:00
Philippe Teuwen aef6d7e5f2 Detect and use system Lua. Makefile. Cmake todo 2020-05-22 16:24:34 +02:00
Philippe Teuwen d7cfaae17f Load prefs only after parsing of options, don't clutter -v 2020-05-22 13:59:30 +02:00
Philippe Teuwen f30ccd0f51 Makefile: fix cp version for armsrc 2020-05-22 13:43:57 +02:00
Philippe Teuwen f27760afd6 text 2020-05-22 00:24:08 +02:00
iceman1001 de8710f854 bleeding edge bae! 2020-05-21 22:24:00 +02:00
iceman1001 d40251ff0b Revert "Release v4.9237 - Ice Coffee ☕" 
This reverts commit 833bc4d9a3.
 2020-05-21 21:55:15 +02:00
iceman1001 833bc4d9a3 Release v4.9237 - Ice Coffee ☕ 2020-05-21 21:55:15 +02:00
Philippe Teuwen bf5c054414 Revert "Release v4.9230 - Ice Coffee ☕" 
This reverts commit db2e97c860.
 2020-05-21 12:51:35 +02:00
Philippe Teuwen db2e97c860 Release v4.9230 - Ice Coffee ☕ 2020-05-21 12:51:35 +02:00
iceman1001 3e389c6e07 Revert "Release v4.9224 - Ice Coffee ☕" 
This reverts commit 9cec93fd54.
 2020-05-21 09:25:32 +02:00
iceman1001 9cec93fd54 Release v4.9224 - Ice Coffee ☕ 2020-05-21 09:25:32 +02:00
iceman1001 521a76d3c2 Revert "Release v4.9222 - Ice Coffee ☕" 
This reverts commit a5aeadc339.
 2020-05-21 09:24:38 +02:00
iceman1001 a5aeadc339 Release v4.9222 - Ice Coffee ☕ 2020-05-21 09:23:32 +02:00
Philippe Teuwen c956314a99 fix mistake 2020-05-20 21:53:47 +02:00
Philippe Teuwen a556c50f27 Remove coffee to prepare release 2020-05-20 21:39:49 +02:00
Philippe Teuwen 88ae955673 version.c in cmake 2020-05-20 21:11:45 +02:00
Philippe Teuwen 0172b0638b Makefile: wrap sh and perl calls 2020-05-20 21:11:45 +02:00
Philippe Teuwen ef586c2a41 version info also for client, still cmake to do 2020-05-20 21:11:45 +02:00
iceman1001 eb7ef65f22 chg: 'lf nexwatch clone' - only use 12bytes 2020-05-20 19:52:22 +02:00
iceman1001 b770cfd51c le24toh is uint32_t 2020-05-20 19:22:17 +02:00
Philippe Teuwen c87afd0b7d trace load: err if offline mode 2020-05-20 18:41:25 +02:00
Philippe Teuwen 15ccb34535 Add -Wconversion in EXTRACFLAGS 2020-05-20 18:41:10 +02:00
iceman1001 56bde13110 format string 2020-05-20 14:15:35 +02:00
Iceman a064bf15a6
Merge pull request #741 from xianglin1998/android_lib 
Work directory supported.
 2020-05-20 11:17:54 +02:00
iceman1001 b6d764aec9 Add: 'lf fdx demod' - decoding of Bio-Thermo lf tag. Thanks to Rosco! See Destron Fearing LifeChip with Bio-Thermo technology and http://www.proxmark.org/forum/viewtopic.php?pid=38984#p38984 2020-05-20 11:13:21 +02:00
dxl e9d06e0ec5 Follow naming conventions. 2020-05-20 16:33:21 +08:00
dxl 1a90fa90d6 work directory supported. 2020-05-20 16:05:58 +08:00
iceman1001 8c22ef076b expanded from u16 -> u32 for keys to be loaded 2020-05-20 08:58:28 +02:00
Iceman 6a87bdd44e
Merge pull request #739 from grspy/master 
Fix 32-bit time_t compilation error on WIN64
 2020-05-19 20:47:49 +02:00
iceman1001 0c248f76ad chg: hf mfdes info - textual 2020-05-19 20:45:48 +02:00
grspy 8509d233d2 Fix 32-bit time_t compilation error on WIN64 2020-05-19 20:49:25 +03:00
Philippe Teuwen cb8d589fc4 armsrc: clarify static vars vs global vars, part 3 2020-05-19 18:12:40 +02:00
iceman1001 966bcc0d28 chg: adding execute/home/current working directory functions to lua 2020-05-19 09:13:31 +02:00
Philippe Teuwen 2ba350903a more tracelog rework 2020-05-19 02:14:51 +02:00
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
Philippe Teuwen 5984e1c03e makefiles: allow to skip pthread (for termux) 2020-05-15 17:40:59 +02:00
iceman1001 43b5ba4ae2 chg: enabled param to swap modulation to test 2020-05-15 17:05:33 +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
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