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
dxl
78ee43c9c4
Android platform adaptation(dxl)
2020-05-06 13:01:29 +02:00
Philippe Teuwen
d118ba9e06
comment out unused iceIIR_Butterworth
2020-05-06 13:01:17 +02:00
dxl
fcf0265704
missing include
2020-05-06 13:01:17 +02:00
dxl
021ee95e07
don't mix ifdef and defined
2020-05-06 13:01:17 +02:00
iceman1001
70add3fabe
fix: "trace list" too short array for explanation
2020-05-06 12:14:05 +02:00
iceman1001
6dadbb0423
chg: rpi aling warning
2020-05-05 08:19:26 +01:00
Philippe Teuwen
30e96ece74
lf nedap: fix cast align warning
2020-05-05 00:16:53 +02:00
Philippe Teuwen
2c250d5d14
hf epa: fix cast align warning
2020-05-04 23:58:58 +02:00
Philippe Teuwen
e68dd9e5cb
update whereami and avoid compiling unnneded troublesome parts
2020-05-04 23:18:00 +02:00
Philippe Teuwen
99381b4386
fix defined
2020-05-04 01:48:07 +02:00
Philippe Teuwen
58f71d97f5
silent some bad-function-cast
2020-05-04 01:18:26 +02:00
Philippe Teuwen
723503b74e
unshadow vars
2020-05-03 22:50:03 +02:00
Philippe Teuwen
4d4984657e
activate more warnings and ease their mgmt
2020-05-03 19:46:11 +02:00
Philippe Teuwen
c94eae0046
fix warning about cast realignment, WIP
2020-05-03 17:34:01 +02:00
Philippe Teuwen
82ad1b683a
bug ifneq <> ifeq
2020-05-03 12:50:33 +02:00
Philippe Teuwen
ed1fb14f5f
rework C includes in C++
2020-05-03 12:46:46 +02:00
Philippe Teuwen
19be62f7e6
stricter warnings: Wredundant-decls
2020-05-03 12:38:34 +02:00
Philippe Teuwen
6221d28e43
cflags
2020-05-03 12:19:42 +02:00
Philippe Teuwen
3529aea157
stricter warnings, wip
2020-05-03 01:13:28 +02:00
Philippe Teuwen
9358554884
stricter warnings, wip
2020-05-03 00:33:28 +02:00
Philippe Teuwen
0e39cb8e34
stricter warnings, wip
2020-05-02 23:54:27 +02:00
iceman1001
796cd36f85
chg: better error message when serial port allocation fails
2020-05-02 19:24:52 +02:00
iceman1001
96f03b4933
chg: leanient parsing of tcp:/bt:/socket: vars
2020-05-02 17:52:22 +01:00
Philippe Teuwen
6d0afbdbf3
Revert "client Makefile: link with pthread only if needed"
...
This reverts commit 43b69bd4e4
.
2020-05-01 00:28:28 +02:00
Philippe Teuwen
43b69bd4e4
client Makefile: link with pthread only if needed
2020-05-01 00:25:04 +02:00
Philippe Teuwen
f158f347e5
reveng Makefile: allow to skip test (e.g. for cross-compilation)
2020-05-01 00:13:56 +02:00
Philippe Teuwen
40c596e8af
client Makefile: allow to add includes (e.g. for termux)
2020-05-01 00:08:07 +02:00
Uli Heilmeier
f9eb1d3d77
Makefile: fix PKG_CONFIG_ENV
...
renaming PKG_CONFIG_PATH to PKG_CONFIG_ENV was too greedy
2020-04-29 22:52:41 +02:00
iceman1001
fa44eee82c
chg: "lf sim" - now only fills until bigbuffer is full
2020-04-29 20:33:29 +02:00
Philippe Teuwen
31ccc7d7ca
hardnested: don't drop field when in test mode
2020-04-29 20:20:06 +02:00
Philippe Teuwen
07f41da74d
fix coverity 226490 even if in practice next_common_bits is never > 7
2020-04-29 20:11:43 +02:00
Philippe Teuwen
b3f84bf7b3
make style
2020-04-29 19:41:45 +02:00
Philippe Teuwen
250418f64b
client Makefile: make sure to rebuild deps when needed
2020-04-29 19:18:01 +02:00
iceman1001
85f2233161
coverity fix 226496 226492 226490
2020-04-29 17:27:17 +02:00
iceman1001
5363385845
coverity fix 286655
2020-04-29 16:35:08 +02:00
Philippe Teuwen
7ca7677568
Linux: add native support for Bluetooth in client
2020-04-29 14:26:12 +02:00
iceman1001
cdb99fe650
cppchecker fix - duplicate
2020-04-28 22:58:05 +02:00
iceman1001
4896390dde
cppchecker fix
2020-04-28 22:31:45 +02:00
iceman1001
a7ececcb5d
cppcheck fix - duplicate condition
2020-04-28 22:26:16 +02:00
iceman1001
78cc7e10a5
cppcheck fix - duplicate condition
2020-04-28 21:53:01 +02:00
iceman1001
cd19bf81a8
cppcheck fix
2020-04-28 21:51:13 +02:00
iceman1001
0f5e4fe220
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2020-04-28 19:58:31 +02:00
iceman1001
d2e85b0040
coverity fix: shawdowfunction (stdio)\n. unsupported command shouldn't break execution (dfnames)
2020-04-28 19:58:15 +02:00
Philippe Teuwen
fbd0a7e284
typo
2020-04-28 19:58:07 +02:00
iceman1001
857526a945
coverity fix 286651
2020-04-28 19:08:07 +02:00
iceman1001
12f87938ea
coverity fix 279110
2020-04-28 18:51:24 +02:00
iceman1001
084a8161d4
coverity fix: 279106
2020-04-28 18:24:52 +02:00
Bjoern Kerler
3eee351f4f
Return PM3_SUCCESS if iso df names not supported
2020-04-28 18:16:52 +02:00
iceman1001
7303dd8c5d
coverity fix 279922 , div by zero
2020-04-28 14:51:47 +02:00
iceman1001
fa98a10b38
coverity fix 286651
2020-04-28 14:38:32 +02:00
iceman1001
0896cee51c
coverity fix 286680
2020-04-28 14:35:00 +02:00
iceman1001
0759f886f4
coverity fix 286923
2020-04-28 14:33:45 +02:00
iceman1001
5e925962d3
coverity fix 286994
2020-04-28 14:32:12 +02:00
iceman1001
25c94177f8
coverity fix 286664
2020-04-28 14:31:29 +02:00
iceman1001
6a55330398
enforce PACKED structs
2020-04-28 13:53:43 +02:00
iceman1001
662d3259ca
cppchecker fix, shadow var
2020-04-28 13:46:13 +02:00
iceman1001
f1df27e6bb
cppchecker fix - better return value handling
2020-04-28 13:44:25 +02:00
iceman1001
19a5a70cc8
cppchecker fix, now use res
2020-04-28 13:36:24 +02:00
iceman1001
d98f8e96f4
chg: hf iclass loclass - use defines, cppchecker happy
2020-04-28 13:28:29 +02:00
iceman1001
cf9a5a4850
coverity fix 286921, 286922, ..
2020-04-26 19:29:22 +02:00
iceman1001
e36a8ca5fb
coverity fix 286920
2020-04-26 19:28:58 +02:00
iceman1001
a3a7dfa5a1
coverity / cppchecker fixes : dont like that code style
2020-04-26 14:27:44 +02:00
iceman1001
00cac87fb2
coverity fix - resource leaks
2020-04-26 14:15:59 +02:00
iceman1001
5e51a72cae
coverity fix 286678 - resource leak
2020-04-26 14:13:12 +02:00
iceman1001
2e2bfc17a0
coverity fix: 286678
2020-04-26 13:54:55 +02:00
iceman1001
dd5679a53a
cppchecker fixes
2020-04-26 13:49:06 +02:00
iceman1001
f416fa9b4f
cppchecker fixes
2020-04-26 12:56:19 +02:00
Philippe Teuwen
7cd509c77c
make style
2020-04-26 11:18:04 +02:00
Philippe Teuwen
99eadded05
Merge branch 'settings'
...
* settings:
Get/display a single preference
Lighter msg for loading prefs, json will anyway always tell the filename
Make sure colors and emoji are disabled when not on TTY
Comment out file path code
Pre Filepath cleanup
Update preferences.c
tuning
streamline works
Update fileutils.c
updates
clean up
device debug and tweaks
2020-04-26 11:16:29 +02:00
netvader
eea4e5b147
Update aid_desfire.json
2020-04-26 09:08:43 +02:00
mwalker33
572f46ceee
Merge branch 'settings' of https://github.com/RfidResearchGroup/proxmark3 into settings
2020-04-26 10:20:23 +10:00
mwalker33
ba0b28a7de
Get/display a single preference
2020-04-26 10:18:00 +10:00
Philippe Teuwen
9bd5f27414
Rename PKG_CONFIG_PATH so it can be overruled by env
2020-04-26 01:24:33 +02:00
Philippe Teuwen
ae21a3148f
Lighter msg for loading prefs, json will anyway always tell the filename
2020-04-25 15:17:11 +02:00
Philippe Teuwen
a15d14e038
Make sure colors and emoji are disabled when not on TTY
2020-04-25 15:10:34 +02:00
Philippe Teuwen
0e1b1e166b
Remove redundant debug stdin info now that we have PROXPROMPT_CTX_STDIN
2020-04-25 11:13:39 +02:00
mwalker33
a8ff7b4815
Comment out file path code
2020-04-25 18:37:23 +10:00
Philippe Teuwen
ad3267cec1
fix osx, hopefully
2020-04-25 01:16:39 +02:00
Philippe Teuwen
ebd476a9c5
hardnested make: fix default compiler
2020-04-24 21:45:46 +02:00
Philippe Teuwen
8725807a8c
minor
2020-04-24 18:58:28 +02:00
Philippe Teuwen
011f973e7f
make style
2020-04-24 18:21:38 +02:00
mwalker33
7fdaa51678
Pre Filepath cleanup
2020-04-24 16:45:17 +02:00
mwalker33
3aee4fc5e9
Update preferences.c
2020-04-24 16:45:17 +02:00
mwalker33
dd09d4074c
tuning
...
File List optimised.
2020-04-24 16:45:17 +02:00
mwalker33
600e5d7d6f
streamline works
2020-04-24 16:45:17 +02:00
mwalker33
5060a52b3a
Update fileutils.c
...
Linux file permission fix
2020-04-24 16:45:17 +02:00
mwalker33
e2c56fe26c
updates
...
Added dump and trace path and clean a little for cleaner use and expansion.
2020-04-24 16:45:17 +02:00
mwalker33
b593d2c319
clean up
2020-04-24 16:45:17 +02:00
mwalker33
49c6806b1b
device debug and tweaks
2020-04-24 16:45:17 +02:00
Philippe Teuwen
fbe4e20326
remove c99 and c++11 restrictions
2020-04-24 16:43:21 +02:00
Philippe Teuwen
8c84d21a92
makefile: limit -D_ISOC99_SOURCE to Mingw
2020-04-24 16:42:41 +02:00
Philippe Teuwen
d6564e8eca
fix cmake for mingw
2020-04-24 00:08:42 +02:00
Philippe Teuwen
02d83c2ebf
Moving mfc_gen3_writer.lua to a branch till it becomes useable
2020-04-23 20:26:07 +02:00
netvader
b5d07ab914
Update aid_desfire.json
2020-04-23 17:27:16 +02:00
unknown
d041f3fc82
Fixed a block key check
2020-04-22 18:59:02 +03:00
Philippe Teuwen
7c27931685
cmake qt fix regression
2020-04-22 15:31:44 +02:00
Philippe Teuwen
05e7def3d5
cmake & rpi, take 2
2020-04-22 14:57:30 +02:00
Philippe Teuwen
869d96f118
cmake: fix rpi
2020-04-22 14:14:28 +02:00
Philippe Teuwen
25c1f31222
fix includes
2020-04-22 14:14:13 +02:00
Philippe Teuwen
00248d9aa7
cmake: less verbose when no Qt present
2020-04-22 13:55:28 +02:00
Philippe Teuwen
65d9408879
prompt: [usb|script] style
2020-04-22 12:24:21 +02:00
Philippe Teuwen
7760dd77e5
Add context to prompt
2020-04-22 12:22:24 +02:00
Philippe Teuwen
1f5544330c
prompt: filter ansi before calling readline
2020-04-22 09:32:32 +02:00
Philippe Teuwen
8bdda55115
Fix prompt colors in log -> spurious space in color macros -> adjust lots of files...
2020-04-22 02:22:55 +02:00
Philippe Teuwen
3235468e05
make style
2020-04-21 23:24:01 +02:00
Philippe Teuwen
f83d4b6c16
Merge pull request #699 from bkerler/mfdes_devel
...
Add hf mf des chk and dump commands
2020-04-21 23:23:01 +02:00
Philippe Teuwen
31d3f519c7
rename scritp accordingly to its own help
2020-04-21 22:51:36 +02:00
Philippe Teuwen
73c4a37684
Merge pull request #707 from Windslab/master
...
A lot of improvements
2020-04-21 21:22:07 +02:00
Philippe Teuwen
a68b8983f2
make style
2020-04-21 01:56:51 +02:00
Philippe Teuwen
31e79905f8
Clean more old paths
2020-04-21 01:44:31 +02:00
unknown
aae1f3c881
A lot of improvements
2020-04-20 20:29:32 +03:00
Philippe Teuwen
69b6a8f7f9
make clean: remove also old stuff
2020-04-19 16:31:25 +02:00
Philippe Teuwen
e4dea67cf3
rework reveng<>cliparser
2020-04-19 13:13:13 +02:00
Philippe Teuwen
07f3022aa6
make/cmake add common_fpga
2020-04-19 13:01:51 +02:00
Philippe Teuwen
2676740fb3
make/cmake: remove weirdy include paths like src/uart/../crypto
2020-04-19 12:53:46 +02:00
Philippe Teuwen
4967096e3b
make/cmake cliparser lib and remove redundant getopt from reveng
2020-04-19 12:40:50 +02:00
Philippe Teuwen
5f4385986c
cleaning makefile & cmake
2020-04-19 12:40:46 +02:00
Philippe Teuwen
8ea0f19181
minor
2020-04-19 00:59:02 +02:00
Philippe Teuwen
43d88c40e5
minor
2020-04-19 00:58:13 +02:00
Nahuel Grisolia
7e18a331d9
Fix uint8 vs uint32 interval number for tearoff experiment
2020-04-18 18:56:11 -03:00
Nahuel Grisolia
c73c09cbf6
Updated help and default values
2020-04-18 18:33:09 -03:00
Nahuel Grisolía
da81424348
OTP-TEAR
2020-04-18 21:37:31 +02:00
Philippe Teuwen
a04c8cb41c
cosmetic
2020-04-18 20:42:38 +02:00
Philippe Teuwen
f94a98b9c6
cmake qt5: no need for custom command if AUTOMOC?
2020-04-18 20:14:18 +02:00
Philippe Teuwen
17aacae8d3
fix clean path after src reorg
2020-04-18 20:13:46 +02:00
Philippe Teuwen
45134859cf
cmake: remove unneeded PIC in hardnested lib
2020-04-18 20:01:51 +02:00
Philippe Teuwen
c2ff11f321
hardnested compilation reorganized to be similar with cmake approach
2020-04-18 19:41:14 +02:00
Bjoern Kerler
b41c5769e7
Fix DESFIRE_UNKNOWN
2020-04-18 18:35:50 +02:00
Philippe Teuwen
26c28c188a
minor
2020-04-18 18:20:19 +02:00
Philippe Teuwen
f9857a8b0c
cmake: add cflags
2020-04-18 17:37:11 +02:00
Philippe Teuwen
dc6b751ea3
cmake: rework includes, wip, need to modify more src after merge
2020-04-18 16:27:20 +02:00
Philippe Teuwen
f32974bb07
cmake libs static
2020-04-18 16:27:20 +02:00
Philippe Teuwen
2aa587f35f
cmake: reveng keep includes local
2020-04-18 16:27:20 +02:00
Philippe Teuwen
b5ce5c1d99
cmake: mbedtls keep includes local
2020-04-18 16:27:20 +02:00
Philippe Teuwen
1ccd764837
cmake: hardnested
2020-04-18 16:27:20 +02:00
Philippe Teuwen
c5d2655ebe
cmake: fix reveng defines, keep them local
2020-04-18 16:27:20 +02:00
Philippe Teuwen
0b68f3b81e
cmake: fix zlib defines, keep them local
2020-04-18 16:27:20 +02:00
Philippe Teuwen
b7fb3b0746
cmake: fix jansson defines, keep them local
2020-04-18 16:27:20 +02:00
Philippe Teuwen
0fc5c41a49
cmake: fix liblua platform definitions to match regular Makefile
2020-04-18 16:27:20 +02:00
Philippe Teuwen
397f46c0ef
cmake: Fix the (not yet used) amiibo srcs
2020-04-18 16:27:20 +02:00
Philippe Teuwen
01432fd84b
Lower cmake min version to 3.10 for WSL
2020-04-18 16:24:29 +02:00
Philippe Teuwen
1a344a933d
Remove header files from CMakeLists
2020-04-18 16:24:29 +02:00
Uli Heilmeier
18f875cb84
cmake macOS: use brew installed readline
2020-04-18 16:24:29 +02:00
Uli Heilmeier
c888fcdb7e
Fix cmake qt: remove REQUIRED
2020-04-18 16:24:29 +02:00
TrustedUser
5003434885
¨fix: osc cmake
2020-04-18 16:24:29 +02:00
Uli Heilmeier
6562c22029
Fix qt5_found handling
2020-04-18 16:24:29 +02:00
Uli Heilmeier
64e7aa4c46
cmake: fix qt handling for macos
...
This is like we find qt in the Wireshark project.
Tested it with macOS. Not tested with Linux, Windows etc.
2020-04-18 16:24:29 +02:00
Iceman
4e233c682d
Update CMakeLists.txt
2020-04-18 16:24:29 +02:00
Philippe Teuwen
ad28dc1fa0
cmake: remove custom rule for .ui, we already have AUTOUIC
2020-04-18 16:24:29 +02:00
Philippe Teuwen
fdccfb2b88
add cmake build in Travis
2020-04-18 16:24:29 +02:00
Bjoern Kerler
78a5e666bb
Fix QT5 GUI CMake
2020-04-18 16:24:29 +02:00
Bjoern Kerler
6b1a8b8390
Add cmake support
2020-04-18 16:24:29 +02:00
Philippe Teuwen
edb96e75cf
Add QT_NO_DEBUG flag
2020-04-18 12:20:42 +02:00
Philippe Teuwen
7acc43fe9f
Removing debug flag
2020-04-18 12:10:03 +02:00
Bjoern Kerler
0762d29bb3
Another key
2020-04-17 21:37:16 +02:00
Bjoern Kerler
68747f5bbd
More keys
2020-04-17 21:25:13 +02:00
Bjoern Kerler
4b3a78538c
HF MFDES dump + chk commands added
2020-04-17 21:06:32 +02:00
iceman1001
69142baa7f
chg: "hf topaz info" - textual
2020-04-17 10:30:18 +02:00
iceman1001
40c69b3f83
chg: "lf hitag info" - added HITAG type detection (Thanks! @cosmo61)
2020-04-17 10:29:54 +02:00
iceman1001
b0854bb3aa
chg: SOCKET: connections (@xianling1998)
2020-04-16 16:46:45 +02:00
iceman1001
1bf32aad90
Chg: android adaptions from @xianglin1998
2020-04-16 16:46:09 +02:00
Philippe Teuwen
315cda0754
Merge pull request #692 from kalekume/patch-2
...
Added new AID F001D0
2020-04-16 11:58:35 +02:00
Bjoern Kerler
81bc0bc2b9
Reorder client src directories
2020-04-16 10:53:24 +02:00
kalekume
68f269ee3d
Added new AID F001D0
2020-04-16 10:36:42 +02:00
Philippe Teuwen
94192d0976
make style
2020-04-16 09:01:14 +02:00
iceman1001
588f7e98f5
more aid:s-...
2020-04-16 08:12:08 +02:00
netvader
6ad5c1f872
Update aid_desfire.json
2020-04-15 09:55:55 +02:00
Iceman
4a7d2838ec
Merge pull request #688 from mwalker33/Settings-2
...
Quick Fix
2020-04-15 09:47:28 +02:00
mwalker33
bdc4aae6a6
Typo
2020-04-15 17:42:11 +10:00
Iceman
5c511d35a9
Merge pull request #687 from mwalker33/Settings-2
...
Settings - full path name
2020-04-15 09:34:51 +02:00
mwalker33
5545219f82
Update Full Path
2020-04-15 16:40:28 +10:00
iceman1001
71e1c5e53b
added more DESFire aids
2020-04-15 07:56:55 +02:00
Iceman
23a0a6ece8
Merge branch 'master' into master
2020-04-14 22:03:04 +02:00
Ahmet Bilal Can
169d788fe9
add istanbulkart aid
2020-04-14 22:32:00 +03:00
Uli Heilmeier
d67af053fc
AID Desfire: Add clipper card
2020-04-14 21:27:41 +02:00
mwalker33
0b43252a02
Test code for full path
2020-04-14 19:17:00 +10:00
iceman1001
7ee49df717
Chg: updates from whereami repo. I am sure I broke something now
2020-04-14 09:24:08 +02:00
Bjoern Kerler
5fc922f6f9
Add Key display on enum
2020-04-14 00:35:22 +02:00
Bjoern Kerler
5c4148ec15
Fixes after pull
2020-04-13 23:56:04 +02:00
Bjoern Kerler
0ff31a9fa8
changes
2020-04-13 23:54:05 +02:00
Bjoern Kerler
49f93cbbd0
Implement several commands
2020-04-13 23:50:05 +02:00
iceman1001
abfcb524b5
minor coverity fixes
2020-04-13 14:47:36 +02:00
Iceman
ba926addfb
Merge pull request #679 from uhei/clang-warn3
...
cmdhfmfdes: Fix clang tautological-pointer-compare warning
2020-04-13 14:25:48 +02:00
Uli Heilmeier
dc002d224a
cmdhfmfdes: Fix clang tautological-pointer-compare warning
...
Fixes: RfidResearchGroup/proxmark3#676
2020-04-13 12:56:36 +02:00
Iceman
ced45cf865
Merge pull request #678 from mwalker33/Settings-2
...
getwd quick fix compile error
2020-04-13 12:50:10 +02:00
mwalker33
fd5fe61462
getwd fix
2020-04-13 20:46:01 +10:00
Iceman
e1c65296a3
Merge pull request #677 from mwalker33/Settings-2
...
Settings 2
2020-04-13 12:34:42 +02:00
mwalker33
acf4c09aa3
Update proxguiqt.h
...
Cleanup
2020-04-13 19:43:15 +10:00
mwalker33
dded69c989
Update proxmark3.c
...
Disable use_prefence_file
2020-04-13 19:35:19 +10:00
mwalker33
3b4f851d2d
tweak save
2020-04-13 16:17:57 +10:00
mwalker33
0cc2bda952
Update preferences.c
...
Error msg and show help if invalid option detected
2020-04-13 14:39:16 +10:00
mwalker33
82bbea3874
Update preferences.c
2020-04-13 14:12:54 +10:00
mwalker33
c924e2d589
save on exit
2020-04-13 13:51:03 +10:00
mwalker33
b72123a093
Update preferences.c
2020-04-13 12:44:34 +10:00
mwalker33
0b360d4dc0
Preference commands rework
2020-04-13 12:12:47 +10:00
mwalker33
69eef755d3
Window Size/Pos Tracking
2020-04-13 09:32:47 +10:00
Bjoern Kerler
9c4cf973ab
NONE is NULL
2020-04-13 01:26:44 +02:00
Bjoern Kerler
e543637897
PICC Format fixes
2020-04-13 01:19:26 +02:00
Bjoern Kerler
30a044445a
Add mifare desfire CreateStdDataFile
2020-04-13 00:59:01 +02:00
Bjoern Kerler
11ca483617
Merge pull request #25 from RfidResearchGroup/master
...
Update
2020-04-12 21:29:33 +02:00
iceman1001
99d7a0a1c9
chg: hf mfu ndef - better message when failed to find a mfu tag
2020-04-12 21:27:32 +02:00