Commit graph

5820 commits

Author SHA1 Message Date
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