iceman1001
f4b3dec0c8
remove verichip.
2020-07-08 18:09:34 +02:00
iceman1001
c56245d1aa
chg 'lf t55xx info' - detection of t55x7 configuration blocks
2020-07-08 18:04:51 +02:00
iceman1001
327af5764d
remove
2020-07-08 17:37:35 +02:00
iceman1001
2fcc9b07ef
disable verichip stuff. should be inside FDX already
2020-07-08 17:37:01 +02:00
iceman1001
584fe52153
lf t55 configblock detection updated
2020-07-08 13:41:38 +02:00
iceman1001
aa0baa26c6
fix: missing define on some mingw
2020-07-08 11:09:20 +02:00
iceman1001
ce24e6acbb
fpga merge hell, all compiles
2020-07-08 09:45:49 +02:00
iceman1001
fef3a764ae
chg: hf mf decrypt - helptext (thanks @AdamLaurie)
2020-07-07 15:36:51 +02:00
iceman1001
d83a45f0cb
fpga merge changes
2020-07-06 15:16:00 +02:00
iceman1001
ae8be54fca
clean
2020-07-06 05:43:38 +02:00
iceman1001
927cd71ed9
use reflect fct
2020-07-06 05:43:12 +02:00
iceman1001
7d3cab1669
clean
2020-07-06 05:42:43 +02:00
iceman1001
9d204897d1
fix #830 - 'lf em 4x50_info/read' - now print msb and lsb again.
2020-07-06 05:41:44 +02:00
iceman1001
7d1a278197
merge hell p.x
2020-07-03 21:33:17 +02:00
dxl
64068ba430
android adapt changed.
2020-07-03 16:46:40 +08:00
iceman1001
e6c046e17c
adapt banner to smaller views
2020-07-01 12:31:57 +02:00
iceman1001
1ec2a83e39
style
2020-06-30 18:50:38 +02:00
iceman1001
88d4d037f1
enable EV3 tests
2020-06-30 17:59:35 +02:00
iceman1001
aa0b3c67ba
chg: lf em 4x50_write - output flow
2020-06-30 17:59:06 +02:00
iceman1001
86bfdcf260
chg: lf em 4x50_read / info - remake output
2020-06-30 17:43:47 +02:00
iceman1001
a3a7f0d4ad
hw tia, status - textual
2020-06-30 12:50:31 +02:00
tharexde
9c263b3fb8
fixed simple compilation errors
2020-06-30 01:51:24 +02:00
tharexde
da44e0fc96
Merge branch 'master' into dav-tmp
...
solved merge conflict
2020-06-30 01:05:10 +02:00
iceman1001
2abd7e08b4
chg: disable ctrl-c on mingw/ps
2020-06-29 22:23:46 +02:00
iceman1001
8d7a0c7fc7
pref show - textual
2020-06-29 18:16:28 +02:00
iceman1001
2fe42173de
chg: when pressing ctrl-c, the command history is saved
2020-06-29 18:10:40 +02:00
iceman1001
ac12a892b0
fix coverity 290964, 286679, 286658, 286652
2020-06-29 12:11:17 +02:00
iceman1001
a6cc73a4d5
fix coverity 293468
2020-06-29 11:58:24 +02:00
iceman1001
714652b1f2
fix coverity 226321
2020-06-29 11:56:56 +02:00
iceman1001
a9b2752673
fix coverity 292483
2020-06-29 11:56:18 +02:00
iceman1001
e6bb7a8a87
fix coverity 292481
2020-06-29 11:32:38 +02:00
iceman1001
d5b379207e
fix coverity
2020-06-29 11:22:09 +02:00
iceman1001
682de4eee0
fix coverity 290962, 290961
2020-06-29 11:21:46 +02:00
iceman1001
5d08dae554
fix coverity 290769, 290768
2020-06-29 11:10:02 +02:00
iceman1001
b5b5520546
fix coverity 286922
2020-06-29 10:42:22 +02:00
iceman1001
29a4a888a4
fix coverity 290965
2020-06-29 10:32:35 +02:00
iceman1001
8fd4bb6e33
preparing ndef command for desfire
2020-06-29 10:29:12 +02:00
iceman1001
8bd1a44ba7
textual
2020-06-29 10:26:58 +02:00
iceman1001
18ca4cb883
textal
2020-06-29 10:26:27 +02:00
iceman1001
4eb7776a07
text and cleanup
2020-06-29 10:25:51 +02:00
Iceman
7df20bc61e
Merge pull request #822 from tharexde/dev-em4x50_sread
...
EM4x50 function "sread" (standard/selective read)
2020-06-29 10:10:53 +02:00
iceman1001
f57a304362
fix #823
2020-06-29 08:05:43 +02:00
tharexde
844efbb9ac
Merge branch 'master' into dev-em4x50_sread
2020-06-28 21:50:37 +02:00
tharexde
9aafc094b6
deleted nearly all EM4x50 code; new EM4x50 code is in 'cmdlfem4x50.c' (device side instead GraphBuffer)
2020-06-28 21:43:13 +02:00
tharexde
78511df9f2
integrated 'lread' into 'lf search' process and renamed 'lread' to 'read'
2020-06-28 21:41:21 +02:00
tharexde
91ff0350df
introduced 'IfPm3EM4x50' function
2020-06-28 21:39:59 +02:00
tharexde
c572a2bab8
introduced 'IfPm3EM4x50' function
2020-06-28 21:39:27 +02:00
tharexde
a01c5aff0e
deleted EM4x50 functions due to switch to new 'read' function for EM4x50 tag (device side)
2020-06-28 21:37:12 +02:00
tharexde
c6435d2f96
output changes due to integration of 'read' into 'lf search' process
2020-06-28 21:35:06 +02:00
tharexde
955c7a642d
renamed 'sread' to 'read'
2020-06-28 21:33:37 +02:00
iceman1001
fe3e77915d
hf iclass reader - output redesign
2020-06-28 19:13:01 +02:00
iceman1001
c3a833b101
text
2020-06-27 22:22:15 +02:00
iceman1001
b300899f8c
hf 14a info - MIFARE DESFire MF3ICD40 detection
2020-06-27 18:14:29 +02:00
tharexde
81cd478883
Merge branch 'master' into dev-em4x50_sread
...
update
2020-06-27 00:37:32 +02:00
tharexde
f264473b69
formal adjustments
2020-06-27 00:21:56 +02:00
iceman1001
d4b752e23b
text
2020-06-26 23:53:34 +02:00
iceman1001
5e7911becb
text
2020-06-26 23:50:36 +02:00
iceman1001
e7514ecbc0
text
2020-06-26 23:50:22 +02:00
iceman1001
2aa7c8f660
textual
2020-06-26 23:31:32 +02:00
iceman1001
06aecb09b7
chg: hf iclass reader - textual
2020-06-26 22:20:32 +02:00
iceman1001
5cce99db99
cleaning
2020-06-26 21:50:49 +02:00
iceman1001
71e30a8c4f
layout
2020-06-26 21:49:50 +02:00
iceman1001
669bb1d597
client/src/cmdhficlass.c
2020-06-26 21:49:19 +02:00
iceman1001
f330f3925b
text
2020-06-26 18:33:56 +02:00
tharexde
e1f571e8da
forgot to terminate string variable
2020-06-26 14:58:08 +02:00
tharexde
445a367b49
added 4x50_sread
2020-06-26 14:21:09 +02:00
tharexde
871fa6b733
added 4x50_sread
2020-06-26 14:20:46 +02:00
tharexde
8376b67ea0
added 4x50_sread
2020-06-26 14:20:19 +02:00
iceman1001
42415e41ab
text
2020-06-26 13:23:37 +02:00
iceman1001
c65c683d06
text
2020-06-26 13:21:32 +02:00
iceman1001
ba8f60298a
text
2020-06-26 13:17:41 +02:00
iceman1001
5643eb685d
text, color
2020-06-26 13:01:17 +02:00
iceman1001
dbc2fb188a
text,color
2020-06-26 12:02:57 +02:00
iceman1001
9ad944c4a1
color,text
2020-06-26 12:02:32 +02:00
iceman1001
f4c91bc3aa
space
2020-06-26 00:43:56 +02:00
iceman1001
6484bd641c
textual
2020-06-26 00:04:41 +02:00
Iceman
845d6a445c
Merge pull request #820 from aczid/master
...
Show usage menu for invalid/missing hitag commands
2020-06-25 23:45:30 +02:00
Aram
7c2fe1e8e6
Show usage menu for invalid/missing commands
2020-06-25 21:09:18 +02:00
Monster
173c1702e9
Add support for new "Mikron JSC Russia" UL tag.
2020-06-25 12:15:51 +03:00
iceman1001
2878a8d481
missing semi
2020-06-24 22:18:41 +02:00
iceman1001
c47679b5dd
addition
2020-06-24 22:13:41 +02:00
iceman1001
c2df7ed824
chg: trigger colorsmode (proxspace) in direct calls to client
2020-06-24 11:51:00 +02:00
Bjoern Kerler
36fcb8ef2b
Fixes num_keys
2020-06-24 07:22:03 +02:00
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
Philippe Teuwen
e79537ba46
cmake tuning
2020-06-23 10:13:23 +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
d38711aea6
added cmdlfem4x50.c
2020-06-20 15:37:56 +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
b2a6fca0ee
Fix bug when cmake android and CMAKE_BUILD_TYPE=Release, see comments:
...
The presence of "filter" from crypto1.c as an exported function depends on the chosen compilation optimization level.
So if the common/crapto1/ and the code using it (here hardnested) are not using the same level, there will be a mismatch,
in this case hardnested_bruteforce.c expecting crypto1.c to provide filter()
2020-06-18 19:27:33 +02:00
Philippe Teuwen
35cfd4931f
remove debug statement
2020-06-18 17:55:09 +02:00
Philippe Teuwen
0c17413a96
cmake android: we only need libtinfo, not full libncurses
2020-06-18 16:19:54 +02:00
Philippe Teuwen
f70b94c4aa
cmake android: remove make -j2 overruling main make
2020-06-18 16:02:27 +02:00
Philippe Teuwen
94edc41c3c
cmake android: add statically terminfo stuff, so no need for termux or similar to be installed
2020-06-18 16:01:41 +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
Philippe Teuwen
658b77d5b5
Merge pull request #799 from xianglin1998/cross
...
Disable external libary compile warnning.
2020-06-18 10:02:02 +02:00
Philippe Teuwen
04517b3fe1
minor
2020-06-18 10:00:44 +02:00
Philippe Teuwen
490d5d26ae
minor
2020-06-18 09:57:50 +02:00
dxl
8bcdecb7f9
Disable external libary compile warnning.
2020-06-18 15:46:44 +08:00
Philippe Teuwen
3106fa3d3d
cmake: use system libjansson if available
2020-06-18 02:07:25 +02:00
Philippe Teuwen
cdf1bc3ce7
cmake: use system libwhereami if available
2020-06-18 01:51:36 +02:00
Philippe Teuwen
e6be31529a
cmake: find bzip2
2020-06-18 00:51:33 +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
e707ceb906
added EM4x50 info function
2020-06-15 14:32:11 +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
Conlan
e8c88d47ef
Additional CharlieCard Key
2020-06-12 20:01:55 -04:00