iceman1001
3586cad12f
freMerge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-10-08 16:13:46 +02:00
Philippe Teuwen
e7a632292d
fix t55 comments
2019-10-08 16:13:36 +02:00
iceman1001
85f5498163
yes
...
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-10-08 16:13:05 +02:00
iceman1001
6d1e109c82
filechecks.. could fail stat call and directory could be symlinked
2019-10-08 16:11:01 +02:00
Philippe Teuwen
813f1e228c
fix nedap examples
2019-10-08 16:10:50 +02:00
iceman1001
c4249ecbb8
WiP - 'lf t55xx restore' - read a dump file and restore it to a t55xx card
2019-10-08 15:24:06 +02:00
iceman1001
9cbfe5481b
chg: lf t55xx brute / lf t55xx chk / lf t55xx recoverpwd - now shows help when called without params
2019-10-08 14:16:46 +02:00
Philippe Teuwen
caf1ce4a43
Merge branch 'master' into master
2019-10-08 14:03:32 +02:00
mwalker33
275c628da5
lf t55xx detect and help
...
Added lf t55xx detect to try without password first and try password if still not detected.
Added password status to detected output.
Updated lf t55xx help to show current default downlink mode.
typo fixed in win10 color help
2019-10-08 21:46:36 +11:00
iceman1001
810a70d8a8
tweak?
2019-10-08 11:50:43 +02:00
iceman1001
1baf51b862
t5577-M3 ATMEL info, thanks @doegox
2019-10-08 11:49:23 +02:00
David Lam
b2592a2f1c
display high bit for Kastle HID to allow for lf hid clone
2019-10-07 14:56:20 -04:00
iceman1001
9a74122079
fix: 'lf indala clone' - now write long id again
2019-10-07 17:18:56 +02:00
Iceman
13cdba28f3
Merge pull request #422 from bruno-/fix_script_typos
...
Fix Legic_clone.lua script typos
2019-10-07 15:20:26 +02:00
Bruno Sutic
bf14b91a85
Fix Legic_clone.lua script typos
2019-10-07 14:57:53 +02:00
Iceman
27ae47b38e
Merge pull request #420 from mwalker33/master
...
Color on windows 10
2019-10-06 20:00:59 +02:00
Philippe Teuwen
1f364106ce
fix few mem leaks
2019-10-06 01:18:04 +02:00
Philippe Teuwen
78c153fe74
fix wrong fix
2019-10-06 00:17:32 +02:00
Philippe Teuwen
4ae8a3d86b
fix few printf arg types
2019-10-05 23:56:19 +02:00
iceman1001
7d009a9ea7
emphase warnings
2019-10-05 12:07:28 +02:00
mwalker33
098e0a183f
client win10 color support
2019-10-05 14:09:46 +10:00
iceman1001
8c9ff2e54a
t5555 textual
2019-10-04 21:28:34 +02:00
iceman1001
b8776b593e
fix: sneaky bug in magic detection where bigbuf wasnt emptied before next run
2019-10-04 14:21:04 +02:00
iceman1001
3d6d83726e
textual
2019-10-04 10:14:38 +02:00
Philippe Teuwen
8a7274ec34
offline: avoid spurious "Sending bytes to proxmark failed" on exit
2019-10-04 09:30:36 +02:00
Philippe Teuwen
42cb2a32e8
lf config alone shows current config
2019-10-03 22:11:16 +02:00
Philippe Teuwen
159b90c002
no fct call in macro, thanks @iceman1001
2019-10-03 21:56:42 +02:00
Philippe Teuwen
156c3a81e8
no fct call in macro, thanks @iceman1001
2019-10-03 21:54:45 +02:00
Philippe Teuwen
f8cd168498
add f (freq) to lf tune & lf config
2019-10-03 21:46:06 +02:00
Philippe Teuwen
df08e7970c
fix divisor<>freq computations, add q to lf tune
2019-10-03 21:18:37 +02:00
Philippe Teuwen
f29ad0fba2
macros for divisors and fix lf optimal freq display
2019-10-03 18:32:27 +02:00
Philippe Teuwen
6df9eea950
voltage config divisor printing
2019-10-03 17:45:43 +02:00
iceman1001
37ce43cb8b
chg: dont log helpout
2019-10-03 16:17:25 +02:00
iceman1001
38673a10aa
textual
2019-10-03 16:16:49 +02:00
iceman1001
5d3eb444fb
chg 'hf mf nested' - uses NG. chg 'hw tune' - now also prints the 'lf config q' divisor voltage.
2019-10-03 16:15:47 +02:00
Philippe Teuwen
eccf0d3bbc
Avoid client CPU busy loop when waiting pm3 (e.g. when simulating tag)
2019-10-01 23:00:51 +02:00
iceman1001
5def918e02
textual
2019-10-01 15:03:39 +02:00
iceman1001
af56fa8242
started to extract VeriChip demod/clone
2019-10-01 14:30:30 +02:00
iceman1001
2439f9d33c
new files
2019-10-01 14:29:37 +02:00
iceman1001
f142ad139b
chg 'lf cmdread' - clientside checks, less wait times on device
2019-09-30 23:18:48 +02:00
iceman1001
d40341d962
Add 'data scale h' - helptext
2019-09-30 23:17:19 +02:00
iceman1001
fd88d7448e
fix 'lf t55xx resetread' - NG and better fault handling
2019-09-30 19:47:36 +02:00
iceman1001
aeab10d67f
fix 'lf cmdread' - better messaging
2019-09-30 19:39:34 +02:00
iceman1001
0efbf2b9ad
yes
2019-09-30 18:07:28 +02:00
iceman1001
97600ee656
iir available
2019-09-30 13:38:50 +02:00
Iceman
76b9be1a16
Merge pull request #416 from mwalker33/master
...
lf config s <samples to skip> option added
2019-09-30 13:23:29 +02:00
mwalker33
f5d7963780
lf config s update
2019-09-30 19:41:25 +10:00
mwalker33
40b1d3bea7
samples to skip (unint32_t)
...
Use unit32_t for all samples to skip
2019-09-30 19:22:26 +10:00
mwalker33
cf0d72e172
lf sniff offset
...
Added samples to skip to lf config
2019-09-29 10:43:01 +10:00
Iceman
f3910ef78f
Merge pull request #415 from mwalker33/master
...
lf em4x05 wipe
2019-09-28 12:03:49 +02:00
mwalker33
b41013ca8f
Update cmdlfem4x.c
...
em 4x05 wipe
2019-09-28 14:01:28 +10:00
mwalker33
5748000afc
Update cmdlfem4x.c
...
em4x05 wipe
2019-09-28 13:53:24 +10:00
iceman1001
0973d30796
rework clone
2019-09-26 21:47:48 +02:00
iceman1001
3ea2851fe6
reworked clone
2019-09-26 21:44:27 +02:00
iceman1001
8bcb219131
rework clone
2019-09-26 21:24:38 +02:00
iceman1001
ecca9fc563
rework clone
2019-09-26 21:21:13 +02:00
iceman1001
4e166cfd15
add 'lf nexwatch clone' - uses raw hex to clone to t55x7
2019-09-26 21:15:38 +02:00
iceman1001
0a967f7733
chg clone
2019-09-26 21:06:18 +02:00
iceman1001
e370d60171
add 'lf pac clone' - use raw hex to clone to t55x7
2019-09-26 20:56:18 +02:00
iceman1001
40e793eb1a
chg rework t55x7 clone..
2019-09-26 20:42:00 +02:00
iceman1001
563f6bee47
chg rework tx55 clone
2019-09-26 20:36:13 +02:00
iceman1001
4ed295b730
chg reworked t55x7 clone function
2019-09-26 20:32:33 +02:00
iceman1001
2dd77330b1
add 'lf securakey clone' - take raw hew and clone to t55x7
2019-09-26 20:31:54 +02:00
iceman1001
cfe8810407
add 'lf paradox clone' - take raw hex and clone to t55x7
2019-09-26 20:31:02 +02:00
iceman1001
0cdc2c446a
less output when on NON-RDV4 platform
2019-09-26 16:39:02 +02:00
iceman1001
fa2031c97a
whitespace
2019-09-26 16:30:29 +02:00
iceman1001
5d503fc5d3
textual
2019-09-26 16:29:23 +02:00
iceman1001
300014d3b7
more keys
2019-09-26 11:29:20 +02:00
iceman1001
7c2231974d
clean up, explain, lesser tests for buttonpress
2019-09-26 09:54:43 +02:00
iceman1001
a6a260b422
yesMerge branch 'master' of https://github.com/RfidResearchGroup/proxmark
2019-09-26 09:02:53 +02:00
iceman1001
7e15e0612a
remove debug
2019-09-25 22:13:56 +02:00
iceman1001
30d565f76c
free some stack
2019-09-25 22:10:59 +02:00
iceman1001
86994cdc69
textual
2019-09-25 22:06:47 +02:00
iceman1001
048a08ec34
free up some stack
2019-09-25 22:01:51 +02:00
iceman1001
36676aac23
yes
2019-09-25 10:24:39 +02:00
iceman1001
3e22d99b03
hf mf darkside uses NG. checkbutton more seldom, shoulded interfere with syncing the prng so much
2019-09-25 10:24:34 +02:00
iceman1001
e793e90803
textual
2019-09-24 21:01:44 +02:00
Philippe Teuwen
878e394cde
lf tune: remove 16b mask (thanks @iceman1001)
2019-09-24 15:44:44 +02:00
iceman1001
6ffae0e156
fix - parites needs to be reset between iterations, and resuse standard functions for clock
2019-09-24 15:27:20 +02:00
Philippe Teuwen
891a079989
textual
2019-09-24 14:59:05 +02:00
Iceman
93b242a6e5
Merge pull request #410 from mwalker33/master
...
lf em 4x05_dump - print output for each block read
2019-09-24 14:09:14 +02:00
mwalker33
bf395a6c4f
Update cmdlfem4x.c
...
Add lck flags and f for filename
2019-09-24 21:42:31 +10:00
iceman1001
45318e4346
conside less than 26, to be 26bit wiegand
2019-09-24 13:08:49 +02:00
iceman1001
4707355431
textual
2019-09-24 13:07:35 +02:00
iceman1001
b2c24c8010
add - continuously measure LF antenna
2019-09-24 13:06:43 +02:00
mwalker33
87a6316f44
Update cmdlfem4x.c
...
Dump print and save to .eml and .bin
2019-09-24 19:59:54 +10:00
iceman1001
7870dd6fc0
less arrays on stack. To counter OS which has ulimit ...
2019-09-23 19:10:29 +02:00
iceman1001
f42f7c2250
'hf search' new line for
2019-09-23 18:59:45 +02:00
iceman1001
c36baab3c0
releasing pressure on stack
2019-09-23 17:10:43 +02:00
mwalker33
361136f06d
Update cmdlfem4x.c
...
dump display and save to file
2019-09-23 21:04:33 +10:00
iceman1001
f30511f1a2
more..
2019-09-22 13:04:46 +02:00
iceman1001
9cdc26207f
add 'lf hid watch' , 'lf awid watch', 'lf io watch'
2019-09-22 13:04:28 +02:00
mwalker33
0ea501372b
Update cmdlfem4x.c
...
Added print Ascii to em 4x05_dump
2019-09-22 19:41:45 +10:00
mwalker33
3a9087d2a1
Update cmdlfem4x.c
...
em 4x05_dump did not output data
2019-09-22 15:27:00 +10:00
Philippe Teuwen
11dcc4787d
mfc magic: add some defines
2019-09-21 23:50:32 +02:00
Philippe Teuwen
d46edd9a53
change is_* return to bool
2019-09-21 20:22:17 +02:00
Philippe Teuwen
782feb934a
split slow tests
2019-09-21 18:32:07 +02:00
iceman1001
e7d67fc2b0
fix for checking directory
2019-09-21 16:31:45 +02:00
iceman1001
862bf1b793
fix for ps3.2 compilation
2019-09-21 11:48:55 +02:00
iceman1001
f7510dc6aa
better detection of directory (@doegox)
2019-09-21 11:12:36 +02:00
iceman1001
93915858ea
fix data load
now not crashing client when entering a folder path without filename
2019-09-21 08:47:12 +02:00
iceman1001
e5ffcfd513
chg: 'lf hid brute' - use new wiegand formats. see helptext for more details
2019-09-19 13:46:38 +02:00
iceman1001
a3161ae9a2
fix 'lf em 4x50_read - now checks if have enough data in Graphbuffer
2019-09-19 13:12:48 +02:00
iceman1001
aa2f80795d
mem spibaud uses NG. And a simplification of tuning
2019-09-19 12:13:39 +02:00
iceman1001
a604f641b3
style
2019-09-19 10:55:34 +02:00
iceman1001
21a7de38b8
style
2019-09-19 10:54:34 +02:00
iceman1001
ffd03dadaa
style
2019-09-19 10:48:32 +02:00
iceman1001
895410aec0
style
2019-09-19 10:47:12 +02:00
iceman1001
bb051df683
..memset
2019-09-18 20:15:29 +02:00
iceman1001
2626c31d3d
links
2019-09-18 19:43:55 +02:00
iceman1001
fa36018bef
also compile...
2019-09-18 19:42:59 +02:00
iceman1001
7abc10c63a
add: 'wiegand commands' - wiegand manipulation like encoding / decoding of credentials. From offical repo (@grauerfuchs)
...
Adapted and converted to fit this repo.
2019-09-18 19:20:07 +02:00
iceman1001
d3651cc075
chg 'hw status' - reply NG.... thanks @cjbrigato
2019-09-17 19:13:00 +02:00
merlokk
c5ea6b54ce
add ignoring results of some tests
2019-09-16 17:37:18 +03:00
Oleg Moiseenko
f7ae7f44ca
Merge pull request #404 from merlokk/fido_ca
...
additional fido CA
2019-09-16 14:20:18 +03:00
iceman1001
412f016b94
chg: 'lf t55xx config' - can set config based on a block0, offset and Q5
...
lf t55xx config c 000880E0 o 10 - sets a T55x7 w offset 10
lf t55xx config c 000880E0 o 6 Q5 - sets a Q5/T5555 w offset 6
2019-09-16 12:36:04 +02:00
Philippe Teuwen
88cbf789a1
Merge pull request #403 from mwalker33/master
...
Quick Typo Fix - T55xx Config Print
2019-09-16 12:03:25 +02:00
iceman1001
e5c31886eb
chg: 'lf io clone' - refactored, uses NG
2019-09-16 11:41:34 +02:00
iceman1001
4c08477ef7
chg: 'lf indala clone' - refactored , uses NG
2019-09-16 11:33:05 +02:00
iceman1001
3726df62a4
chg: enhanced verify t55xx write.
...
We set config to the cloned block0, whats left is to identify the offset, which we try to do.
2019-09-16 11:11:54 +02:00
mwalker33
e8ef0fe263
Update cmdlft55xx.c
2019-09-16 19:01:40 +10:00
iceman1001
8ba2f5b06c
encourage
2019-09-15 21:00:38 +02:00
iceman1001
75f4a08f53
chg 'lf noralsy clone' - uses verifywrite
2019-09-15 20:56:43 +02:00
iceman1001
c2f3e4b2f3
encourage..
2019-09-15 20:51:23 +02:00
iceman1001
19bdfd2577
chg some printing of blocks
2019-09-15 20:46:21 +02:00
iceman1001
a933eb4f9e
adjusting beahavior for auto detection
2019-09-15 20:30:05 +02:00
iceman1001
44cb67c49b
adjusting write validation to only print when successful in validating. Otherwise like old times. silence.
2019-09-15 20:27:50 +02:00
Philippe Teuwen
59e66ce5fd
lf hid sim: add support for long ID
2019-09-15 02:00:42 +02:00
Philippe Teuwen
9275304640
lf hid clone: fix some stuff related to long ID, still clone doesn't seem to work
2019-09-15 01:36:38 +02:00
iceman1001
06809babbb
chg: 'lf pyramid clone' - add verification
2019-09-15 01:33:54 +02:00
iceman1001
47724d0a1b
textual
2019-09-15 01:13:52 +02:00
iceman1001
2bec009778
chg: 'lf viking clone' - now uses NG
2019-09-14 19:58:17 +02:00
iceman1001
cd28641d96
chg: 'lf visa2000 clone' - now verify successful write of blocks.
2019-09-14 19:31:00 +02:00
iceman1001
d5d273fedb
fix.
2019-09-14 19:11:39 +02:00
iceman1001
54ea65bf34
Messy messy. I probably lost my commit texts now...
...
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-09-14 19:02:13 +02:00
iceman1001
da197e1999
CHG: 'lf t55xx wipe c' - now accepts user provided configuration block to configure a wiped tag with.
...
ADD: 'lf t55xx protect' - Sets password and enables password protection in configuration block. It tries to validate its writes aswell.
Samples:
lf t55xx protect n 11223344 - set pwd to 11223344
lf t55xx protect n 01020304 p 11223344 - change a password protected tag from 11223344 to 01020304
To remove the password protection, you need to remember the password :)
lf t55xx wipe p 11223344 - wipes whole tag, removes password protection bits.
2019-09-14 18:27:58 +02:00
Ludovic Rousseau
f961c1c551
Fix typos
...
Thanks to Debian lintian for the reports:
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf dont don't
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf succesful successful
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf Uknown Unknown
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf requestes requests
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf unkown unknown
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf ambigous ambiguous
2019-09-14 17:53:24 +02:00
Ludovic Rousseau
a1852eaa4b
Fix typos
...
Thanks to Debian lintian for the reports:
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 formated formatted
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 succesfully successfully
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Skiped Skipped
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 standart standard
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 supress suppress
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 successfull successful
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Succeded Succeeded
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Overriden Overridden
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 aquire acquire
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 occured occurred
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 delimeter delimiter
2019-09-14 17:44:58 +02:00
mwalker33
c3756f1903
T55xx DLMode Update
2019-09-14 14:13:55 +10:00
iceman1001
250be16876
chg: 'lf t55 write v' - validation of data. After a write, the command tries to read the block and see if it matches the data entered.
...
This can fail because of password, not correct configuration settings before. Also validating a block0 write is harder, some modulations are not that perfect.
This is however a nice step forward.
2019-09-13 21:25:39 +02:00
iceman1001
af02ee871d
chg: 'lf t55xx info c' - renamed from "d" to "c", takes a block0 and print info.
...
chg: 'lf t55xx config c' - now takes a block0 and use as configuration.
usage:
lf t55xx config c 000880E8
lf t55xx info c 000880E8
2019-09-13 20:50:00 +02:00
iceman1001
f1307e703c
style
2019-09-13 16:32:37 +02:00
iceman1001
2b25d86392
style
2019-09-13 16:31:17 +02:00
iceman1001
8d6bde0d63
chg: 'lf em 4x50_demod' - seems the read 4x50 didnt read, it demodulated only..
2019-09-13 15:13:18 +02:00
iceman1001
270d0821b5
chg: 'data print i' - new param I, inverts the demod buffer
2019-09-13 12:11:56 +02:00
iceman1001
f1b36c0b5a
fix paradox sim compilation...
2019-09-13 07:30:03 +02:00
Philippe Teuwen
5e4243e5a1
Disable lf paradox sim, which needs non-existing GetParadoxBits
2019-09-13 00:51:18 +02:00
Philippe Teuwen
05e9ac97ae
fix lf awid sim doc: must be digits
2019-09-13 00:39:19 +02:00
iceman1001
5d24d7a85b
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-09-12 21:20:51 +02:00
iceman1001
3821a03a40
chg: 'lf t55xx wipe p' - now takes a password for wipe
...
chg: 'lf t55xx wakeup' - uses NG
2019-09-12 21:20:40 +02:00
Philippe Teuwen
ed5fed8fac
Attempt to fallback to current directory if no HOME in env
2019-09-12 20:16:52 +02:00
Philippe Teuwen
46574ae0f5
add get_my_user_directory() to centralize HOME processing
2019-09-12 20:13:01 +02:00
iceman1001
77a10ceb08
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-09-12 17:35:06 +02:00
iceman1001
c3a0d7d88a
chg: 'lf t55xx info p' - got some more love, now can read with password :)
...
chg: 'lf t55xx dump p' - less outputs and now can read with password :)
chg: 'lf t55xx trace 1' - can now decode trace from a saved trace. However you must have correct configuration set in order to work.
chg: 'lf t55xx wipe p' - now can use a password to write to configblock first.
2019-09-12 17:34:55 +02:00
merlokk
9c61ac1375
additional fido CA
2019-09-12 16:13:36 +03:00
3ldidi94
ef281465ae
Add keys found on hardenest Mifare Classic Card
...
Add keys found on hardenest Mifare Classic Card of an Hotel in Berlin (DE)
2019-09-12 11:38:53 +02:00
Philippe Teuwen
22ead8ca0b
printdemodbuffer: add option to strip leading zeroes
2019-09-12 01:24:20 +02:00
iceman1001
1ad66c917f
fixin...
2019-09-11 22:51:13 +02:00
iceman1001
f57a6195de
turning off field on failure
2019-09-11 16:56:08 +02:00
iceman1001
f189c5c3f8
a
...
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-09-11 16:37:13 +02:00
iceman1001
312e4b358c
fix: 'hf iclass reader 1' - now turns off
2019-09-11 16:36:41 +02:00
iceman1001
9f0db0bbdc
textual
2019-09-11 16:23:06 +02:00
iceman1001
a623e6a246
chg: 'hf iclass list' - no parity on responses
2019-09-11 16:22:37 +02:00
merlokk
08c345e560
added yubikey link
2019-09-11 17:21:27 +03:00
Philippe Teuwen
4540b31d67
thinfilm: textual
2019-09-11 15:58:03 +02:00
iceman1001
387dd82895
chg 'hf iclass list' - fix parity checks
2019-09-11 14:03:14 +02:00
Iceman
341703d9a7
chg: 'hf iclass sim' - better iClass protocol implementation
2019-09-11 13:09:08 +02:00
Philippe Teuwen
843f554503
prevent lua bombs
2019-09-10 12:32:01 +02:00
Philippe Teuwen
608e0ba27c
fix plot strange values
2019-09-10 00:06:16 +02:00
Philippe Teuwen
d08f03058b
add support for (nested) cmd scripts in script list/run
2019-09-09 23:46:38 +02:00
Philippe Teuwen
e10085bfe8
log interactive commands as well
2019-09-09 21:30:25 +02:00
Philippe Teuwen
ba47ac36cb
Do not log to history with -h/-t/-m
2019-09-09 21:01:43 +02:00
Philippe Teuwen
d5d2c64d50
allow to set debugmode from cli options
2019-09-09 20:45:10 +02:00
Philippe Teuwen
6385ee960f
searchFile for firmwares
2019-09-09 19:55:27 +02:00
iceman1001
f7624a7767
textual
2019-09-09 17:33:44 +02:00
iceman1001
7b773c571b
chg: 'lf t55xx dump p 11223344' - less verbose output.
2019-09-09 15:19:00 +02:00
Iceman
c918e0ab80
chg: 'hf search' - feedback text (@wvzlad)
2019-09-09 13:15:55 +02:00
Philippe Teuwen
afe891647f
merge flasher in client
2019-09-09 01:35:15 +02:00
iceman1001
ca606bb211
stupid...
2019-09-08 23:23:06 +02:00
iceman1001
9a2a0116e4
fix: 'hf iclass clone' - last block write fails, see ( https://github.com/RfidResearchGroup/proxmark3/issues/183 )
...
chg: 'hf iclass clone' - now tries ten times, behavies better, obey verbose nicer, drop field constant. Uses NG.
chg: 'hf iclass dump' - now tries ten times,
in general nice outputs..
2019-09-08 23:19:06 +02:00
iceman1001
d8217a13d9
chg: 'hf iclass rdbl'
...
'hf iclass wrbl' - both commands now tries tens times. Both honor verbose param, both has gotten some love with regards to timing on device side, and they also turn off the field more consistent.
2019-09-08 21:21:30 +02:00
iceman1001
305c54f3cf
chg: 'hf iclass rdbl' - now retries 10 ten times and uses NG
2019-09-08 17:37:14 +02:00
RFID Research Group
a037766e26
Update cmdhfmf.c
...
chg: hf mf brute - commented out.
2019-09-08 12:57:25 +02:00
Iceman
fbe86a9070
Update cmdhfmf.c
...
Textual,
and HF MF KEYBRUTE is considered obselete since improved hardnested.
Will let it still be in code for learning purposes.
2019-09-08 12:29:10 +02:00
Philippe Teuwen
28534c10ad
hf mf autopwn not available offline
2019-09-07 20:45:12 +02:00
Philippe Teuwen
a8e922271b
Merge pull request #388 from sh7d/autopwn-fix
...
autopwn: fix card detection
2019-09-07 20:07:26 +02:00
sh7d
93e323d890
Review requested changes
2019-09-07 19:41:48 +02:00
Philippe Teuwen
9ce820768c
missing free
2019-09-07 12:07:09 +02:00
sh7d
710c49f763
autopwn: fix card detection
2019-09-07 11:39:49 +02:00
iceman1001
8228b66cb6
chg: \n - param not obsessed with two hexsamples. \n textual
2019-09-07 10:32:16 +02:00
iceman1001
c34660b74c
free some mem
2019-09-06 17:22:54 +02:00
iceman1001
57dc1849da
return
2019-09-06 16:52:05 +02:00
Iceman
f1eceab385
chg: hf iclass
/ hf mfu
- free some 3des contexts
2019-09-06 09:00:01 +02:00
Philippe Teuwen
ffe849fb93
fixing compilation bug in iclass
2019-09-05 23:34:51 +02:00
Philippe Teuwen
9cf2cd7ca9
remove leading/tailing "/" from installation RELPATHs
2019-09-05 23:20:46 +02:00
iceman1001
1ca235e58f
chg: hf iclass decrypt -d
- now also reads enccrypted blockdata as param to decrypt
2019-09-05 22:39:30 +02:00
Iceman
3323126d7b
adaption
2019-09-05 16:07:25 +02:00
Iceman
c9d42699fb
textual
2019-09-05 15:52:40 +02:00
Philippe Teuwen
ecb535cc58
make style
2019-09-05 00:48:48 +02:00
Philippe Teuwen
f8636b18db
searchFile: HOME takes precedence on repo and installed paths, more coherent
2019-09-04 23:40:42 +02:00
Philippe Teuwen
d84c039742
Example of shebang on Lua script
2019-09-04 23:36:23 +02:00
Philippe Teuwen
43055ae6a7
searchFile for cmdscripts
2019-09-04 23:29:03 +02:00
Philippe Teuwen
00ad68215b
add cmdscript example
2019-09-04 23:28:19 +02:00
Philippe Teuwen
7594ea4942
skip comments in cmdscripts
2019-09-04 23:13:51 +02:00
Philippe Teuwen
2ddbbd255b
data load: search file with and without extension .pm3
2019-09-04 22:53:54 +02:00
CristarIngram
15d8e246d8
more mfc keys
2019-09-03 16:10:22 +02:00
Philippe Teuwen
bccb9069f9
prepare libamiibo.a inclusion
2019-09-03 00:18:43 +02:00
Philippe Teuwen
f7f80a9b9f
fido2: fix fido assert loading file
2019-09-02 22:51:28 +02:00
Philippe Teuwen
002580b6d4
fido: fix typos
2019-09-02 22:48:25 +02:00
iceman1001
f1d31f1e43
chg: 'mem load' - use loadxxxx_safe method
2019-08-31 21:49:59 +02:00
iceman1001
3352904f1d
chg 'mem spiffs load' - use loadfile_safe
2019-08-31 21:47:31 +02:00
iceman1001
5ff9cbaac0
fix: 'hf iclass eload' - load file works again.
2019-08-31 15:25:36 +02:00
Philippe Teuwen
7e579f9fca
rename SIMxxx.BIN in lowercase
2019-08-30 22:13:51 +02:00
Philippe Teuwen
f6a4f9cbe3
move client scripts to tools
2019-08-30 22:11:02 +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
iceman1001
e1e5687e32
add: lua scripts can now search for files.
2019-08-30 14:53:53 +02:00
Oleg Moiseenko
4433f8982c
Appveyour fix paths ( #379 )
2019-08-30 13:55:35 +03:00
Philippe Teuwen
2022df1068
make style
2019-08-30 10:45:52 +02:00
Philippe Teuwen
2c853d94ea
move hardnested tables to resources/
2019-08-30 09:02:01 +02:00
Philippe Teuwen
eba13925e4
move bf_bench_data.bin to resources/hardnested_*
2019-08-30 08:53:24 +02:00
iceman1001
0771f0ae95
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-08-30 08:52:06 +02:00
iceman1001
f6fa2c4651
moved to docs
2019-08-30 08:51:55 +02:00
Philippe Teuwen
08a5de1f0e
searchFile traces
2019-08-30 08:32:34 +02:00
Philippe Teuwen
40709f4536
move defparams.json to resources/emv_defparams.json
2019-08-30 02:18:14 +02:00
Philippe Teuwen
382129205f
move capk.txt to resources/
2019-08-30 02:10:55 +02:00
Philippe Teuwen
c6ac4056d3
fix iclass txt
2019-08-30 02:01:14 +02:00
Philippe Teuwen
5b6af929ab
move oid.json to resources/
2019-08-30 02:00:41 +02:00
Philippe Teuwen
af65beb987
move aidlist.json to resources/
2019-08-30 01:23:50 +02:00
Philippe Teuwen
ca8aee33ea
move iclass_dump.bin in resources/
2019-08-30 01:23:10 +02:00
Philippe Teuwen
de5c5df732
remove debug print
2019-08-30 00:08:31 +02:00
iceman1001
4d073ae19d
mv iclass_dump.bin one folder up
2019-08-29 21:49:54 +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
iceman1001
f3a63767ed
chg: 'hf iclass loclass t' - now uses loadfile_safe. However the iclass_key.bin and iclass_dump.bin must be in the new folder structure
2019-08-29 15:55:52 +02:00
iceman1001
00f82304e2
chg: 'hf iclass loclass t' - now uses loadfile_safe
2019-08-29 14:33:09 +02:00
iceman1001
f0d73dc3d1
chg: 'hf iclass decrypt' - now takes transport key as param. also search for key / dump. Also saves decrypted to bin/eml/json_decref
...
chg: 'hf iclass encrypt' - now takes transport key as param.
2019-08-29 14:17:39 +02:00
Philippe Teuwen
0d6a29197b
rework OS/ARCH info
2019-08-29 11:10:54 +02:00
iceman1001
74f96be6be
textual
2019-08-29 10:46:57 +02:00
iceman1001
c3c5011e1d
textual
2019-08-29 10:36:48 +02:00
Philippe Teuwen
b10edbaddc
user dir: rework err msgs
2019-08-29 10:31:37 +02:00
Philippe Teuwen
fcd9b42dca
reintroduce _stat on mingw, needed to strip path
2019-08-29 10:07:40 +02:00
iceman1001
6e54adcb7c
fix: 'hw version' - identifing os on unknown..
2019-08-29 09:53:28 +02:00
iceman1001
979f3aba2e
chg: 'hf iclass chk'
...
chg: 'hf iclass lookup' - use fileutils load dictionary instead.
chg: 'hf iclass encrypt' - start w change to allow for key parameter
2019-08-29 07:47:17 +02:00
iceman1001
3683cd88c6
chg: 'hw version' - simple os detection.
2019-08-29 07:45:09 +02:00
Matthias Konrath
a69fbdd3af
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into autopwn_restyle
2019-08-29 06:17:27 +02:00
Philippe Teuwen
430c53a7ac
Fix buffer allocation again, just getting rid of it
2019-08-28 23:51:52 +02:00
Philippe Teuwen
aa77f7298c
Fix buffer allocation for showing compiler version
2019-08-28 23:28:28 +02:00
Philippe Teuwen
11c7db3523
Get ~/.proxmark3 working on Mingw
2019-08-28 23:07:23 +02:00
Philippe Teuwen
d2d58db985
Move history and logfile to ~/.proxmark3
2019-08-28 21:53:31 +02:00
iceman1001
117ebf0beb
chg: 'hf mf ecfill' - now uses NG format.
...
chg: 'hf mf eload' - now uses NG format.
chg: 'hf mf fchk m' - now uses ecfill trick, if fchk got all keys, it will dump the card directly.
sample:
hf mf fchk 1 m (must have dictionaries uploaded to device) if all keys are found, you can now run
hf mf esave to get a complete dump.
2019-08-28 21:21:27 +02:00
iceman1001
8d9751ebe4
fix: uint cant be negative..
2019-08-28 21:16:09 +02:00
iceman1001
ad3fe38b45
fix: loaddictionary_save, now with correct mem clear.
2019-08-28 21:15:32 +02:00
iceman1001
f3ab9632f0
return values
2019-08-28 21:12:32 +02:00
Philippe Teuwen
cbca61f6ba
searchAndList: hide temptative repo path
2019-08-28 19:25:15 +02:00
Matthias Konrath
e4159b7cb3
Cleaned up the ouput to be as minimalistic as possible. Now the verbose flag output is realy verbose.
2019-08-28 18:39:01 +02:00
Matthias Konrath
2e29b361c5
Restyled the autopwn command output according to @doegox
2019-08-28 15:57:21 +02:00
Matthias Konrath
6c76e2ed5b
Restyled to the autopwn command output.
2019-08-28 14:20:52 +02:00
Iceman
86790df6e7
Merge pull request #364 from matthiaskonrath/load_dictionary_safe
...
Implementation of a function to safely load a dictionary
2019-08-28 12:55:08 +02:00
Matthias Konrath
5167507a83
Fixed the loadFileDICTIONARY_safe memset alignment. Thanks to @doegox for pointing that out.
2019-08-28 12:14:40 +02:00
Matthias Konrath
2290b2bd88
Fixed the description of the loadFileDICTIONARY_safe function.
2019-08-28 11:30:30 +02:00
Matthias Konrath
7237a9638b
Removed debugging stuff.
2019-08-28 11:19:54 +02:00
Matthias Konrath
e259b26d60
Streamlined the naming conventen and types.
2019-08-28 10:45:45 +02:00
Matthias Konrath
7eb79732ff
Added security features to the loadFileDICTIONARY_safe function (memset after a realloc).
2019-08-28 10:38:56 +02:00
Matthias Konrath
1ce10cfea6
Added additional checks (loadFileDICTIONARY_safe).
2019-08-28 10:09:01 +02:00
Matthias Konrath
ae7b0de2c9
Fixed a typo and added and improved the checks for the returned data of loadFileDICTIONARY_safe.
2019-08-28 09:49:21 +02:00
Matthias Konrath
9dc3c39a95
Added additional checks to the from load dictionary returned data points.
2019-08-28 09:45:11 +02:00
Matthias Konrath
225b18d5fc
Implemented a function to safely load dictionaries.
2019-08-28 09:34:46 +02:00
Philippe Teuwen
254beefda2
Fix mingw utf8->cp850 support
2019-08-28 00:03:27 +02:00
Philippe Teuwen
4fe7c7c9fa
remove utf8 dashes
2019-08-27 23:17:02 +02:00
iceman1001
4b8c80ec33
return values..
2019-08-27 21:56:03 +02:00
Matthias Konrath
a0c2de5602
Added an key found message to the read b key with a key feature.
2019-08-27 20:28:28 +02:00
Matthias Konrath
42d58cbced
fixed the read B key features error handling.
2019-08-27 19:55:45 +02:00
Matthias Konrath
c9a02adc70
Added the read B key with known A key feature, and minor changes to the UI (alignment).
2019-08-27 19:45:37 +02:00
Matthias Konrath
02c1657594
Added some found keys to the dictionary.
2019-08-27 19:17:52 +02:00
Philippe Teuwen
d88b76beda
partial make style
2019-08-27 17:28:08 +02:00
iceman1001
13aa4ee6ab
fix: cleaning up 'hf mf autopwn' - reused the fix from below aswell.
...
Add: 'hf mf dump' rename filenames (@mohemiv) see https://github.com/RfidResearchGroup/proxmark3/pull/360
2019-08-27 17:15:42 +02:00
iceman1001
703329faca
chg: add used known key to found list :)
2019-08-27 11:08:03 +02:00
iceman1001
48d3802d35
chg: optimization of iclass mac calculations on deviceside (@pwpiwi) see https://github.com/Proxmark/proxmark3/pull/861
...
chg: some textual
2019-08-27 10:51:52 +02:00
Matthias Konrath
1e648088b1
Improved the help message of the autopwn command.
2019-08-26 22:54:59 +02:00
Philippe Teuwen
16a7cfd7b2
make style (excepted cmdhficlass...)
2019-08-26 22:28:39 +02:00
Philippe Teuwen
9c677e045e
mf autopwn: try nested harder before hardnested; typos
2019-08-26 22:21:23 +02:00
Philippe Teuwen
d838c81601
hf mf attacks: rewordings
2019-08-26 20:57:23 +02:00
Philippe Teuwen
1368595be1
hf mf nested: swap loops for faster results (try harder to break keyA first)
2019-08-26 20:37:33 +02:00
Philippe Teuwen
bdd6ef98b5
fix autopwn help
2019-08-26 20:34:16 +02:00
Iceman
d548b8daeb
Merge pull request #353 from matthiaskonrath/hardnested_autopwn
...
Autopwn
2019-08-26 15:12:21 +02:00
Matthias Konrath
236c2eb1d0
Changed createKeyDump to a less generic name (createMfcKeyDump).
2019-08-26 14:29:21 +02:00
Philippe Teuwen
1628ac8e62
revert temporarily hf iclass chk/lookup 2a1e6dff
2019-08-26 13:55:42 +02:00
Philippe Teuwen
7076df0e18
hf mf chk/fchk: don't stop on line errors when parsing dict
2019-08-26 13:53:23 +02:00
Philippe Teuwen
6ac9d2f0fb
lf t55xx chk: load dic with searchFile
2019-08-26 13:46:53 +02:00
Philippe Teuwen
2a1e6dff80
hf iclass chk/lookup: load dic with searchFile and fail when errors in args
2019-08-26 13:36:37 +02:00
Philippe Teuwen
4ddc3d61d5
hf mf chk/fchk: load dic with searchFile and fail when errors in args
2019-08-26 13:21:03 +02:00
Matthias Konrath
2edee59837
Changed the variable names, added aditional dictionary size checks, fixed a corner case with the key transferes.
2019-08-26 12:27:40 +02:00
iceman1001
2e4c7f4f8d
chg: reuse code
2019-08-26 10:52:07 +02:00
Matthias Konrath
13641771ba
Improved help message, implementation of a verbose option (to reduce the output), corrected some spelling mistakes and cleaned up variable names.
2019-08-25 22:24:52 +02:00
Matthias Konrath
47b2c5ddc6
Removed old command options.
2019-08-25 11:16:10 +02:00
Matthias Konrath
bd01b7bd96
Now the keys are transfered to the simulator memory and the whole card gets dumped at the end.
2019-08-25 11:13:53 +02:00
Matthias Konrath
7dbb5427ea
Transformation from hardautopwn to autopwn, now are all the mifare classic attacks automated.
2019-08-24 18:11:03 +02:00
iceman1001
f9d8d56317
add iclass json dump format
2019-08-24 13:16:28 +02:00
Philippe Teuwen
ec174a7232
better searchFile api
2019-08-24 07:51:24 +02:00
Philippe Teuwen
7ab7d68a26
calloc in fileutils
2019-08-24 07:18:45 +02:00
iceman1001
c6145a81c2
chg: iclass commands
2019-08-24 05:08:03 +02:00
Philippe Teuwen
9d05628c3c
mem load: update examples
2019-08-23 23:21:20 +02:00
Philippe Teuwen
b09849c91b
pull filenamemcopy out of searchFile
2019-08-23 23:07:05 +02:00
Philippe Teuwen
4b95be1b39
searchFile: search also implicit relative path
2019-08-23 22:09:54 +02:00
Philippe Teuwen
8c26e07ceb
use searchFile to find dictionaries
2019-08-23 22:08:36 +02:00
Philippe Teuwen
34a0fdb9d6
reorganize lua script dir defs
2019-08-23 22:07:45 +02:00
Philippe Teuwen
31e430744b
searchFile: use filenamemcopy
2019-08-23 21:49:58 +02:00
Philippe Teuwen
e0cdb5d7a7
makefile: allow override of install paths
2019-08-23 21:07:20 +02:00
Philippe Teuwen
c709ee7c10
rework PREFIX for future make install
2019-08-23 20:55:50 +02:00
Matthias Konrath
87cbf3aa70
Improved the reliability, speed and redability. Ready for a pull mr. iceman ;)
2019-08-23 17:17:17 +02:00
Iceman
4b2b103e80
Update mfc_default_keys.dic
...
data from forum,
2019-08-23 15:23:55 +02:00
Philippe Teuwen
440c05cdfa
searchFile accepts also explicit absolute or relative path
2019-08-23 00:08:19 +02:00
Philippe Teuwen
3ebc00854b
Add searchAndList & searchFile in fileutils
2019-08-22 23:55:37 +02:00
Philippe Teuwen
e8efeacc57
remove ON_DEVICE from fileutils
2019-08-22 23:07:52 +02:00
Philippe Teuwen
77c86099cc
clean and uniformise dic files
2019-08-22 22:58:16 +02:00
Philippe Teuwen
23044c00d0
rename and move dict files
2019-08-22 22:16:33 +02:00
Philippe Teuwen
915c200ebc
luascript: use fileExists
2019-08-22 21:18:37 +02:00
Philippe Teuwen
72392ab305
fileutils: fix rel path to includes
2019-08-22 21:18:14 +02:00
Philippe Teuwen
9825f521b4
Fix clang issue where generated .d are sometimes newer than .o
2019-08-22 21:05:45 +02:00
Philippe Teuwen
40b6956a22
script list: print dir tree
2019-08-22 19:53:23 +02:00
Philippe Teuwen
595b8a1885
introduce PREFIX for pm3 system directory and move to common.h
2019-08-22 19:36:20 +02:00
iceman1001
ab38130c3e
chg: some more checks in pathing
2019-08-22 17:44:08 +02:00
Matthias Konrath
abb69e2dc9
Further improved the hardautopwn feature.
2019-08-22 14:55:06 +02:00
Matthias Konrath
407078d90a
Experimental hardautopwn implementation.
2019-08-22 12:49:26 +02:00
Philippe Teuwen
9ae27cd73c
scripts list / scripts run: look also in the new lua scripts paths
2019-08-22 00:32:15 +02:00
Philippe Teuwen
3c6500a1b2
Lua: look for scripts also in ~/.proxmark/{luascripts,lualibs} and /usr/local/share/proxmark3/...
2019-08-21 23:53:27 +02:00
Philippe Teuwen
a8ee33baf4
change scripts/ to luascripts/
2019-08-21 23:17:01 +02:00
Philippe Teuwen
fb00690957
rename and +x few eml helper scripts
2019-08-21 22:45:06 +02:00
Iceman
56267ea623
readd fileutils
2019-08-21 14:43:22 +02:00
Iceman
a0f261c1e0
chg: moved fileutils from loclass
2019-08-21 14:41:33 +02:00
Iceman
4e627f09c0
add: proxmark3 -v/--version - for easiness to detect version in offline mode and installs
2019-08-21 12:52:59 +02:00
Iceman
fea5d88278
add: detect unfused / write once magic tags, from https://github.com/nfc-tools/libnfc/pull/554
2019-08-20 14:53:52 +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
aebfe0af19
rework mfkey Makefile and move util_posix to common, use Makefile.host
2019-08-19 21:50:16 +03:00
Philippe Teuwen
829934886f
rework tinycbor Makefile, use Makefile.host
2019-08-19 21:50:16 +03:00
Philippe Teuwen
7b78833800
rework liblua Makefile and skip clients compilation, use Makefile.host
2019-08-19 21:50:16 +03:00
Philippe Teuwen
9767c075d9
rework jansson Makefile, 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
iceman1001
f06846e2d0
chg: 'hf iclass loclass' - break attack earlier if one csn byte recovery fails. No need to try run it. and some colors...
2019-08-19 20:24:08 +02:00
Philippe Teuwen
ab2100879e
Get btpin/btfactory available in FPC DEV builds
2019-08-19 17:47:11 +02:00
root
63b47a003e
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-08-18 17:06:58 +02:00
iceman1001
f2e77bfbe4
chg: some tabs converted
2019-08-17 15:59:11 +02:00
Philippe Teuwen
4d16f3e7d2
fix reveng: unsigned long on Mingw64 is only 32b, hopefully limits.h can help
2019-08-15 19:24:50 +02:00
Philippe Teuwen
f008b965d5
missing include
2019-08-14 23:06:14 +02:00
root
d770e4c57a
remove debugstatements
2019-08-14 22:59:14 +02:00
Philippe Teuwen
a187968967
Hmm, let's try to fix reveng on 32b
2019-08-14 22:19:52 +02:00
Philippe Teuwen
2f029d0d9d
remove comment
2019-08-14 21:54:43 +02:00
Philippe Teuwen
ea601f4052
fix reveng for all platforms else than WIN32
2019-08-14 21:53:04 +02:00
Philippe Teuwen
db0ac1639b
em4x watch & read: collect enough samples to cover EM XL tags
2019-08-13 22:57:54 +02:00
Philippe Teuwen
252929bed4
fix lf read command parsing bug
2019-08-13 20:30:19 +02:00
cjbrigato
961f98c125
SPIFFS : FIXES FS corruption against high numbero f current losses, high number of files manipulation. FIXES LOG_BLOCK erasing handlers. FIXES Garbage Collector. Overall, SPIFFS should now be WAY MORE resilient to any form of misbehavior. In case of corrupted filesystem (should still be readable !), spamming 'mem spiffs check' from the client will ensure at least 2 new free 4k blocks each tile (if number of LOG_PAGE available is enough) and in the same pass will move/reorganize the LOG_PAGES of contextual blocks. Yiha
2019-08-13 17:39:48 +02:00
iceman1001
de1093d5d9
textual
2019-08-12 16:32:27 -04:00
iceman1001
bbc324f9fe
follow status pattern
2019-08-12 16:31:57 -04:00
Philippe Teuwen
01ce580e7b
make btpin & btfactory accessible in BTADDON builds
2019-08-12 18:58:28 +02:00
Colin J. Brigato
cb39be8c47
Fixes Compilation on OSX
2019-08-12 12:39:16 +02:00
Philippe Teuwen
47b60d84de
make style
2019-08-11 23:53:45 +02:00
Philippe Teuwen
8b0a80ec98
add missing include for whereami.c in android
2019-08-11 21:42:01 +02:00
Philippe Teuwen
3e96c27c18
remove clang warning
2019-08-11 21:42:01 +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
Iceman
b7d412d27b
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-08-10 21:04:25 +02:00
Iceman
a36b784ecd
chg: help text commands now green
2019-08-10 18:34:02 +02:00
Iceman
3f9613b87f
chg: script run dumptoemul - better fail messages
2019-08-10 18:20:20 +02:00
Iceman
b06274623f
fix: hf iclass dump - now also save EML
2019-08-10 18:05:24 +02:00
Philippe Teuwen
ceda9f9f4b
Merge pull request #310 from ViRb3/rework-help
...
Rework hitag2 read/write help
2019-08-09 22:16:21 +02:00
Philippe Teuwen
5051ea429d
typo
2019-08-09 13:02:10 +02:00
Philippe Teuwen
c58937b5f5
client: clean deps while cleaning objects
2019-08-09 12:12:22 +02:00
Philippe Teuwen
5a6c9e7863
hf tune: mask 32b dword to 16b
2019-08-07 13:04:36 +02:00
Philippe Teuwen
bc28eb04e4
Revert 00350db
and add waiting time extension request mechanism, see issue #265
2019-08-07 13:04:34 +02:00
Philippe Teuwen
e057fa6fa0
Add time measurements of recv packets on client side
2019-08-07 13:04:31 +02:00
Philippe Teuwen
9b44590f8d
make style
2019-08-07 13:04:26 +02:00
Philippe Teuwen
12a0540d91
mf sim: add option to pass explicitly atqa/sak and reject explicitly unknown vals for option t
2019-08-07 01:32:37 +02:00
Philippe Teuwen
4615354864
mf sim: respect DBG_NONE and explicit ATQA/SAK usage
2019-08-07 00:47:32 +02:00
Victor
d158ffebfd
Note that hitag1 read/write not yet implemented
2019-08-06 19:13:38 +01:00
Victor
67887a83d3
Rework hitag2 read/write help
2019-08-06 19:08:51 +01:00
Philippe Teuwen
1354aec556
typos
2019-08-06 13:51:10 +02:00
iceman1001
25748b0746
style
2019-08-05 12:01:11 -04:00
iceman1001
f317e3247a
chg: 'lf nedap' - decoding / encoding of Nedap. (anon)
2019-08-05 17:43:53 +02:00
Philippe Teuwen
6f47e12797
Merge pull request #308 from cjbrigato/patch-1
...
FIXes # 174 and more (OSX > 10.4 num_Cpus) the good way
2019-08-05 00:41:20 +02:00
Philippe Teuwen
7a620ddaa7
remove redundant conditions
2019-08-05 00:31:51 +02:00
Colin J. Brigato
38e4e8d80c
FIXes OSX > 10.4 num_Cpus() the good and posix way
...
sysconf() is part of IEEE Std 1003.1-1988 (POSIX.1).
Fortunately, it *is* available to OSX `>=10.5`.
At least on `~10.14`, the old unposix `sysctl` osx way was lost, at least in portable environments.
This fixes it, but will not be compatible with OSX > 10.4.
So i'm sorry but here we loose compatibility with Macs olders than 2005. (🤣 )
2019-08-05 00:27:15 +02:00
iceman1001
18d2c24e9e
chg: 'trace list' - abort when ENTER key is pressed
2019-08-04 19:13:54 +02:00
Philippe Teuwen
f40600f997
make style
2019-08-04 16:57:06 +02:00
Philippe Teuwen
1cb039255e
Add client option -i
to stay in interactive mode after a script or command
...
From 5a3f474331
with some fix in the logical flow
2019-08-04 15:34:18 +02:00
Philippe Teuwen
88d2a61c0b
typo
2019-08-04 12:58:36 +02:00
iceman1001
a90e5e1858
chg: legic cmds uses return macros.
...
chg: hf search started to use macros
2019-08-03 23:36:55 +02:00
Philippe Teuwen
60bfc37f35
remove more dummy cmds
2019-08-03 22:52:32 +02:00
Philippe Teuwen
61538bd635
thinfilm simulation when on battery
2019-08-03 22:37:01 +02:00
Philippe Teuwen
25f358955b
make hf search robust to various HF configurations
2019-08-03 22:14:12 +02:00
Philippe Teuwen
4a3fb3ccf1
split nfcbarcode from iso14443a
2019-08-03 22:14:12 +02:00
Iceman
e4972e8810
Merge pull request #305 from ViRb3/better-warn
...
Better warn user of hardcoded hitag info
2019-08-03 20:01:18 +02:00
Philippe Teuwen
017b3357ed
Comment Felica simulation in client, there is no corresponding code in ARM
2019-08-03 19:57:57 +02:00
Philippe Teuwen
a0a232a985
rename few CMD_* to get some less diversity
2019-08-03 19:48:02 +02:00
Philippe Teuwen
cbf5c717f7
Remove unused CMD_*
2019-08-03 19:48:02 +02:00
Victor
a0193fa903
Better warn user of hardcoded hitag info
2019-08-03 18:29:02 +01:00
iceman1001
52065adcfa
chg: 'hf topaz reader' - more verbose
2019-08-02 11:37:35 -04:00
iceman1001
0747cf9ec0
add more keys (@anon)
2019-08-02 09:48:42 -04:00
Philippe Teuwen
ab74d2b798
Revert ARRAYLEN on whereami.c, bag of bones...
2019-08-02 08:06:30 +02:00
Philippe Teuwen
0eae1e2563
make style
2019-08-02 00:26:48 +02:00
Philippe Teuwen
865a7c3ad4
Add thinfilm simulation
2019-08-02 00:26:07 +02:00
Philippe Teuwen
824e0ae3e4
use thinfilm trace with hf thinfilm list
2019-08-01 20:15:46 +02:00
Philippe Teuwen
3bc5f7688d
thinfilm trace
2019-08-01 20:06:07 +02:00
iceman1001
63a7f8a4c4
fix: 'hf topaz reader' - not crashing when trying to read a thinfilm
2019-08-01 12:36:50 -04:00
iceman1001
5a2d0c4cc1
chg: 'hf thinfilm info' - print text
2019-08-01 12:22:51 -04:00
iceman1001
2a054438ab
chg: 'hf thinfilm info' - fixed manufacture lookup
2019-08-01 12:16:33 -04:00
Philippe Teuwen
7bdcf3cff5
thinfilm, show raw data if unknown encoding
2019-08-01 18:03:41 +02:00
Philippe Teuwen
85c0f3e9e3
thinfilm partial info when verbose
2019-08-01 17:49:35 +02:00
iceman1001
10c949a47e
chg: 'hf thinfilm info' - versbose mode and sanity checks
2019-08-01 11:33:00 -04:00
iceman1001
2400418067
style
2019-08-01 11:15:39 -04:00
iceman1001
faf68081b0
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-08-01 11:11:07 -04:00
iceman1001
a331090c6a
Chg : 'hf thinfilm info' - added crc check
2019-08-01 11:09:51 -04:00
Philippe Teuwen
8f6c048481
thinfilm: fix urls with 0xFE terminator
2019-08-01 17:07:07 +02:00
Philippe Teuwen
3fb442798d
thinfilm usage typo
2019-08-01 15:49:58 +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
Philippe Teuwen
733a7d836d
more ARRAYLEN
2019-08-01 00:14:09 +02:00
Philippe Teuwen
f276dca3f1
less hardcoded sizes and more ARRAYLEN
2019-07-31 23:45:17 +02:00
iceman1001
74288ad128
chg: hf topaz - got some love
2019-07-31 15:43:00 -04:00
Philippe Teuwen
98624037ad
hf mfu: please no extended ascii char
2019-07-31 12:43:15 +02:00
Philippe Teuwen
f0c939b1bc
hf mfu: avoid hardcoded array size
2019-07-31 12:14:44 +02:00
Philippe Teuwen
5edd342d4c
Add NTAG_I2C_1K support to hf mfu, thanks JP Szikora
2019-07-31 12:04:32 +02:00
iceman1001
4c9b95c216
chg: flash messge
2019-07-30 14:31:10 -04:00
iceman1001
6d1c996251
chg: flashing - test messages
2019-07-30 19:22:24 +02:00
netvader
8abbbe4d5e
Update default_keys.dic
...
add hotel key from alltours
2019-07-29 11:03:20 +02:00
Philippe Teuwen
c6b8e199fd
fix usart cmd descriptions
2019-07-28 21:08:50 +02:00
Philippe Teuwen
c83ff9da0f
make style
2019-07-28 19:24:00 +02:00
Philippe Teuwen
5854ab19dd
client tells when over TCP
2019-07-28 19:23:37 +02:00
iceman1001
a25814bda4
ADD: 'trace list' - annotate nano signature
2019-07-28 14:23:30 +02:00
iceman1001
00350db238
Chg: hf tune
- increase timeout vaules. fix #265
2019-07-28 03:29:31 -04:00
iceman1001
c5b8df449d
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-07-28 09:22:30 +02:00
iceman1001
ca53711b8d
chg: lf t55xx - helptext
2019-07-28 09:21:02 +02:00
iceman1001
9f4620c92c
make style
2019-07-27 17:48:52 -04:00
iceman1001
f433e26e3b
Add: 'hf mfu info' - now does orinality check against ECC. (@pwpivi)
...
Adapted to prefered codestyle and added references.
2019-07-27 23:44:23 +02:00
iceman1001
283060f962
chg: renaming a struct
2019-07-27 21:15:43 +02:00
iceman1001
e99910694b
chg: some more key, thanks @Ollibolli
2019-07-27 15:06:58 +02:00
iceman1001
d7c967b65d
chg: 'codestyle'
2019-07-27 10:25:03 +02:00
iceman1001
e9b493ead6
style
2019-07-27 02:39:30 -04:00
Iceman
b7ba46d38e
Merge pull request #292 from netvader/patch-1
...
Update default_keys.dic
2019-07-26 23:53:15 +02:00
netvader
54a18ebf2b
Update default_keys.dic
...
added some keys from clever fit gym, hotel room turkey, and simonsvoss key card
2019-07-26 22:45:16 +02:00
3ldidi94
ee152657c6
Add one more key
...
Found a new key that is not in this dic file, so I add it.
2019-07-26 11:43:21 +02:00
mwalker33
9085465c38
Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg
2019-07-25 21:00:41 +10:00
mwalker33
3211f35062
Added set default timings
2019-07-25 21:00:30 +10:00
mwalker33
b222161941
Merge branch 'master' into master
2019-07-25 20:12:00 +10:00
mwalker33
77d96ff3b7
Bug Fix Timing order
...
Timing for backward compatibility
2019-07-25 20:01:03 +10:00
Philippe Teuwen
c0eb19acb1
remove tabs
2019-07-24 00:52:24 +02:00
mwalker33
b16f2fdaba
Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg
2019-07-24 08:15:38 +10:00
mwalker33
cdc3787008
clean
2019-07-24 08:12:25 +10:00
Philippe Teuwen
ab043a68b8
remove space in filename
2019-07-23 23:44:41 +02:00
Philippe Teuwen
ac233a346a
make style
2019-07-23 23:43:30 +02:00
Philippe Teuwen
ac18114909
Remove long unsigned int warning
2019-07-23 22:46:58 +02:00
Philippe Teuwen
11e5131604
Merge pull request #284 from mwalker33/master
...
T55x7 Downlink mode support added
2019-07-23 22:42:47 +02:00
Philippe Teuwen
7e84a546c5
GetFromDevice leftovers
2019-07-23 21:45:06 +02:00
Philippe Teuwen
544fb30ce6
typos
2019-07-23 21:40:01 +02:00
Philippe Teuwen
9beabaabf5
make style
2019-07-23 21:33:52 +02:00
mwalker33
5de04f84e9
Restored * 8
...
Revert back to store and use the full value (*8) for the timing.
2019-07-23 20:12:05 +10:00
cjbrigato
70cd0d844b
FIX : Tereifying typo
2019-07-23 07:39:34 +02:00
mwalker33
4e0e69ed63
Added T55 downlink mode support
2019-07-23 09:50:28 +10:00
cjbrigato
5c3676ad81
ADD: Early SPIFFS implementation see #257 , UPDATE HF_COLIN accordingly
2019-07-22 22:56:06 +02:00
Philippe Teuwen
daae890667
Bootrom & flasher changes:
...
* use macros for versions
* activate UNDERSTANDS_VERSION in bootrom
* fix missing break; bug in bootrom
* force flash_load to reject images > 256k if bootloader not up to date
* move logic from flasher to flash
2019-07-20 10:48:40 +02:00
slurdge
68aa9d631d
Flasher support for versionning
...
Only bootrom with version > 1.0.0 will allow 512K writes
2019-07-20 10:47:24 +02:00
Philippe Teuwen
8e6258936c
make style
2019-07-19 13:18:35 +02:00
Philippe Teuwen
33f2cb0981
Rework flasher exit on error
2019-07-19 13:15:32 +02:00
Philippe Teuwen
f6f14f82d4
Add option -i to flasher to query Pm3 for its memory size, and some doc tuning
2019-07-19 13:02:12 +02:00
Philippe Teuwen
44278272a4
typo
2019-07-19 12:39:23 +02:00
slurdge
7bf3255a6c
Flasher support for 512K flash
...
A better way would be to cut the connecting function and flashing function and to move the whole mem computation to flash.c
Working flasher
2019-07-19 12:35:04 +02:00
Philippe Teuwen
4e9e7d6da0
temporary fix to get Appveyor happy. Will need more tuning later.
2019-07-18 23:50:45 +02:00
Julien Piat
29f8bfb80c
Update default_keys.dic with new keys from Scan Badge APK
2019-07-18 15:54:21 +02:00
Philippe Teuwen
259c730bb0
exit(EXIT_FAILURE) if a port was specified to the client and no pm3 is usable
2019-07-17 20:15:47 +02:00
merlokk
84022807a8
fix rare emv search behavior
2019-07-17 12:20:04 +03:00
merlokk
a6977860db
fix emv search keep field bug
2019-07-17 11:27:05 +03:00
Oleg Moiseenko
d3b6a8e193
Merge pull request #253 from merlokk/emv_apdu
...
Emv apdu
2019-07-16 18:08:39 +03:00
merlokk
638d698445
make style
2019-07-16 18:05:36 +03:00
merlokk
5fd2a7613f
add check
2019-07-16 18:05:23 +03:00
merlokk
e61a65fbe8
check PPSE instead of PSE and vice versa. I have one card with this strange behavior...
2019-07-16 17:15:32 +03:00
merlokk
a30c62137b
use apduencode for emv commands
2019-07-16 17:04:54 +03:00
merlokk
bd8824a2f3
make style
2019-07-16 16:10:11 +03:00
merlokk
7726ec6000
move sAPDU
2019-07-16 16:05:47 +03:00
Philippe Teuwen
ed4289d462
Merge pull request #251 from merlokk/reorg_includes
...
added PACKED attribute for structures and reorganize include folder
2019-07-16 14:52:14 +02:00
merlokk
12c6b5cb20
add the definition of PACKED in its client/deprecated-hid-flasher/flasher/proxmark3.h
2019-07-16 15:25:48 +03:00
merlokk
20d13d5509
added PACKED attribute for structures and reorganize include folder
2019-07-16 14:50:38 +03:00
Philippe Teuwen
d8763509de
Add 'hw standalone' to jump to standalone mode from command line or script
2019-07-15 22:31:19 +02:00
Oleg Moiseenko
ddd4601c1e
Merge branch 'master' into ext_apdu
2019-07-15 19:25:48 +03:00
merlokk
84c09ce881
added define PACKED
2019-07-15 19:21:19 +03:00
merlokk
d2a2acf69c
make style
2019-07-15 19:12:01 +03:00
merlokk
df1dd71d14
apdu format and print works
2019-07-15 17:26:42 +03:00
Iceman
caceea24a4
Update default_keys.dic
2019-07-15 15:36:12 +02:00
Philippe Teuwen
0ea7fa7784
buggy 'mem read' removed, 'mem save' renamed 'mem dump', can now display too
2019-07-15 12:57:20 +02:00
Philippe Teuwen
31c3a15cd4
Merge branch 'master' of github.com:RfidResearchGroup/proxmark3
...
* 'master' of github.com:RfidResearchGroup/proxmark3:
textual
Changelog for PR #245 , #246
chg: 'script run read_pwd_mem' - now can correctly deal with more than 4096 bytes when printing mifare classic keys
Fix. More flexible anti-collision frame check
hf_mf_sim. Really tags not respond NACK on invalid authentication
2019-07-15 00:31:46 +02:00
Philippe Teuwen
cad1d500ca
add msleep command
2019-07-15 00:31:38 +02:00
Chris
859a5e80ce
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-07-14 22:52:50 +02:00
Chris
0a845df8c3
chg: 'script run read_pwd_mem' - now can correctly deal with more than 4096 bytes when printing mifare classic keys
2019-07-14 22:52:34 +02:00
Philippe Teuwen
383d3327be
remove spurious changes in make style
2019-07-14 18:42:11 +02:00
merlokk
a9d15d85e6
sketch2
2019-07-14 15:14:54 +03:00
merlokk
51bcc80a2b
small fix
2019-07-14 15:00:40 +03:00
merlokk
68bfbde185
CmdHF14AAPDU sketch
2019-07-14 14:59:59 +03:00
Philippe Teuwen
55602bf833
Fix few zelaous WARNING->ERR
2019-07-14 12:17:34 +02:00
Philippe Teuwen
8bf4b4ad97
Promote WARNING to ERR on some error msgs
2019-07-14 00:35:18 +02:00
Philippe Teuwen
bb3c5e364e
remove perror
2019-07-14 00:30:57 +02:00
Eloff
735077f358
Does clear trace log only at first call 'hf mf chk', to save whole process history
2019-07-13 18:26:52 +03:00
Philippe Teuwen
b0dbbd3683
make style
2019-07-13 00:38:30 +02:00
merlokk
d94c74b24b
make style
2019-07-12 13:58:38 +03:00
Philippe Teuwen
fec7d802b9
Merge branch 'master' of github.com:RfidResearchGroup/proxmark3
...
* 'master' of github.com:RfidResearchGroup/proxmark3:
Update default_keys.dic with keys from an APK
2019-07-11 13:54:48 +02:00
Philippe Teuwen
844d732297
Replace ukbhit by kbd_enter_pressed, not requiring tcgetattr:
...
Note that it behaves differently now
* it looks for Enter key only, not any key
* it "eats" the input, no need for (void)getchar() after it
* it works the same no matter the value of ICANON
* the mingw version has been adapted to act the similarly
This should fix its usage on Android where tcgetattr always returns -1
2019-07-11 13:01:34 +02:00
merlokk
4d8a411413
APDUEncode
2019-07-11 13:08:43 +03:00
3ldidi94
6f457873cc
Update default_keys.dic with keys from an APK
...
Update the dic with keys from Android application "Scan Badge".
I did the diff between keys already present and keys from the application.
2019-07-11 10:37:00 +02:00
Philippe Teuwen
73bbb2e9e8
Silent properly GCC format-truncation warnings in jansson
2019-07-10 22:32:55 +02:00
Philippe Teuwen
e53ac8b715
Merge branch 'master' of github.com:RfidResearchGroup/proxmark3
...
* 'master' of github.com:RfidResearchGroup/proxmark3:
Fix compilation under MacOSX
2019-07-10 21:49:54 +02:00
Philippe Teuwen
99d2ed224a
Minor changes on bootloader chip info
2019-07-10 21:49:14 +02:00
slurdge
4727ab96d7
Dynamic report of the chipID for flashing purposes
2019-07-10 21:11:20 +02:00
Philippe Teuwen
5924847e0c
Merge pull request #234 from matrix/osx_makefiles
...
Fix compilation under MacOSX
2019-07-10 20:58:32 +02:00
Philippe Teuwen
fce082db56
Merge pull request #235 from matrix/osx_warnings
...
Fix Clang warnings
2019-07-10 20:50:29 +02:00
Philippe Teuwen
f466cbc8e1
Merge pull request #236 from matrix/emv_bug
...
Fix EMV bug
2019-07-10 20:40:09 +02:00
Gabriele Gristina
1740d43655
Fix EMV bug
2019-07-10 18:48:15 +02:00
Gabriele Gristina
fa2595a619
Fix Clang warnings
2019-07-10 18:46:30 +02:00
Gabriele Gristina
563050c8ba
Fix compilation under MacOSX
2019-07-10 18:43:19 +02:00
merlokk
1169a6cf1b
apdu rename and print
2019-07-10 19:21:54 +03:00
merlokk
16b6d7e529
apdu universal parser
2019-07-10 19:11:56 +03:00
Victor
cb45313981
Add hitag2 write password auth
2019-07-09 23:00:57 +01:00
slurdge
248b109c9a
Check if bootloader segment is within bounds
2019-07-09 22:12:39 +02:00
t0m4
0a1b2698c9
Code review
2019-07-07 14:00:13 +02:00
t0m4
88df59722e
Code cleaning
2019-07-07 12:10:51 +02:00
t0m4
95fd247e10
Add 'hf 15 csetuid' command to set UID on ISO15693 Magic tags
2019-07-07 10:52:00 +02:00
iceman1001
959a2a9c87
mysterious keys #issue 839 offical repo
2019-07-06 11:16:39 -04:00
Philippe Teuwen
e047d223e4
Fix #216 : skip --as-needed linker options under MacOSX
2019-07-06 10:06:04 +02:00
Victor
773845f411
Print help if unknown arg for hitag reader/writer
2019-07-04 22:12:48 +01:00
Iceman
ae4c3374cb
Update default_keys.dic
...
More keys from 6b6bafed54
2019-07-04 12:33:01 +02:00
Slurdge
7205a910c5
Add compiler name in [CLIENT] section
2019-07-03 16:08:09 +02:00
Iceman
3938933c63
Update default_keys.dic
...
from mct app pr.
2019-06-28 15:50:19 +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
iceman1001
c6d245b843
fix: syntax erros in luascripts
2019-06-23 08:13:17 -04:00
Jacopo Jannone
7e1d4a54ad
Fix syntax errors with Calypso & 14443b Lua
2019-06-23 11:53:48 +02:00
iceman1001
7961ff982d
unique and added some more keys from @korsehindi
2019-06-15 12:05:40 -04:00
iceman1001
f11500f60f
revert and double check empty buffers
2019-06-13 15:13:41 -04:00
Philippe Teuwen
2382ad551b
update msleep in deprecated-hid-flasher
2019-06-12 13:57:02 -07:00
Philippe Teuwen
1ebfa897c8
remove some cppcheck warnings
2019-06-12 06:41:23 -07:00
Iceman
cb07f2f807
Merge pull request #210 from javastraat/master
...
<added keys for Transportes Insular La Palma (Public Transport)>
2019-06-09 11:23:28 +02:00
iceman1001
db578e9f5f
fix: read14a.lua - wrong call
2019-06-09 04:59:16 -04:00
Albert Einstein
b344e7c133
<added keys for Transportes Insular La Palma (Public Transport)>
2019-06-09 10:27:20 +02:00
iceman1001
e7d00dce83
chg: upgrade always possible
2019-06-08 15:26:05 -04:00
iceman1001
fd2ac38ac3
chg: lf em 4x05_info
2019-06-08 15:24:12 -04:00
iceman1001
a6fc729f22
style
2019-06-08 10:11:18 -04:00
iceman1001
7fd7b539be
textual
2019-06-08 10:10:04 -04:00
iceman1001
d3f26fe7b7
style
2019-06-08 10:09:13 -04:00
Philippe Teuwen
a55e597e36
make style
2019-06-07 21:40:33 +02:00
Philippe Teuwen
f7dfd2a1f2
Fix arg names mismatches between decl & def
2019-06-07 21:26:03 +02:00
Philippe Teuwen
732bc766f9
Reduce some var scopes
2019-06-07 18:41:39 +02:00
Philippe Teuwen
7a06a77283
text of data setdebugmode
2019-06-06 11:34:33 +02:00
Philippe Teuwen
1a39ec3026
hf mf/mfu dbg => hw dbg
2019-06-06 11:31:47 +02:00
Philippe Teuwen
d7614684f8
Make sure standalone modes can be launched when connected on USB without client
2019-06-02 23:20:02 +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
Philippe Teuwen
501919a34a
flashmem: text
2019-05-31 23:08:27 +02:00
iceman1001
ecc62add26
fix return check
2019-05-31 14:07:07 -04:00
iceman1001
0a3791ea3a
chg: 'lualibs - 14a minor adaptation
2019-05-31 19:10:01 +02:00
iceman1001
a8b09eba31
chg: 'hf mfu info' - typo
2019-05-31 19:06:22 +02:00
iceman1001
430742a3b6
chg: 'mem info - public key'
2019-05-31 11:25:49 +02:00
iceman1001
b378d373ad
chg: USB doesnt need extra delay
2019-05-29 04:00:02 -04:00
iceman1001
d2fb18f648
chg: 'hf mf dump' - remove debug statements
2019-05-29 08:55:12 +02:00
iceman1001
cee2fc7a34
hf mf rdbl - uses NG
2019-05-28 13:20:56 -04:00
iceman1001
ffc24d672b
keys
2019-05-28 13:18:33 -04:00
iceman1001
caee0a1f6a
key
2019-05-28 08:00:33 -04:00
iceman1001
0004b1075e
chg: lf cotag demod - adjusted error trigger
2019-05-28 05:23:48 -04:00
iceman1001
8ed6c18497
style
2019-05-28 05:22:38 -04:00
iceman1001
74fb740c21
fix: lf em 4x05 - use correct paritytest (@marshmellow)\nchg: lf em 4x05_read\n chg: lf em 4x05_write - uses NG
2019-05-28 05:15:12 -04:00
iceman1001
548d6429ed
return codes
2019-05-27 09:15:53 -04:00
iceman1001
53f2058c7a
chf: hf mf eget\nhf mf eset\nhf mf eclr - uses NG
2019-05-27 07:46:27 -04:00
iceman1001
58bed70ad0
chg: hf 14a sim - uses NG
2019-05-26 15:00:49 -04:00
iceman1001
b05796c7c4
chg: hf mf dbg\nchg: hf mf sim\nchg: hf 14a sim - uses NG
2019-05-26 13:42:27 -04:00
iceman1001
ade858b4f5
fix: script run read_pwd_mem - wrong offsets for -i/-t/-m
2019-05-25 15:56:56 -04:00
iceman1001
6df94abf71
textual
2019-05-25 13:32:54 -04:00
iceman1001
37c30c0395
fix: askdemod - enhances which solves some viking demod errors
2019-05-25 13:27:43 -04:00
iceman1001
abc66484e5
fix: 14a raw commands - running lua scripts works again for MIX/NG frames
2019-05-25 09:06:44 -04:00
iceman1001
2d972f8cb9
style
2019-05-24 10:31:31 -04:00
iceman1001
20b39d55f2
fix: lf presco - show helptexts again
2019-05-24 10:27:21 -04:00
iceman1001
10fc50aff8
fix: lf viking demod - works :)
2019-05-24 09:48:31 -04:00
iceman1001
0d1438d156
chg: lf psksim - uses NG
2019-05-24 09:11:30 -04:00
iceman1001
80a91eba11
chg: need to free some
2019-05-24 07:22:50 -04:00
iceman1001
e727fe5818
chf: lf asksim - uses NG
2019-05-24 07:06:08 -04:00
iceman1001
98b75e43a5
fix: lf t55xx wipe
2019-05-24 06:22:43 -04:00
iceman1001
d32c4d5267
chg: resized flashmem offset for dictionaries to fit
2019-05-23 18:50:24 -04:00
iceman1001
594398ef73
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-05-23 18:32:21 -04:00
iceman1001
9426f61922
chg: lf sim - free mem?
2019-05-23 18:32:17 -04:00
iceman1001
ed9a5e6d6f
chg: textual
2019-05-23 18:31:56 -04:00
Iceman
16c99b9fac
Merge pull request #202 from javastraat/master
...
modified help in hf mf fchk and chk & some extra keys
2019-05-23 23:10:12 +02:00
iceman1001
1ca50fd3b2
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-05-23 17:07:18 -04:00
iceman1001
c13e2f09a1
chg: lf simfsk\nlf paradox sim\nlf awid sim\n\lf ioprox sim\nlf pyramid sim - NG
2019-05-23 17:07:12 -04:00
Albert Einstein
38d0b37e1e
added keys
2019-05-23 21:08:52 +02:00
Albert Einstein
684e93d61a
added keys
2019-05-23 21:06:15 +02:00
Albert Einstein
de694d7cca
modified help in fchk and chk
2019-05-23 21:04:48 +02:00
Philippe Teuwen
fda181890c
nested structs on the sender, for more lean packet size computation
2019-05-23 20:54:21 +02:00
iceman1001
263d662783
chg: lf fsksim - uses NG
2019-05-23 13:16:06 -04:00
iceman1001
0564931450
fix: lf sim - if called with empty graphbuffer all strange things happend, like turning on HF field
2019-05-23 10:51:19 -04:00
iceman1001
f8dbf6138a
fix: lf sim - dont forget to PACK your structs on both sides\n chg: data convertbitstream - converts bit to max/min in order to facilitate demodulation of simulation data
2019-05-23 06:12:20 -04:00
iceman1001
78d7077f01
chg: more keys
2019-05-23 05:02:28 -04:00
Philippe Teuwen
e0c9e2b0d1
rework usart RX timings
2019-05-22 23:30:52 +02:00
iceman1001
794d109f30
chg: lf t55 - fixes / read block uses NG
2019-05-22 11:59:39 -04:00
iceman1001
150fc205b2
chg - returns
2019-05-22 10:10:48 -04:00
iceman1001
1e4f7b7f68
chg - returns
2019-05-22 10:07:27 -04:00
iceman1001
160110f56d
chg - returns
2019-05-22 09:57:29 -04:00
iceman1001
8266514ef0
chg - returns
2019-05-22 09:53:10 -04:00
iceman1001
da2c8d0292
chg - returns
2019-05-22 09:48:57 -04:00
iceman1001
f8749c9ee9
chg - returns
2019-05-22 09:47:03 -04:00
iceman1001
09b66e500d
chg - returns
2019-05-22 09:46:40 -04:00
iceman1001
66361ec6a3
chg - returns
2019-05-22 09:44:55 -04:00
iceman1001
e191dc777d
chg - returns
2019-05-22 09:43:39 -04:00
iceman1001
24458e1392
chg: lf search - works again
2019-05-22 09:40:58 -04:00
iceman1001
461a90eeaf
chg: lf em - and even more return codes
2019-05-22 09:28:12 -04:00
iceman1001
420ca1b235
more returns
2019-05-22 09:04:38 -04:00
iceman1001
486211599d
chg: return codes
2019-05-22 08:57:08 -04:00
iceman1001
d546f39534
chg: cmdlft55xx return codes
2019-05-22 08:48:23 -04:00
iceman1001
9925159bcd
chg: return codes
2019-05-22 08:33:33 -04:00
iceman1001
ad394a2d6b
chg: lf em 410x_sim - reworked to NG\n chg: lf em 410x_demod - now can demod the simulation data.
2019-05-22 08:32:30 -04:00
iceman1001
750739efe4
chg: not fatal
2019-05-22 05:59:43 -04:00
iceman1001
69bab29834
chg: params
2019-05-22 05:58:16 -04:00
Philippe Teuwen
13b461cab2
usart txrx: wait reply depends on rx waittime
2019-05-22 00:06:51 +02:00
Philippe Teuwen
fe6cbfc8fd
baudrates & btfactory
2019-05-20 21:37:50 +02:00
iceman1001
cbc42336d6
fix: lf nedap sim - error when adding parity
2019-05-20 15:24:47 -04:00
iceman1001
f0c173ccba
style
2019-05-20 10:50:23 -04:00
iceman1001
178c922218
chg: lf read - now uses NG
2019-05-20 10:48:51 -04:00
iceman1001
ab8826fed8
chg: lf config - uses NG
2019-05-20 09:50:04 -04:00
iceman1001
d7f1ab2175
chg: lf cmdread - now uses NG
2019-05-20 09:15:45 -04:00
iceman1001
ce4198f5f2
new pwds - white cloner (mwalker)
2019-05-20 07:11:16 -04:00
iceman1001
983e63d82f
hw commands - uses NG
2019-05-20 04:28:34 -04:00
Philippe Teuwen
f0ec37b742
fix hw connect parsing
2019-05-18 21:35:50 +02:00
iceman1001
d4ad0da335
textual,
2019-05-18 18:51:05 +02:00
Philippe Teuwen
413440fdab
hw connect: detect invalid usages
2019-05-18 18:45:15 +02:00
Philippe Teuwen
e6d64df6d0
Fixing segfault
2019-05-18 18:41:24 +02:00
iceman1001
faf3a95a45
chg: 'hw connect' - new params. p <port> b <baudrate>
...
a correct call is now
hw connect p com6 b 115200
This will set baudrate between Client and BT White Dongle.
2019-05-18 18:06:14 +02:00
iceman1001
24a4d053b3
chg: prompt now shows which channel is used.
2019-05-18 18:02:30 +02:00
iceman1001
d5802ff766
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-05-18 17:59:48 +02:00
iceman1001
687f7f3697
consistent output
2019-05-18 17:56:03 +02:00
iceman1001
cba5d18124
use MIX
2019-05-18 17:55:11 +02:00
iceman1001
a4f4104075
textual
2019-05-18 17:53:08 +02:00
Philippe Teuwen
10dc959f34
btfactory: reset role as well
2019-05-18 17:47:29 +02:00
Philippe Teuwen
e9eb764358
Fix MCK in usart, our MCK is 16*12/2/2
2019-05-16 20:12:00 +02:00
Philippe Teuwen
b5e4a60a15
timeout reconfiguration: flag was never cleared and some more changes:
...
* clear newtimeout_pending flag
* fix initial newtimeout_pending flag value on win32
* remove all _atomic as anyway a load+clear wouldn't be atomic and we're not in a critical situation: just one writer seldomly called on reconnect
* move new timeout poll to uart_recv for faster deployment
* remove redundant uart_reconfigure_timeouts(UART_FPC_CLIENT_RX_TIMEOUT_MS);
2019-05-16 12:35:40 +02:00
iceman1001
9b85f80321
chg: the reconnect now works good on ubuntu and mingw (for me :))
...
chg: increased timeout for FPC from 170 -> 200. Mingw seems slower.
2019-05-16 08:02:56 +02:00
iceman1001
c125b3e9fe
chg: less nesting
2019-05-16 07:33:02 +02:00
Philippe Teuwen
b4e8be82f4
remove spMutex, use atomic test&set instead
2019-05-16 00:29:30 +02:00
iceman1001
bfe2cff383
chg: hf mf nack - now uses NG
2019-05-15 07:47:46 -04:00
iceman1001
50c59fb6b2
chg: cident - uses NG
2019-05-15 07:03:19 -04:00
iceman1001
65ff4f0e92
chg: hf mf setmod - uses NG
2019-05-15 06:52:22 -04:00
iceman1001
0edf5500fe
mix
2019-05-15 12:02:22 +02:00
iceman1001
0740d14faa
chg: some unifiying return values
2019-05-15 10:24:06 +02:00
Philippe Teuwen
bc090857b8
text
2019-05-15 08:57:15 +02:00
iceman1001
1e31455474
textual
2019-05-15 02:18:23 -04:00
Philippe Teuwen
8401eb4e14
Add usart btfactory
2019-05-15 02:15:19 +02:00
iceman1001
586e2ebabd
textual
2019-05-14 11:42:58 -04:00
iceman1001
36ecc4be97
style
2019-05-14 11:42:17 -04:00
Iceman
eef53a853a
Merge pull request #196 from mcd1992/guikeys
...
Add clamp to PageDown case in plot GUI and updated changelog as requested in #195
2019-05-14 17:38:35 +02:00
iceman1001
ace4798c4d
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-05-14 17:13:54 +02:00
iceman1001
8bfe669430
fix: 'script run legic' - at last, it now saves in EML and BIN format.
2019-05-14 17:13:29 +02:00
Aaron McDaniel
1186753bf6
Added clamp to PageDown case in plot GUI and updated changelog
2019-05-14 10:12:46 -05:00
Philippe Teuwen
1147c9faf8
Use ARRAYLEN
2019-05-14 12:51:45 +02:00
iceman1001
da09131aa3
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-05-14 12:37:02 +02:00
iceman1001
d792f015a2
fix: 'script run legic' - bytes was in string format,
2019-05-14 12:36:37 +02:00
Philippe Teuwen
62cf4ad8a7
fancy INPLACE
2019-05-14 12:35:25 +02:00
iceman1001
48c71aeef6
fix: 'script run legic' - also save as binary. https://github.com/RfidResearchGroup/proxmark3/issues/193
...
if binary file exists, it will try to increase filename counter to find a non-existing name.
2019-05-14 11:54:25 +02:00
iceman1001
28398222e6
chg: 'hf tune' - now with prefix :)
2019-05-14 11:18:33 +02:00
Iceman
d4eb91fa43
Merge pull request #195 from mcd1992/guikeys
...
Added paged moving to the plot GUI
2019-05-14 11:18:00 +02:00
Philippe Teuwen
d535d5a378
hf tune: can be interrupted by keyboard
2019-05-14 08:40:22 +02:00
Philippe Teuwen
42d025d01a
Slight rework of hw tune
2019-05-14 08:29:24 +02:00
Philippe Teuwen
c281f71f59
hf tune: group commands
2019-05-14 08:25:26 +02:00
mcd1992
528da6ec32
Added paged moving to the plot GUI
2019-05-13 19:39:27 -05:00
Philippe Teuwen
7ed7a9de40
Rework hf tune to make it synchronous (needed for rdv4)
2019-05-14 00:37:03 +02:00
Philippe Teuwen
995d782bb0
CMD_READER_HITAG requires always a hitag_data struct
...
used as SendCommandMIX(CMD_READER_HITAG, RHT2F_UID_ONLY, 0, 0, NULL, 0);
sent to ReaderHitag((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes);
void ReaderHitag(hitag_function htf, hitag_data *htd)
=> we should always send a hitag_data struct
2019-05-13 23:15:07 +02:00
Philippe Teuwen
ff7cd9d84d
CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES needs 6 bytes of data.
...
used as SendCommandMIX(CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4, NULL, 0);
sent to MifareAcquireEncryptedNonces(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
[...]
uint64_t ui64Key = bytes_to_num(datain, 6);
=> we should always send 6 bytes for "bytes_to_num"
2019-05-13 23:11:05 +02:00
Philippe Teuwen
e4f00c52da
Fix #194 Graph window loops to end if you scroll left past 0
2019-05-13 20:34:02 +02:00
iceman1001
6a6902e57d
chg: luascripts now uses t55xx write NG frame format
2019-05-13 16:51:26 +02:00
iceman1001
801cb95967
fix: 'lf t55xx write' - wrong bitshift
2019-05-13 13:36:54 +02:00
iceman1001
d2a4ade2af
chg: lf t55xx write - now uses NG frames.
2019-05-13 13:23:53 +02:00
Philippe Teuwen
0e827b1083
Fix CMD_T55XX_WRITE_BLOCK expecting data and sending NULL
2019-05-13 12:21:09 +02:00
Philippe Teuwen
6caf571a44
NG->MIX for hitag cmds where the zeroes were actual args
2019-05-13 10:35:30 +02:00
Philippe Teuwen
4929b16bf9
style
2019-05-12 20:38:03 +02:00
Philippe Teuwen
a2c70e5481
Add .dic to gitattributes for LF, remove existing CR
2019-05-12 20:37:51 +02:00
Chris
41db59f028
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-05-12 18:45:13 +02:00
Chris
d44a5712a7
add: default key for library / parking
2019-05-12 18:43:20 +02:00
Philippe Teuwen
80a71c59d4
Merge pull request #186 from uhei/hexdump
...
Cmdtrace: Show trace ouput in hexdump format
2019-05-10 19:27:45 +02:00
Philippe Teuwen
b6b20e246c
Merge pull request #187 from uhei/macos-readline
...
client/Makefile: use brew libreadline on macOS
2019-05-10 19:07:03 +02:00
Philippe Teuwen
3412e9d8c5
Capabilities versionning, would also detect platform struct pack issues
2019-05-10 19:00:18 +02:00
Philippe Teuwen
5aed3e04c9
Merge pull request #190 from uhei/memcpy-bo
...
client/comms.c: fix buffer overflow
2019-05-10 18:47:39 +02:00
Uli Heilmeier
a1c24c6c7d
Cmdtrace: Show trace ouput in hexdump format
...
Adding option 'x' to show trace output for 14a in hexdump format.
This output can be imported into Wireshark using the 'Import from Hex Dump' option.
Encapsulation type should be set to 'ISO 14443' and Max Frame Length to 256.
Format defined at https://www.kaiser.cx/pcap-iso14443.html
2019-05-10 16:03:39 +02:00
Uli Heilmeier
0119e13ff3
client/comms.c: fix buffer overflow
...
Don't copy more bytes into pm3_capabilities as its size.
Fix : RfidResearchGroup/proxmark3#189
2019-05-10 14:50:09 +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
39c7941930
style
2019-05-09 20:20:54 +02:00
Philippe Teuwen
2bee7e12f6
Fix hf mfu dump on ULC: UID in filename
2019-05-09 20:05:12 +02:00
Philippe Teuwen
7195ce9b27
remove iso15 getUID timeout msg
2019-05-09 13:25:14 +02:00
Philippe Teuwen
730927a81d
NG->MIX for few cmds where the zeroes were actual args
...
CMD_READER_ISO_14443a
CMD_EPA_PACE_REPLAY
CMD_TEST_HITAGS_TRACES
CMD_FELICA_COMMAND
2019-05-09 12:33:17 +02:00
Philippe Teuwen
84f696451d
units
2019-05-09 01:07:34 +02:00
Philippe Teuwen
2c10482279
all LF sim: client waits till button pressed
2019-05-09 00:08:59 +02:00
Philippe Teuwen
ddd62e2848
text
2019-05-08 22:45:20 +02:00
Philippe Teuwen
d088ed4232
fast mode on LF techs using t55xx write block
2019-05-08 22:43:35 +02:00
Philippe Teuwen
962f45e3e6
mf nested: remove compilation warning
2019-05-08 22:02:14 +02:00
Philippe Teuwen
77398550b0
fast mode on Mifare emulator upload
2019-05-08 21:54:15 +02:00
Philippe Teuwen
c72e74275d
fast mode on epa pace replay
2019-05-08 20:13:07 +02:00
Philippe Teuwen
e7362d5e6a
fast mode on legic cmds
2019-05-08 19:48:53 +02:00
Philippe Teuwen
93171e3d74
fast mode on sc upgrade, no much diff
2019-05-08 19:34:11 +02:00
Philippe Teuwen
2f71d951e1
iclass: avoid last ping in fast modes
2019-05-08 19:16:37 +02:00
Philippe Teuwen
2f2796be7e
Fix deprecated-hid-flasher
2019-05-08 13:32:17 +02:00
Philippe Teuwen
4fd520c6d4
Introduce SendCommandBL
2019-05-08 13:31:58 +02:00
Philippe Teuwen
e93b4e3c61
Remove usb_cmd refs
2019-05-08 11:17:14 +02:00
Philippe Teuwen
c190ac0955
Hide conn error when hw reset, as suggested by @iceman
2019-05-08 11:14:29 +02:00
Philippe Teuwen
68e5b3c355
style
2019-05-08 01:35:51 +02:00
Philippe Teuwen
f49d7e6d39
remove SendCommand
2019-05-08 01:32:32 +02:00
Philippe Teuwen
c867b3bc9a
Add cmd: usart btpin to change add-on BT PIN
2019-05-08 01:24:46 +02:00
Philippe Teuwen
df2203d9c3
hw command text
2019-05-08 00:58:36 +02:00
iceman1001
964006fd21
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-05-08 00:17:52 +02:00
iceman1001
01efa71e27
use NG
2019-05-08 00:10:03 +02:00
iceman1001
8ebd5e0579
textual, fixes to legic commands used. Needs testing
2019-05-08 00:07:20 +02:00
Philippe Teuwen
02ea378e38
Wow, two improbable bugs were cancelling each other
2019-05-08 00:02:08 +02:00
iceman1001
5b087a053c
fix: script run legic_buffer2card - correct params for write command
2019-05-07 23:53:06 +02:00
iceman1001
a5f19cde79
textual
2019-05-07 23:46:37 +02:00
iceman1001
81feb56003
text
2019-05-07 23:44:46 +02:00
iceman1001
8548eda9bd
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-05-07 23:41:56 +02:00
iceman1001
d313804e78
textual
2019-05-07 23:41:41 +02:00
Philippe Teuwen
920affeb44
Merge branch 'master' of github.com:RfidResearchGroup/proxmark3
...
* 'master' of github.com:RfidResearchGroup/proxmark3:
textual
textual
2019-05-07 23:39:47 +02:00
Philippe Teuwen
c505a59e3d
Merge branch 'master' of github.com:RfidResearchGroup/proxmark3
...
* 'master' of github.com:RfidResearchGroup/proxmark3:
refactor NG
refactor
textual
refactored NG
textual
refactoring NG
refactoring
15 - use NG and refactoring
textual
using MIX
textual
textual
textual
Update .gitignore
chg: script run didump - helptexts
fix: rename to match the new file
chg: script run didump - use MIX
chg: hw ping - shouldnt be converted yet..
2019-05-07 23:38:28 +02:00
iceman1001
9c95a2e8aa
textual
2019-05-07 23:37:15 +02:00
Philippe Teuwen
2f1061f95b
rework ping
2019-05-07 23:35:09 +02:00
iceman1001
89e25a4d1d
textual
2019-05-07 23:34:05 +02:00
iceman1001
a59f2a1b60
refactor NG
2019-05-07 23:27:16 +02:00
iceman1001
e1bb05b35e
refactor
2019-05-07 23:21:56 +02:00
iceman1001
7ccff2db4a
textual
2019-05-07 23:19:22 +02:00
iceman1001
e799717880
refactored NG
2019-05-07 23:12:58 +02:00
iceman1001
6b472f6c56
textual
2019-05-07 23:04:29 +02:00
iceman1001
3c533db308
refactoring NG
2019-05-07 22:59:29 +02:00
iceman1001
9bf961cb8a
refactoring
2019-05-07 22:48:18 +02:00
iceman1001
6fbd45aaed
15 - use NG and refactoring
2019-05-07 22:46:00 +02:00
iceman1001
b52a4a53b0
textual
2019-05-07 22:33:51 +02:00
iceman1001
b73146533a
using MIX
2019-05-07 22:33:26 +02:00
iceman1001
c81bce6bf2
textual
2019-05-07 22:15:26 +02:00
iceman1001
2af7255f62
textual
2019-05-07 22:12:18 +02:00
iceman1001
75325aef86
textual
2019-05-07 22:08:46 +02:00
iceman1001
07b6535f7e
chg: script run didump - helptexts
2019-05-07 22:03:11 +02:00
iceman1001
c99845b3d1
fix: rename to match the new file
2019-05-07 21:56:05 +02:00
iceman1001
df555be792
chg: script run didump - use MIX
2019-05-07 21:49:45 +02:00
iceman1001
c180c8df20
chg: hw ping - shouldnt be converted yet..
2019-05-07 21:35:22 +02:00
Philippe Teuwen
bf0ab55833
text
2019-05-07 20:47:05 +02:00
Philippe Teuwen
532dbf28a1
let OpenPm be responsible of setting session.pm3_present
2019-05-07 20:37:23 +02:00
Philippe Teuwen
061321c353
flash still need old cmds
2019-05-07 20:13:01 +02:00
Philippe Teuwen
290f2b625b
Automated upgrades SendCommandOLD/MIX 0,0,0,NULL,0 -> NG and SendCommandOLD ....,NULL,0 -> MIX
2019-05-07 19:51:33 +02:00
iceman1001
39272ba1fb
convert sendOLD -> MIX for simple cmds
2019-05-07 19:13:14 +02:00
iceman1001
0c20c1a9d1
convert to MIX for simple send commands.
2019-05-07 19:03:25 +02:00
iceman1001
119b1e7c81
chg: mem commands - sendMIX
2019-05-07 18:50:45 +02:00
iceman1001
cb991b4d2c
make sure CloseProxmark sets pm3_present.
2019-05-07 17:31:07 +02:00
iceman1001
7eb7685559
cleaning up, simplify
2019-05-07 15:57:22 +02:00
iceman1001
f2a954b422
chg: save serial port name as copy.
2019-05-07 15:40:01 +02:00
iceman1001
43db2a50e2
cleaning
2019-05-07 14:48:53 +02:00
iceman1001
f60977695a
cleaning up
2019-05-07 14:41:20 +02:00
iceman1001
b91e21edde
better output from setting prompt, cursor is still inside ...
2019-05-07 12:29:26 +02:00
iceman1001
f85280ad41
fix: 'hw connect' - if pm3 client was in offline more to start with, check..
2019-05-07 12:28:17 +02:00
Philippe Teuwen
a20392edf3
change offline prompt asap
2019-05-07 12:18:51 +02:00
Philippe Teuwen
de54d35d5f
unplug detection
2019-05-07 12:11:36 +02:00
iceman1001
f68a398e42
rename
2019-05-07 11:46:12 +02:00
iceman1001
bb19e42bbd
textual
2019-05-07 11:44:29 +02:00
iceman1001
fb7445a027
chg: 'hw connect' - make port optional. Reused previous serial port
2019-05-07 11:42:36 +02:00
iceman1001
61d250a7f8
add: 'hw connect' - lets you connect to a specified serial port. If already connected, it disconnects current port before.
2019-05-07 11:05:05 +02:00
Philippe Teuwen
1c70163605
reconnect fast
2019-05-07 01:06:01 +02:00
Philippe Teuwen
ec5876ba35
Linux: Detect soon when pm3 is unplugged
2019-05-06 23:25:01 +02:00
iceman1001
fa8bd85016
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-05-06 22:42:01 +02:00
iceman1001
29a160c905
reconnect version2 yolo
2019-05-06 22:41:00 +02:00
iceman1001
52396e8b5a
textual
2019-05-06 22:40:06 +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
iceman1001
3a902a7a4c
chg: add some helptexts
2019-05-06 14:38:56 +02:00
iceman1001
cffd14a96b
chg: reconnect to a disconnected proxmark3 device without restarting the client. Old functionality restored :)
...
chg: renamed thread
chg: easier if-statements for USART
2019-05-06 14:11:23 +02:00
Philippe Teuwen
eb7aa033ff
Add fast mode support for RX NG frames
2019-05-05 22:34:22 +02:00
Philippe Teuwen
65bd945b54
style
2019-05-05 22:04:35 +02:00
iceman1001
71c37dcb04
alphabet order
2019-05-05 18:42:09 +02:00
Philippe Teuwen
6b5a0f8319
Rename and unguard CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K ans it's used more generally than LF
2019-05-04 23:56:59 +02:00
Philippe Teuwen
ed1ff3db7e
forgot 2 files in the merge :( my bad
2019-05-04 11:33:48 +02:00
Philippe Teuwen
1cff822f1e
remove warning
2019-05-03 22:37:04 +02:00
Philippe Teuwen
3176684f4a
Add usart dev cmds & dynamic flash support capability
2019-05-03 22:30:17 +02:00
iceman1001
8e2d5370f9
fix: seems the mutex messed up on ubuntu but there it works without.
2019-05-03 21:58:47 +02:00
iceman1001
a49ae2d0ce
FIX: slow reconfigure on mingw of serial port
2019-05-03 21:33:00 +02:00
iceman1001
ed1950a0f5
fix: cross thread communictions of timeout variable
2019-05-03 17:53:32 +02:00
iceman1001
535559a140
textual
2019-05-03 11:25:55 +02:00
iceman1001
cb34e554fe
chg: info log = yellow
2019-05-03 09:41:28 +02:00
Philippe Teuwen
b723126deb
Make smartcard support detection dynamic
2019-05-03 09:04:28 +02:00
Philippe Teuwen
f33d0bf206
hw tune: block client till button pressed
2019-05-03 08:40:21 +02:00
Philippe Teuwen
2ec05efa3a
remove outdated & unused loclass files
2019-05-02 12:24:00 +02:00
iceman1001
0cedfc7b2b
chg: list should always be available, since we can now load / save trace files.
2019-05-02 10:42:02 +02:00
Philippe Teuwen
4e17b17343
remove snooper.c, outdated and we can do the same with pm3 client
2019-05-02 00:40:00 +02:00
Philippe Teuwen
e286b3091d
remove cli.c, outdated and we can do the same with pm3 client
2019-05-02 00:34:55 +02:00
Philippe Teuwen
59cc7b46d4
emv: dynamic detection in client
2019-05-02 00:23:58 +02:00
Philippe Teuwen
f217b47cbd
style
2019-05-02 00:18:20 +02:00
Philippe Teuwen
32bb9511ec
Replace WITH_LF by dynamic detection in client
2019-05-02 00:02:38 +02:00
Philippe Teuwen
e6135a8f78
Replace WITH_ISO14443a by dynamic detection in client
2019-05-01 23:38:57 +02:00
Philippe Teuwen
d7b53aacee
Replace WITH_HITAG by dynamic detection in client
2019-05-01 23:26:06 +02:00
Philippe Teuwen
78fdffddf7
Replace WITH_ICLASS by dynamic detection in client
2019-05-01 23:20:18 +02:00
Philippe Teuwen
c640c63e51
Replace WITH_FELICA by dynamic detection in client
2019-05-01 23:18:21 +02:00
Philippe Teuwen
745bff4143
Replace WITH_ISO14443b by dynamic detection in client
2019-05-01 23:17:14 +02:00
Philippe Teuwen
858def687a
Replace WITH_LEGIC by dynamic detection in client
2019-05-01 23:14:30 +02:00
Philippe Teuwen
582d948ac2
Replace WITH_ISO15693 by dynamic detection in client
2019-05-01 23:04:50 +02:00
Philippe Teuwen
2d99c6096b
fix IfPm3Fpc call
2019-05-01 23:04:20 +02:00
Philippe Teuwen
30d29434d5
Replace WITH_FPC by dynamic detection in client
2019-05-01 22:56:10 +02:00
Philippe Teuwen
bb966caab1
Replace WITH_LCD by dynamic detection in client
2019-05-01 22:47:21 +02:00
Philippe Teuwen
a79c792d9f
Fix smartcard commands visibility
2019-05-01 22:37:47 +02:00
Philippe Teuwen
6b2677c154
Replace WITH_SMARTCARD by dynamic detection in client
2019-05-01 22:33:27 +02:00
Philippe Teuwen
cad676a23c
Replace WITH_FLASH by dynamic detection in client
2019-05-01 21:46:29 +02:00
Uli Heilmeier
52179146b6
cmdparser: fix copy& paste typo
2019-05-01 21:31:34 +02:00
Philippe Teuwen
10489db97d
capabilities: more IsAvailable helpers
2019-05-01 21:09:23 +02:00
Philippe Teuwen
ca43afa19b
begin of dynamic capabilities handling in client
2019-05-01 20:48:15 +02:00
iceman1001
5a6929c533
chg: lua lib 14a, added disconnect support
2019-05-01 18:26:12 +02:00
iceman1001
ec5f70caf2
easier to read
2019-05-01 15:15:48 +02:00
Philippe Teuwen
645a4e9d1d
generalize KEYS_IN_BLOCK usage
2019-05-01 14:55:14 +02:00
iceman1001
b7e3806eff
chg: 'hf mf chk' - let eload part benefit for fast push mode
...
chg: 'script run mfkeys' - corrected to use NG frames correct
2019-05-01 13:15:51 +02:00
Philippe Teuwen
13b2e6eed7
Fix hf mf chk
2019-05-01 12:19:51 +02:00
iceman1001
5ab9716e77
textual
2019-05-01 06:04:33 +02:00
iceman1001
63d67e2b0f
fix: setting pm3_present in flasher.
2019-05-01 05:48:20 +02:00
Philippe Teuwen
4f11ef048f
style
2019-05-01 01:38:52 +02:00
Philippe Teuwen
820a6d99a9
better offline mode
2019-04-30 23:52:40 +02:00
iceman1001
f8f39d6196
fix: passing a struct.
2019-04-30 22:03:20 +02:00
iceman1001
e6315b88a1
missing
2019-04-30 21:55:43 +02:00
Philippe Teuwen
63cd4a9fbb
Merge branch 'better_color_handling'
...
* better_color_handling:
Remove cmd_debug from flasher, we've COMMS_DEBUG_RAW if needed
Use PrintAndLogEx in flasher
Simplify color & banner logic
Smart color handling:
2019-04-30 21:37:19 +02:00
Philippe Teuwen
27f7057961
Rename few USB -> PM3 to avoid misleading interpretations
2019-04-30 21:10:11 +02:00
Philippe Teuwen
a5d05e8d42
Remove cmd_debug from flasher, we've COMMS_DEBUG_RAW if needed
2019-04-30 20:23:22 +02:00
Philippe Teuwen
5c9c38ff71
Use PrintAndLogEx in flasher
2019-04-30 20:19:29 +02:00
iceman1001
cddc25994c
fix: by reference
2019-04-30 16:16:17 +02:00
iceman1001
6cddaa0a08
fix: 'hf mf keybrute' - adapt to NG for checkkeys. Kind of out-of-datem, since hardnested solves this better.
2019-04-30 14:29:52 +02:00
iceman1001
2dea3684ae
fix: 'hf iclass eload' - enable NG (Thanks @doegox)
...
chg: 'hf iclass chk' - now uses fast push mode
2019-04-30 14:19:26 +02:00
iceman1001
c1445d2a31
CHG: 'hf mf chk' - uses NG
2019-04-30 14:01:23 +02:00
iceman1001
937d839c6a
chg: 'script run mfkeys' - use fast push mode.
2019-04-30 13:27:19 +02:00
Philippe Teuwen
0a4b90ac20
Simplify color & banner logic
2019-04-30 13:02:27 +02:00
iceman1001
e1063e2836
chg: reconfigure uart timeouts when compiled for FPC and connecting over USB.
2019-04-30 12:57:44 +02:00
iceman1001
481d70b0da
chg: 'hf iclass eload' - use fast push mode.
2019-04-30 12:14:46 +02:00
iceman1001
918a46a984
uninit.
2019-04-30 12:12:55 +02:00
iceman1001
10ac5fd256
chg: 'lf sim' - now uses fast push mode
2019-04-30 10:10:25 +02:00
iceman1001
0ee710ed92
chg: lua scripts now get easy access to fast_push_mode option
2019-04-30 09:48:08 +02:00
Philippe Teuwen
a91d0a7b19
Smart color handling:
...
* if on Windows, no color, as usual
* if on Linux, color only on real term
* no color when > foo
* no color in the logfile
2019-04-30 00:41:52 +02:00
Philippe Teuwen
f4d62eec09
Fix COMMS_DEBUG_RAW
2019-04-29 23:02:49 +02:00
Philippe Teuwen
56f92348ea
style
2019-04-29 22:41:28 +02:00
Philippe Teuwen
73b6fa7cbc
Simpler newfilenamemcopy
2019-04-29 22:40:10 +02:00
Philippe Teuwen
35ea8e745e
Faster CmdHF14AMfChk
2019-04-29 22:39:42 +02:00
Philippe Teuwen
32a512b13e
Support break_after_ACK for MIX frames
2019-04-29 22:39:18 +02:00
Philippe Teuwen
ac9f3b29f6
better COMMS_DEBUG_RAW
2019-04-29 22:38:54 +02:00
Philippe Teuwen
fc6be9fea4
Define USB_CMD_DATA_SIZE_MIX
2019-04-29 22:38:26 +02:00
iceman1001
b08b1c2cd9
chg: 'hf mfu info' - ndef parsing was a bit wrong
2019-04-29 18:58:27 +02:00
iceman1001
31a531f1d0
chg: better ndef parsing and texts
2019-04-29 17:34:47 +02:00
iceman1001
9e34a8e56d
chg: 'hf mfu info' - ndef has 4 byte blocks on UL/NTAG
2019-04-29 17:34:24 +02:00
iceman1001
60ea44069e
text
2019-04-29 14:57:05 +02:00
iceman1001
c4e4e7dc69
text
2019-04-29 14:55:39 +02:00
iceman1001
50f5b1b422
intial
2019-04-29 14:49:18 +02:00
iceman1001
f4f61fecd6
chg: 'script run ndef_dump' - optional verbose ndefparsing
2019-04-29 14:47:44 +02:00
iceman1001
ea7ad8cbc6
fixes to ndef
2019-04-29 14:44:08 +02:00
iceman1001
f4b75d7f5b
fix: ndef parse uri off by one
2019-04-29 14:42:37 +02:00
iceman1001
67e3ac3f54
add: ndef parsing to LUA
2019-04-29 14:19:41 +02:00
iceman1001
03d6454d95
chg: 'script run mfkeys' : uses NG
...
chg: 'hf mf chk' : uses old/mix
2019-04-29 12:12:14 +02:00
iceman1001
7454a4dcf2
chg: 'hf mf chkkeys' - now uses NG
2019-04-29 02:07:40 +02:00
iceman1001
7cc6975e52
fix
2019-04-29 01:52:55 +02:00
iceman1001
2b561ad732
next
2019-04-29 01:51:00 +02:00
iceman1001
47fbb557b4
next
2019-04-29 01:39:40 +02:00
iceman1001
b254e70160
next
2019-04-29 01:32:45 +02:00
Philippe Teuwen
5e8fc73527
Debug hexdumps of comm
2019-04-29 01:20:03 +02:00
iceman1001
805b679b2f
fxing
2019-04-28 23:58:51 +02:00
iceman1001
a6ee9ef3e7
Merge branch 'experimental_varlen' of https://github.com/RfidResearchGroup/proxmark3 into experimental_varlen
...
# Conflicts:
# client/scripts/ndef_dump.lua
2019-04-28 23:57:31 +02:00
iceman1001
9d512d411c
chg: added manufacturer to 14ainfo structure.
...
chg: ndefdump remakes
2019-04-28 23:43:55 +02:00
Philippe Teuwen
69f8d81f4e
style
2019-04-28 22:54:00 +02:00
Philippe Teuwen
f1deb865db
Merge branch 'master' into experimental_varlen
...
* master:
ltrim cmd before display
hf mf eload: fix absence of filename
detect wrong numOfBlocks / numOfSectors arguments
safeFile*: accept when suffix is already provided
loadFile*: accept when suffix is already provided
textual, to reflect which repo.
LoadEML: don't complain on the last \n
2019-04-28 22:53:12 +02:00
Philippe Teuwen
5bc9118a19
baudrate only for physical uart
2019-04-28 22:51:40 +02:00
Philippe Teuwen
281cdead26
ltrim cmd before display
2019-04-28 22:38:44 +02:00
Philippe Teuwen
334e6d208b
hf mf eload: fix absence of filename
2019-04-28 22:16:50 +02:00
Philippe Teuwen
997f5d700e
detect wrong numOfBlocks / numOfSectors arguments
2019-04-28 21:34:05 +02:00
iceman1001
cf0d17853e
next
2019-04-28 21:29:47 +02:00
Philippe Teuwen
1dbcb712c3
safeFile*: accept when suffix is already provided
2019-04-28 20:42:57 +02:00
iceman1001
f4f8636b86
more converting scripts
2019-04-28 19:51:25 +02:00
iceman1001
79bfe892d6
next
2019-04-28 19:45:00 +02:00
iceman1001
25dd7c9a1c
spelling
2019-04-28 19:39:09 +02:00
iceman1001
02c2ea5a15
chg: next batch of scripts
2019-04-28 19:26:26 +02:00
Philippe Teuwen
405f24522e
loadFile*: accept when suffix is already provided
2019-04-28 19:21:04 +02:00
iceman1001
819896acf6
first batch of updated scripts to use sendMIX commands instead.
2019-04-28 18:46:06 +02:00
Philippe Teuwen
c6172b4d9c
LoadEML: don't complain on the last \n
2019-04-28 16:47:50 +02:00
iceman1001
195887487b
fixes to commands.lua to support MIX/NG
2019-04-28 16:35:30 +02:00
iceman1001
292462fb74
fixes to sendMIX/SendNG
2019-04-28 16:31:49 +02:00
iceman1001
cc5b63823b
chg: better sending
2019-04-28 12:52:25 +02:00
iceman1001
9779868753
style
2019-04-28 11:09:46 +02:00
iceman1001
abf93f4f2c
Merge branch 'experimental_varlen' of https://github.com/RfidResearchGroup/proxmark3 into experimental_varlen
2019-04-28 11:05:51 +02:00
iceman1001
c13f9e7a0f
add: SendCommandMIX, SendCommandOLD support in LUA
2019-04-28 11:05:23 +02:00
Philippe Teuwen
fbec3f3125
Merge branch 'master' into experimental_varlen
...
* master:
fix segfault
rework shell scripts for easy client or flasher
Stop poking Internet when compiling
doc multiple commands with -c
Add support for: proxmark3 -c "hw ping;hw version;hw ping"
update.sh flash boot only if option -b
2019-04-27 16:55:28 +02:00
Philippe Teuwen
8ebc44ee81
fix segfault
2019-04-27 16:52:23 +02:00
iceman1001
c5c364d994
fix: compilation on mingw
2019-04-27 11:57:11 +02:00
iceman1001
238eda8b17
chg: 'hw detectreader' cleanup
2019-04-27 11:07:59 +02:00
Philippe Teuwen
e2e0b704c5
Several changes in the initial connection, see details:
...
* TestProxmark uses pingng
* New command CMD_CAPABILITIES to transmit capabilities from pm3 to host
* Use TestProxmark to retrieve capabilities with that new command
* CloseProxmark if TestProxmark fails
* Hide baudrate for USB and retrieve real baudrate from pm3 for BT
2019-04-27 02:46:20 +02:00
Philippe Teuwen
7d1161d7d8
First packet is in TestProxmark, not pm3_version
2019-04-27 01:16:43 +02:00
Philippe Teuwen
12937884f6
move uart_speed to conn struct and display baudrate only for real UART
2019-04-27 01:15:52 +02:00
Philippe Teuwen
200290bc56
doc multiple commands with -c
2019-04-27 00:33:14 +02:00
Philippe Teuwen
d3cc0bb71c
Add support for: proxmark3 -c "hw ping;hw version;hw ping"
2019-04-27 00:31:05 +02:00
Philippe Teuwen
e9bfc3eb7a
Merge branch 'master' into experimental_varlen
...
* master:
rename usb_present
TestProxmark only if OpenProxmark returned pm3 present
Trying original SPI mode for 24MHz flash mem
text
2019-04-26 23:30:30 +02:00
Philippe Teuwen
897632a717
rename usb_present
2019-04-26 23:30:03 +02:00
Philippe Teuwen
4a576efc44
TestProxmark only if OpenProxmark returned pm3 present
2019-04-26 23:26:51 +02:00
Philippe Teuwen
3b6a249646
move global connection flags to cnn struct
2019-04-26 23:16:24 +02:00