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