Commit graph

412 commits

Author SHA1 Message Date
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 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
Philippe Teuwen aef6d7e5f2 Detect and use system Lua. Makefile. Cmake todo 2020-05-22 16:24:34 +02:00
Philippe Teuwen f30ccd0f51 Makefile: fix cp version for armsrc 2020-05-22 13:43:57 +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 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
Philippe Teuwen 5984e1c03e makefiles: allow to skip pthread (for termux) 2020-05-15 17:40:59 +02:00
Philippe Teuwen 2f293e211a show compiler version 2020-05-11 10:21:32 +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 74f16dc092 move whereami to deps 2020-05-08 17:04:28 +02:00
Philippe Teuwen e68dd9e5cb update whereami and avoid compiling unnneded troublesome parts 2020-05-04 23:18:00 +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 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 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 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
Philippe Teuwen 250418f64b client Makefile: make sure to rebuild deps when needed 2020-04-29 19:18:01 +02:00
Philippe Teuwen 7ca7677568 Linux: add native support for Bluetooth in client 2020-04-29 14:26:12 +02: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 ad3267cec1 fix osx, hopefully 2020-04-25 01:16:39 +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 69b6a8f7f9 make clean: remove also old stuff 2020-04-19 16:31:25 +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 17aacae8d3 fix clean path after src reorg 2020-04-18 20:13:46 +02:00
Philippe Teuwen c2ff11f321 hardnested compilation reorganized to be similar with cmake approach 2020-04-18 19:41:14 +02:00
Philippe Teuwen 26c28c188a minor 2020-04-18 18:20:19 +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 81bc0bc2b9 Reorder client src directories 2020-04-16 10:53:24 +02:00
Bjoern Kerler f76de40982 Rework auth for client and device 2020-04-12 17:39:11 +02: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
Iceman 2427d1430e
Merge pull request #650 from mwalker33/Settings
Settings Base
2020-04-06 10:45:58 +02:00
iceman1001 5e9e6a9ad8 prepp hookup for cryptorf cmds 2020-04-06 06:17:05 +02:00
mwalker33 8fea6cddf7 Concept 2020-04-05 20:36:39 +10:00
iceman1001 f805e5c7c7 whitespace 2020-03-10 17:10:05 +01:00
iceman1001 2886a99350 add: cryptohelper support 2020-02-27 16:35:17 +01:00
Philippe Teuwen 5cdc6aab48 Remove libsndfile dep and code our own savewav 2020-01-13 13:49:32 +01:00
iceman1001 01f215a924 Chg: hooked up generator 2020-01-02 15:29:15 +01:00
iceman1001 ea5680dba8 style 2019-12-22 12:51:40 +01:00
iceman1001 286333ca91 add: hf lto info - skeleton to add LTO-CM (Cartridge memort) to PM3 2019-12-22 11:16:59 +01:00
merlokk 17a2379ddd hf mfp check sketch 2019-11-28 00:49:12 +02:00
merlokk d14644c09f add aidsearch sketch 2019-11-04 19:54:23 +02:00
iceman1001 801ace94a2 dummy gui compilation on OSX.. 2019-10-16 15:37:39 +02:00
iceman1001 71baf71e17 Add 'lf motorola *' commands. Old grey Motorola cards, presumably Flexpass, which operates in 74 kHz, PSK1 , Clock 32. No chance a t55x7 can clone it :), simulation should be doable 2019-10-11 23:13:52 +02:00
Philippe Teuwen 8b99cd0303 Add SKIPQT makefile var 2019-10-09 19:28:37 +02:00
iceman1001 10a4361ccc Add: 'lf gallagher *' support. Unknown how to decode to printed number yet. 2019-10-08 21:45:40 +02:00
iceman1001 af56fa8242 started to extract VeriChip demod/clone 2019-10-01 14:30:30 +02:00
iceman1001 fa36018bef also compile... 2019-09-18 19:42:59 +02:00
Philippe Teuwen afe891647f merge flasher in client 2019-09-09 01:35:15 +02:00
Philippe Teuwen 9cf2cd7ca9 remove leading/tailing "/" from installation RELPATHs 2019-09-05 23:20:46 +02:00
Philippe Teuwen 00ad68215b add cmdscript example 2019-09-04 23:28:19 +02:00
Philippe Teuwen bccb9069f9 prepare libamiibo.a inclusion 2019-09-03 00:18:43 +02:00
Philippe Teuwen 3245260c00 Add Makefile.defs with common defs 2019-08-30 22:10:06 +02:00
Philippe Teuwen d772c6169a rename flasher -> proxmark3-flasher 2019-08-30 21:57:43 +02:00
Philippe Teuwen 4fdb5a2f4b make install: half way 2019-08-30 21:55:13 +02:00
Philippe Teuwen b5f5b9276f make install skeleton 2019-08-30 21:44:40 +02:00
Philippe Teuwen 4d31b2399b reintroduce PREFIX and use relative paths for finding share/ when installed, independently of PREFIX 2019-08-30 21:36:10 +02:00
Philippe Teuwen 73cefedd61 remove entirely ncurses, not needed nowadays 2019-08-29 18:22:14 +02:00
iceman1001 6529c9616f chg: remove termcap and use pkg-config for ncurses (@ZeroChaos-) 2019-08-29 16:56:22 +02:00
Philippe Teuwen 254beefda2 Fix mingw utf8->cp850 support 2019-08-28 00:03:27 +02:00
Philippe Teuwen e0cdb5d7a7 makefile: allow override of install paths 2019-08-23 21:07:20 +02:00
Philippe Teuwen 23044c00d0 rename and move dict files 2019-08-22 22:16:33 +02:00
Philippe Teuwen 9825f521b4 Fix clang issue where generated .d are sometimes newer than .o 2019-08-22 21:05:45 +02:00
Iceman a0f261c1e0 chg: moved fileutils from loclass 2019-08-21 14:41:33 +02:00
Philippe Teuwen 589f1e9d3e client/Makefile: add missing deps 2019-08-19 21:50:16 +03:00
Philippe Teuwen 0449527e2a adapt client/Makefile to new mbedtls & zlib way of working, remove unneeded dirs 2019-08-19 21:50:16 +03:00
Philippe Teuwen 0115efe190 isolate reveng, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen 6ebae499aa rework fpga_compress & isolate zlib: use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen f4c810f83b allow override of CFLAG & alike, remove /opt paths 2019-08-19 21:50:16 +03:00
Philippe Teuwen ea601f4052 fix reveng for all platforms else than WIN32 2019-08-14 21:53:04 +02:00
Philippe Teuwen 80b4e81130 Fix fpga_compress race condition and isolate it in tools 2019-08-11 21:42:01 +02:00
Philippe Teuwen d19754567d summer restructuring:
* .h include only the strict minimum for their own parsing
  * this forces all files to include explicitment their needs and not count on far streched dependencies
  * this helps Makefile to rebuild only the minimum
  * according to this rule, most standalone .h are now gone
  * big app.h is gone
  * remove seldom __cplusplus, if c++ happens, everything will have to be done properly anyway
* all unrequired include were removed
* split common/ into common/ (client+arm) and common_arm/ (os+bootloader)
  * bring zlib to common/
  * bring stuff not really/not yet used in common back to armsrc/ or client/
  * bring liblua into client/
  * bring uart into client/
  * move some portions of code around (dbprint, protocols,...)
* rename unused files into *_disabled.[ch] to make it explicit
* rename soft Uarts between 14a, 14b and iclass, so a standalone could use several without clash
* remove PrintAndLogDevice
* move deprecated-hid-flasher from client to tools
* Makefiles
  * treat deps in armsrc/ as in client/
  * client: stop on warning (-Werror), same as for armsrc/

Tested on:

* all standalone modes
* Linux
2019-08-11 21:42:01 +02:00
Philippe Teuwen c58937b5f5 client: clean deps while cleaning objects 2019-08-09 12:12:22 +02:00
iceman1001 fbff51c88d Add: hf thinfilm info - support to read and decode Kovio Thinfilm NCT tags 2019-08-01 09:39:33 -04:00
cjbrigato 5c3676ad81 ADD: Early SPIFFS implementation see #257, UPDATE HF_COLIN accordingly 2019-07-22 22:56:06 +02:00
Gabriele Gristina 563050c8ba Fix compilation under MacOSX 2019-07-10 18:43:19 +02:00
Philippe Teuwen e047d223e4 Fix #216: skip --as-needed linker options under MacOSX 2019-07-06 10:06:04 +02:00
Philippe Teuwen 0eea50f5a0 Add support for compilation on RaspberryPiZero (armv6)
More generally, add support for platforms with atomics, which not really linked to
architecture but compiler features. This may also help on some mips for example.
2019-06-26 00:12:32 +02:00
Philippe Teuwen 742fe16830 Makefile verbose mode: make V=1 as for CMake 2019-06-02 16:04:35 +02:00
Philippe Teuwen 8c0cd4cfa2 Cleaner makefile execution, use 'make Q=' if you want to see full lines 2019-06-02 00:25:25 +02:00
Philippe Teuwen 9b668e3827 client Makefile doesn't depend on platform specs anymore 2019-06-01 01:03:34 +02:00
Philippe Teuwen 5e83fcbd58 client Makefile doesn't use PLATFORM_DEFS anymore 2019-06-01 00:59:11 +02:00
Philippe Teuwen e98c4e246d rework standalone makefile 2019-06-01 00:23:38 +02:00
Uli Heilmeier 94b782ee10 client/Makefile: use brew libreadline on macOS
Make sure we use libreadline from brew and not the default macOS shipped one.
Otherwise compilation fails for undefined rl_event_hook
2019-05-10 12:24:38 +02:00
Philippe Teuwen c6b8c0c472 manual Makefile style (as some tabs need to be preserved) 2019-05-06 20:45:59 +02:00
iceman1001 dd82c42588 fix #185 - Only -mno-ms-bitfields on MINGW (@doegox) 2019-05-06 15:37:40 +02:00
Philippe Teuwen 3176684f4a Add usart dev cmds & dynamic flash support capability 2019-05-03 22:30:17 +02:00
Philippe Teuwen 27f7057961 Rename few USB -> PM3 to avoid misleading interpretations 2019-04-30 21:10:11 +02:00
Philippe Teuwen 540fecb760 Merge branch 'master' into experimental_varlen
* master:
  adjust standalone doc
  Use placeholder for standalone mode if needed
  Move compile options to Makefile.hal
  textual
  chg: refactor standalone mode info string add: icerun - skeleton standalone mode for ppl to use as base for their new modes.
2019-04-25 23:01:49 +02:00
Philippe Teuwen f3b3508d3e Move compile options to Makefile.hal 2019-04-25 22:15:16 +02:00
Philippe Teuwen 517bf7e238 Merge branch 'master' into experimental_varlen
* master:
  Force no-ms-bitfields to ensure proper struc packing on Windows
2019-04-24 15:05:09 +02:00
Philippe Teuwen 1b246cd380 Force no-ms-bitfields to ensure proper struc packing on Windows 2019-04-24 15:04:43 +02:00
Philippe Teuwen 4eaa2fc5aa move common util fcts to /common to avoid common files (e.g. crc) to depend on non-common files 2019-04-16 23:02:40 +02:00
Philippe Teuwen 44bbb7d2c7 new frame format, smaller and with crc. Some code simplified 2019-04-16 20:00:17 +02:00
Philippe Teuwen 5c55664fc5 use more static and fix [-Wmissing-prototypes] 2019-04-13 21:57:13 +02:00
Philippe Teuwen 9cec581f1c Makefile: remove WINBINS/WINEXES, ProxSpace doesn't use them 2019-03-29 09:49:42 +01:00
Philippe Teuwen 2ebada74f0 makefile: fix race condition, now we can make -j8 :) 2019-03-27 23:14:19 +01:00
Philippe Teuwen 119e3f0ed9 Makefile: allow alternative platforms, try make PLATFORM=foo 2019-03-11 00:44:34 +01:00
Philippe Teuwen 73437dea62 Makefile: avoid compiling hardnested multiarch stuff systematically 2019-03-10 12:22:02 +01:00
Philippe Teuwen 2f12e57408 Makefiles: remove spurious spaces/tabs 2019-03-10 11:35:03 +01:00
merlokk cbe25f4832 add ndef.c/h 2019-03-05 00:11:31 +02:00
merlokk ee9daac029 Merge branch 'master' of github.com:merlokk/proxmark3i into mf_mad
# Conflicts:
#	client/cmdhfmf.c
#	client/mifare/mifarehost.c
2019-03-01 19:37:43 +02:00
iceman1001 2dc3bc6af3 ADD: 'lf keri' - basic commands. 2019-02-23 15:44:34 +01:00
merlokk db7580203b create mad.c/h 2019-02-21 19:34:12 +02:00
merlokk 3b21b17509 move mifare stuff to its folder 2019-02-21 19:15:46 +02:00
iceman1001 7934630d2b FIX: Makefile bad styled calls 2019-02-14 19:27:39 +01:00
merlokk 88d42a1af5 make 2018-12-28 13:46:52 +02:00
merlokk 1099c6923d added COSE algorithms 2018-11-26 16:12:28 +02:00
merlokk 8f1c67d512 added fidocore 2018-11-17 16:19:09 +02:00
merlokk 2d17fb172a added cbor print sketch 2018-11-16 18:33:10 +02:00
merlokk cbdb42560c added make 2018-11-16 17:06:13 +02:00
merlokk 6cd6275361 refactoring 2018-11-15 14:37:38 +02:00
merlokk 84efb3256b makefile 2018-11-14 11:41:18 +02:00
merlokk 7214c70720 fido commands hash checks works. 2018-11-13 19:02:02 +02:00
Oleg Moiseenko b7fa407830
Merge branch 'master' into fido 2018-11-12 15:06:21 +02:00
merlokk ab196ad2ee added jansson 2018-11-12 15:00:35 +02:00
merlokk 074c138de7 all works except of jansson private symbols linking 2018-11-08 19:55:51 +02:00
merlokk f03261be9a compiled. not linking.... 2018-11-08 19:14:30 +02:00
merlokk 4fed815b88 added core files.
need to add:
1. jansson (maybe needs jansson-devel)
2. arm and client side of exchangeapdu14a
2018-11-08 17:29:58 +02:00
merlokk ec1e04342c compiles 2018-11-07 18:31:36 +02:00
merlokk 6ab12db7a0 mbedtls added 2018-11-07 18:05:02 +02:00
merlokk 8bb192fc75 added some crypto 2018-10-26 14:12:20 +03:00
merlokk 61ea3109c9 start merge 2018-10-24 18:18:05 +03:00
merlokk ab5233d29f now it needs to resolve issues in reveng 2018-10-11 11:48:46 +03:00
Chris 1fb121474e osx: fix annoying focus behaviour (@anticat)
https://github.com/Proxmark/proxmark3/pull/689

OS X has a global menu bar and a per app dock icon. Therefore, all
GUI applications launched from a terminal will become focused - even
if they don’t show any windows. Thereby the terminal loses focus.

Since is it very annoying to re-focus the terminal after each proxmark
client launch, this change makes the client unfocusable during launch
and restores the regular behaviour when a window is created.
2018-10-07 09:01:24 +02:00
Chris 7d09a466fb FIX: OSX disable app-nap during serial comm (@anticat)
https://github.com/Proxmark/proxmark3/pull/687
2018-10-06 13:29:20 +02:00