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
Philippe Teuwen
25fb6df229
Android cross-compilation to client cmake
2020-06-12 23:28:38 +02:00
iceman1001
94403bee59
textual
2020-06-12 22:49:42 +02:00
iceman1001
2bb110fef3
Merge branch 'master' of github.com:RfidResearchGroup/proxmark3
2020-06-12 22:35:18 +02:00
iceman1001
9c6ce5be50
chg: "hf mf cwipe" - speed up using backdoor wipe cmd
2020-06-12 22:35:08 +02:00
Philippe Teuwen
020c6882ce
colors
2020-06-12 19:52:13 +02:00
Philippe Teuwen
8c5be2678f
Yet another color management, settings autodetection done earlier
2020-06-12 19:45:18 +02:00
Philippe Teuwen
30c0345c31
Fix fix colors
2020-06-12 18:21:03 +02:00
Philippe Teuwen
bb5c588935
Fix colors detection under Windows (when no ref & when redirected IOs)
2020-06-12 18:17:39 +02:00
Philippe Teuwen
ce61b67910
Remove spurious color
2020-06-12 18:01:06 +02:00
iceman1001
20c46d1af5
chg: in order to be able to upgrade fw on smartcard it must be available
2020-06-12 17:49:52 +02:00
iceman1001
60c47a7e7d
textual
2020-06-12 17:29:34 +02:00
iceman1001
9ba03aec74
fix: "emv scan" - better fix for filename
2020-06-12 09:44:50 +02:00
iceman1001
cdbe6bc35b
fix: "emv scan" - now dont save in execution folder
2020-06-12 09:27:55 +02:00
iceman1001
c460dcf12d
test prox
2020-06-12 00:37:48 +02:00
iceman1001
6dc0aa53c7
textual...
2020-06-11 20:58:31 +02:00
iceman1001
c716bb9e31
textual, color, and "hf iclass info" does something
2020-06-11 20:11:44 +02:00
iceman1001
6a8ea64feb
text
2020-06-11 19:53:21 +02:00
iceman1001
fc5feffa4b
color
2020-06-11 19:23:15 +02:00
slurdge
5f148bb835
Happy colors for messages coming from pm3
2020-06-11 16:21:27 +02:00
Iceman
291238a2f0
Merge pull request #772 from slurdge/bigbigbuf
...
[WIP] Make BigBuf take dynamically the available space with a fixed (4K) stack
2020-06-11 13:09:20 +02:00
Philippe Teuwen
73b6138f7f
cmddata: Adjust bigbuf size on client side as before but fix 1b overflow
2020-06-11 01:18:50 +02:00
Lukas Kuzmiak
edff230d55
fix a bug in MADInfoByteDecode (did not return 0x00), textual fixes
2020-06-10 14:59:53 -07:00
slurdge
c11c7ab545
Add support for client getting bigbufsize
2020-06-10 23:03:03 +02:00
iceman1001
6f1c074801
textual
2020-06-10 22:47:47 +02:00
Philippe Teuwen
8ccc592ca0
mf ndef examples 03e1 -> e103
2020-06-10 14:02:14 +02:00
iceman1001
d7377e7ccc
textual
2020-06-10 13:33:08 +02:00
iceman1001
61be7c7c30
chg: cliparse should have atleast same file_max_path_len
2020-06-10 13:31:57 +02:00
Philippe Teuwen
cb614f3f11
cliparser: generalize ctx usage
2020-06-10 11:34:33 +02:00
Philippe Teuwen
569107579e
Fix cliparser buffer allocation
2020-06-10 11:33:15 +02:00
iceman1001
cd9b26af17
helptext
2020-06-10 08:44:13 +02:00
iceman1001
cb22004635
chg "hf mf cwipe" - textual and also use magic wipe card
2020-06-10 08:43:29 +02:00
Lukas Kuzmiak
9d71f66d16
Mifare MAD Card Holder Information
2020-06-09 18:34:59 -07:00
Philippe Teuwen
8d1027e0c9
typo
2020-06-10 02:15:16 +02:00
Philippe Teuwen
2a29a1431d
theremin.py: quit when pm3 button is pressed
2020-06-10 01:18:26 +02:00
Philippe Teuwen
b55c186b3a
make style
2020-06-10 01:17:49 +02:00
Lukas Kuzmiak
ca30ff9bc2
highlight sector line instead of printing it twice, update Changelog
2020-06-09 15:39:17 -07:00
Lukas Kuzmiak
33662bdd59
Decode MAD Info Byte and show info about sector it points to
2020-06-09 14:43:00 -07:00
iceman1001
61f09d0ec4
add theremin.py script, (@rosco)
2020-06-09 22:16:35 +02:00
iceman1001
dcabb7e37d
chg: hf 14a info - dont print some hints if magic
2020-06-09 21:29:59 +02:00
Philippe Teuwen
def475e747
Add SKIPREADLINE support to make and cmake
...
It's mostly for headless support.
At the moment, for interactive uage without readline, some commands will exit the client prematurely if they use kbd_enter_pressed().
2020-06-09 21:21:15 +02:00
Philippe Teuwen
4372a728f7
mad ndef no swap and restore official AID 0xE103
2020-06-09 21:19:31 +02:00
Philippe Teuwen
92f4c445e4
mfc ndef needs swapped mad according to our default way to treat mad...
2020-06-09 21:07:53 +02:00
Philippe Teuwen
9a15632689
MAD swap again
2020-06-09 20:53:33 +02:00
Philippe Teuwen
35c6ee1bbb
rework a bit mfc mad
2020-06-09 20:17:08 +02:00
Philippe Teuwen
33144d1be8
mfc mad get_aid_description: add verbose passthru
2020-06-09 18:46:07 +02:00
Philippe Teuwen
242c276bfb
mfc mad_print compare
2020-06-09 18:45:37 +02:00
iceman1001
a93e54374e
working case-insense
2020-06-09 17:52:32 +02:00
iceman1001
cb4369f3ec
fix: hf mf mad - return value
2020-06-09 17:38:29 +02:00
iceman1001
a71f4cd475
fix coverity resource leak
2020-06-09 17:01:31 +02:00
iceman1001
17f56479ea
fix coverity
2020-06-09 16:59:20 +02:00
iceman1001
5ada65bb20
textual
2020-06-09 16:46:46 +02:00
iceman1001
241309291b
chg: hf iclass , use fileutils
2020-06-09 16:25:56 +02:00
iceman1001
33965f51d8
minor <>
2020-06-09 16:24:12 +02:00
iceman1001
e9fba19915
fileutils should be searching for json
2020-06-09 16:23:28 +02:00
iceman1001
76791bde0a
textual
2020-06-09 16:22:35 +02:00
iceman1001
158251b2d9
look up mad directory json
2020-06-09 16:21:54 +02:00
iceman1001
bfc6a2c513
add: a MAD Directory in json
2020-06-09 13:31:09 +02:00
iceman1001
5b10df9b4c
textual
2020-06-09 11:32:19 +02:00
iceman1001
d12606cb26
reverse crc check
2020-06-09 11:14:40 +02:00
Lukas Kuzmiak
3cbad6fa4c
Merge remote-tracking branch 'public/master' into mifare-mad-fix
2020-06-09 02:06:27 -07:00
iceman1001
849be2376c
textual
2020-06-09 09:19:25 +02:00
iceman1001
a0cbaee138
chg: mad makeover
2020-06-09 08:51:12 +02:00
Lukas Kuzmiak
e3d16649b8
MAD application code & cluster code were swapped
2020-06-08 21:22:40 -07:00
Lukas Kuzmiak
eb35636f49
remove duplicated key (first occurrence kept)
2020-06-08 17:26:03 -07:00
Philippe Teuwen
de100fc8e7
Add SKIPPYTHON support to cmake
2020-06-09 00:47:34 +02:00
Philippe Teuwen
66505988a2
Add SKIPPTHREAD support to cmake
2020-06-09 00:39:35 +02:00
Philippe Teuwen
6358c07ec1
Add SKIPQT support to cmake
2020-06-09 00:34:41 +02:00
Philippe Teuwen
45b5bbed7b
Add SKIPBT support to cmake
2020-06-09 00:27:50 +02:00
Philippe Teuwen
c76b3061da
Fix more deps/liblua Android cross-compilation
2020-06-08 20:20:16 +02:00
Philippe Teuwen
526407ed5c
Fix deps/liblua Android cross-compilation
2020-06-08 19:18:08 +02:00
iceman1001
86c649f955
chg: "lf viking demod" - prepping for lib
2020-06-08 18:43:34 +02:00
iceman1001
618a945e55
fix missing semi
2020-06-08 13:19:01 +02:00
Philippe Teuwen
6894749978
Android: Fix bug introduced in e0371987ac
2020-06-08 12:44:14 +02:00
iceman1001
a7799a5bf8
Merge branch 'master' of github.com:RfidResearchGroup/proxmark3
2020-06-08 09:23:16 +02:00
iceman1001
8f8d42652b
remove dependency
2020-06-08 09:23:08 +02:00
Iceman
e0371987ac
Update CMakeLists.txt
...
We swapped from zlib to bz2
2020-06-08 09:11:13 +02:00
Philippe Teuwen
224cb2ffd7
make style
2020-06-08 03:15:10 +02:00
Philippe Teuwen
15012198f9
client: replace zlib by bzip2
2020-06-08 02:50:43 +02:00
iceman1001
93dbb24103
ftell return signed
2020-06-07 20:46:29 +02:00
iceman1001
d0b22cbd95
coverty 290397, 290399
2020-06-07 20:11:36 +02:00
iceman1001
307e39bb22
exposing function
2020-06-07 19:47:36 +02:00
iceman1001
8dd56a9004
fix resource leak
2020-06-07 19:29:14 +02:00
iceman1001
ae10e76cb5
fix resource leak
2020-06-07 19:25:56 +02:00
iceman1001
c84f81de76
chg: 'sc raw' - print response bytes
2020-06-06 23:32:09 +02:00
iceman1001
5bd300bb59
hint on failed serial port
2020-06-05 14:20:52 +02:00
Philippe Teuwen
8852e1f9cd
Remove readline from libamiibo, no reason to be there
2020-06-05 13:13:27 +02:00
iceman1001
f354f480de
chg; return codes
2020-06-05 11:05:46 +02:00
iceman1001
d2a499ce5e
chg: 'trace save' - use .trace extension
2020-06-04 11:52:58 +02:00
iceman1001
fd93222fdb
chg: 'trace save' - if client has no log, try download from device before saveing
2020-06-04 11:50:41 +02:00
iceman1001
66fd599c70
fix: 'hf mfu ndef' - now prints ID field correct if present
2020-06-04 11:32:33 +02:00
iceman1001
bbd9271fa3
chg: 'hf lto restore' - now uses save loads and case-ignore extensions
2020-06-03 17:28:29 +02:00
iceman1001
4ba4c76081
added a loadEML_safe fct
2020-06-03 17:27:38 +02:00
iceman1001
64322896f2
chg, textual
2020-06-03 15:31:41 +02:00
iceman1001
519d2e4917
fiddle
2020-06-03 15:27:22 +02:00
iceman1001
173f2d472d
chg; remove unused fcts
2020-06-03 15:27:07 +02:00
iceman1001
dcdd9ce364
nothing special
2020-06-03 15:02:35 +02:00
iceman1001
d5731b3aec
chg, strange wait
2020-06-03 14:52:48 +02:00
iceman1001
12425aaf60
chg, hf fido remake
2020-06-03 14:52:27 +02:00
iceman1001
17d6ce5007
coverity 290398
2020-06-03 14:26:09 +02:00
iceman1001
8898000dac
chg: 'hf mfu restore' - now uses fileutils
2020-06-03 13:10:34 +02:00