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

668 commits

Author SHA1 Message Date
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
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 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 35cfd4931f remove debug statement 2020-06-18 17:55:09 +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
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 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
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 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
Philippe Teuwen cb614f3f11 cliparser: generalize ctx usage 2020-06-10 11:34:33 +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 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 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 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
iceman1001 86c649f955 chg: "lf viking demod" - prepping for lib 2020-06-08 18:43:34 +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
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 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 f6566f89f2 chg: 'sc upgrade' - now uses fileutils 2020-06-03 13:05:33 +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 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 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 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 d840084492 rearrange 2020-06-02 09:37:53 +02:00
iceman1001 8ed6afa99a fix cppcheck 2020-06-02 09:37: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
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
iceman1001 125e05ec0e chg, clean up 2020-05-26 21:58:50 +02:00
iceman1001 176f0dfe75 chg, function available in v3.6 Travis has v3.5... 2020-05-26 17:35:27 +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 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 06927f983a added python3 as script engine, if installed on system 2020-05-26 11:30:17 +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 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
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 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 d7cfaae17f Load prefs only after parsing of options, don't clutter -v 2020-05-22 13:59:30 +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 a556c50f27 Remove coffee to prepare release 2020-05-20 21:39:49 +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
iceman1001 56bde13110 format string 2020-05-20 14:15:35 +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
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
iceman1001 8c65649258 better fault text 2020-05-15 17:04:33 +02:00
iceman1001 351a8d26af adjust tests 2020-05-15 17:03:28 +02:00
iceman1001 f3b4028e8a textaul, worked return codes for tests and swaped to printandlog 2020-05-15 17:02:42 +02:00
iceman1001 ddb432ec8f textual 2020-05-15 17:00:53 +02:00
iceman1001 f7bbf8b59f chg: 'lf indala demod' -more lenient size check 2020-05-15 09:00:44 +02:00
Philippe Teuwen 982f4231f7 fix coverity 263979 logically dead code 2020-05-14 18:01:52 +02:00
Philippe Teuwen 4e2d1e66ab fix coverity 286660 logically dead code 2020-05-14 17:59:46 +02:00
iceman1001 bddd2a9fc1 removed printvar 2020-05-14 17:17:47 +02:00
iceman1001 555d970c7d clock can be negative 2020-05-14 17:05:51 +02:00
iceman1001 e444640068 printandlogex 2020-05-14 16:59:02 +02:00
Philippe Teuwen 6a387c0b1b data tune, as suggested by @iceman 2020-05-14 12:58:34 +02:00
iceman1001 827439bddf cppcheck function name mis 2020-05-14 09:20:27 +02:00
iceman1001 a40c2727e6 cppcheck fix, unused struct 2020-05-14 09:19:12 +02:00
iceman1001 977b198816 cppcheck fix 2020-05-14 09:03:54 +02:00
Philippe Teuwen ffdd338dea make style 2020-05-14 01:04:26 +02:00
iceman1001 997567a9d6 cppcheck out-of-bounds 2020-05-13 23:31:01 +02:00
Philippe Teuwen 6a006677ef fancy timers 2020-05-13 23:20:46 +02:00
iceman1001 9af1807122 chg: psk demodualtion, lets keep those starting samples to easily find the zero init bit 2020-05-13 17:29:56 +02:00
iceman1001 e2671d5b50 fix coverity 286654 wrong sized argument 2020-05-13 12:26:37 +02:00
iceman1001 96108d826a fix coverity 286922 mem leak 2020-05-13 12:24:28 +02:00
Jamie Fiedler 97901a761f use machine/endian.h with osx 2020-05-13 03:35:38 -04:00
Philippe Teuwen 2c4eda6ab9 Fix 2 issues in proxendian.h, see details: 
Only some OSes include endian.h from sys/types.h, not Termux, so let's include endian.h directly.
Moreover the past logic defined BYTE_ORDER to an undef macro, so BYTE_ORDER was not undef but def to 0
and BYTE_ORDER != LITTLE_ENDIAN && BYTE_ORDER != BIG_ENDIAN was always false as (0!=0 && 0!=0)
 2020-05-13 02:09:03 +02:00
Philippe Teuwen 66fd6d70a0 hardnested: more readable preprocessing 2020-05-12 13:26:16 +02:00
iceman1001 5e4c83cc2f redundant 2020-05-12 10:30:14 +02:00
Philippe Teuwen 8dcf670f72 ore hardnested switch to handle 2020-05-12 01:17:38 +02:00
Philippe Teuwen a3aa38e624 trying to help old gcc 5... 2020-05-12 00:58:02 +02:00
Philippe Teuwen 3e05d28678 more hardnested switch to handle 2020-05-12 00:50:49 +02:00
Philippe Teuwen 7f6c078de2 fix cbor enum 2020-05-12 00:44:22 +02:00
iceman1001 00cca150ed Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-05-12 00:08:12 +02:00
iceman1001 56371fe7d5 coverity fixes 2020-05-12 00:07:06 +02:00
Philippe Teuwen 1a89680e7b fix unused-but-set warning 2020-05-11 23:52:38 +02:00
Philippe Teuwen b46a99d7d7 remove switch-enum warnings 2020-05-11 23:50:14 +02:00
iceman1001 30184b2b5c cleaning 2020-05-11 22:34:54 +02:00
iceman1001 4b68ac0a90 chg: lenient nexwatch demod sizes 2020-05-11 22:34:33 +02:00
iceman1001 5fd48305de chg: lf nexwath sim/clone - now supports 88bit format direct. See helptext for samples 2020-05-11 21:58:47 +02:00
iceman1001 093065f77a chg: 'data load' - color 2020-05-11 17:23:01 +02:00
iceman1001 d739edd13e Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-05-11 15:00:09 +02:00
Philippe Teuwen b377ca763a cmdlft55xx : Fix buf overrun (gcc 10 error) 
src/cmdlft55xx.c:2560:43: error: ‘ - (Unknown)’ directive output may be truncated writing 21 bytes into a region of size between 15 and 24 [-Werror=format-truncation=]
 2560 |             snprintf(retStr, sizeof(buf), "%u - " _RED_("(Unknown)"), id);
      |                                           ^~~~~~~
src/cmdlft55xx.c:2560:13: note: ‘snprintf’ output between 23 and 32 bytes into a destination of size 25
 2560 |             snprintf(retStr, sizeof(buf), "%u - " _RED_("(Unknown)"), id);
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 2020-05-11 13:58:38 +02:00
iceman1001 11884df687 textual 2020-05-11 11:45:45 +02:00
iceman1001 0c20369c3f Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-05-11 10:00:36 +02:00
iceman1001 9b08f7c39b chg: 'lf nexwatch demod' - now detects type, and show parity /chksum 2020-05-11 09:29:51 +02:00
Philippe Teuwen c1209ca0f5 (clang) fix unused function warning 2020-05-11 02:16:43 +02:00
Philippe Teuwen f6245cdb79 fix appveyor multiple definition of enum error 2020-05-11 01:23:28 +02:00
iceman1001 280b7d9c46 chg: 'lf nexwatch demod' - correct parity calc 2020-05-11 01:13:58 +02:00
iceman1001 f3293c9dcd chg: lf nexwatch demod - now descrambles the id aswell 2020-05-10 22:29:29 +02:00
Philippe Teuwen dc8178d43e Remove type-limits warning 2020-05-09 15:27:35 +02:00
Philippe Teuwen 1b0fd2389a Remove tautological-type-limit-compare 2020-05-09 14:41:12 +02:00