marshmellow42
f75b313b00
fix stt mark location bug
...
add `data mtrim` to do a middle trim of the graph.
2017-02-28 17:28:51 -05:00
marshmellow42
ab812dfae5
implement marking the second STT when detected
...
on the graph window
2017-02-28 16:35:01 -05:00
marshmellow42
f9f0e83b7c
Add 2 pre-setable markers for the graph
2017-02-28 15:53:33 -05:00
marshmellow42
b1ee7eed65
fix em410x XL bug
...
and make it rule out more false positives.
2017-02-28 13:32:23 -05:00
marshmellow42
62a38cc883
adjust em4x05/em4x69 command timings to...
...
better conform to datasheet.
2017-02-28 13:18:52 -05:00
marshmellow42
dda5a928f0
fix STT bug for strong waves (or cleaned ones)
2017-02-28 11:53:55 -05:00
marshmellow42
40c6a02bc9
Add a retry loop to hf mf dump
...
helps get the data dumped even if positioning isn't 100% perfect.
also switched em4x05 commands to WaitUS instead of SpinDelayUs, per
@pwpiwi 's suggestion.
2017-02-28 11:09:42 -05:00
marshmellow42
fac69c3d76
Adjust global variable name
2017-02-27 23:03:55 -05:00
marshmellow42
2b11c7c750
adjust timeouts on lf read/lf search to no timeout if threshold was set.
...
NOTE: lf snoop already doesn't have a timeout...
also adjusted PRIx64 to SCNx64 in em410xwrite
2017-02-26 21:44:40 -05:00
marshmellow42
c85189135e
the timeout on lf read makes the threshold ...
...
option not work as expected.. need to find a more robust option...
+ added iceman's lf_em410x_sim help text..
2017-02-24 01:02:25 -05:00
Jeff Morsch
e88c04f924
Merge remote-tracking branch 'upstream/master'
2017-02-24 00:45:57 -05:00
marshmellow42
4913be92ac
Merge remote-tracking branch 'upstream/master'
...
Merge Head
2017-02-23 14:08:41 -05:00
marshmellow42
e88096ba25
cleanup
...
combine preamble searches (thanks @iceman1001)
simplify Em410xDecode
fix bug in removeParity (I made recently)
move Unique TAG ID printout to avoid confusion
2017-02-23 13:53:40 -05:00
pwpiwi
4197a3f6ff
Make LUA scripting work even if proxmark3 is called from arbitrary working directory
...
- add @gpakosz whereami library (https://github.com/gpakosz/whereami ) in order to ...
- determine and set absolute paths for LUA scripts and LUA libraries
2017-02-23 18:37:34 +01:00
pwpiwi
4c16ae80f0
Code cleanup:
...
- correctly using stdtypes.h printf and scanf format string macros (PRIx64 et al)
- coverity fixes to client/cmdhfmf.c
- fix linker warning re missing entry point when linking fullimage.elf
2017-02-23 18:29:03 +01:00
pwpiwi
43534cbad2
Code cleanup:
...
- correctly use inttypes.h scanf and printf macros (PRIx64 et al)
- fix indendation warnings
2017-02-22 22:45:00 +01:00
pwpiwi
2d0717853d
Merge pull request #216 from marshmellow42/master
...
EM4x05/EM4x69 command rewrite and improvements
2017-02-22 17:38:56 +01:00
marshmellow42
33a1fe9636
small text adjustments plus...
...
small improvement to fsk clock detect + fixed a bug where it would
default to rf/16 when it couldn't find a valid one...
2017-02-22 10:41:40 -05:00
marshmellow42
34ff898553
fix false positive psk demod with fsk wave
...
also break out new find start of modulation routine.
2017-02-21 23:00:43 -05:00
marshmellow42
b7fc61f0c9
update changelog
2017-02-21 16:57:32 -05:00
Iceman
bc1c9c5588
Merge pull request #215 from AdamLaurie/master
...
buspirate config for debricking.
2017-02-21 19:53:52 +01:00
Adam Laurie
a386043fa9
buspirate config for debricking
2017-02-21 17:53:56 +00:00
marshmellow42
73a2a84f75
simplified lf em command structure
...
WARNING changes command calling!
2017-02-21 12:00:09 -05:00
marshmellow42
d0b0586411
cleanup cmdlfem4x.h - add chip detection to ...
...
... lf search
2017-02-21 11:46:13 -05:00
marshmellow42
0a85edf471
add em4x05 config printout
2017-02-21 11:06:19 -05:00
marshmellow42
a37228c8c2
shorten em4x05 capture samples
...
add cap option for 4469
add sample size option for DoAcquisition so i can limit how many
samples i want to collect.
use with DoPartialAcquisition
2017-02-20 17:39:39 -05:00
marshmellow42
893534d3b5
speed up the em4x05 cmds by only getting 6k...
...
samples back
2017-02-20 15:06:22 -05:00
Iceman
086583f6d1
Merge pull request #214 from jamchamb/fix-hf-reader
...
Fix recvLen variable name in hf_reader
2017-02-20 21:05:35 +01:00
James Chambers
4b12061bee
fix recvLen variable name in hf_reader
2017-02-20 14:31:21 -05:00
marshmellow42
fa1e00cfbb
add em4x05 info command
...
plus some minor adjustments
and added a quick em4x05 test:
bool EM4x05Block0Test(uint32_t *wordData)
if successful very likely the tag is an em4x05 or compatible...
2017-02-20 09:50:00 -05:00
marshmellow42
34212c662c
fix dump output
2017-02-19 21:31:46 -05:00
marshmellow42
4c6ccc2b04
a little cleanup
2017-02-19 20:47:45 -05:00
marshmellow42
61500621bc
@iceman1001 s idea to output failure report
2017-02-17 14:48:19 -05:00
marshmellow42
6980d66b05
add psk to em4x05 reads and tweak psk demod
2017-02-17 14:40:40 -05:00
marshmellow42
c85858f524
minor fixes for FSK demod
...
works better with EM4x03 and t55x7 tags (in theory)...
2017-02-17 12:59:35 -05:00
marshmellow42
e39a92bb1d
em4x05 getting better
...
got the read/dump cmds working pretty well
some tweaking still left to do.
2017-02-17 01:33:27 -05:00
marshmellow42
2d99d9912c
a couple em4x05 fixes.
2017-02-16 13:57:14 -05:00
marshmellow42
59f726c989
EM4x05/EM4x69 continued + a couple of icemans utils.
2017-02-15 23:27:15 -05:00
marshmellow42
6f1a597855
couple q5 fixes + continue with em4x05 em4x69..
...
.. readword demods
(not tested) still a work in progress
2017-02-14 23:42:55 -05:00
marshmellow42
7666f4608e
update em4x05/em4x69 cmds
...
@iceman1001 s updates + some of my own.
still more to do:
-auto demod responses
-figure out config block
-figure out block 0 info / serial # in block 1
-figure out block 3 protection data
-add dump all blocks cmd
2017-02-12 23:59:44 -05:00
pwpiwi
3e50af4ee4
Merge pull request #211 from marshmellow42/master
...
Add Flag for compile warnings, lf cotag read by iceman
2017-02-08 21:49:26 +01:00
marshmellow42
f1e6629b11
update changelog
2017-02-04 16:10:26 -05:00
marshmellow42
e04475c421
Add @Iceman1001 s cotag read
...
also needed to include some of icemans timer additions.
2017-02-03 00:14:34 -05:00
marshmellow42
38cb7c71c5
add check for no wave in graphbuffer prior to...
...
hitag lf search check
2017-02-01 15:39:10 -05:00
marshmellow42
11117f6ab5
Merge remote-tracking branch 'upstream/master'
2017-01-30 23:20:55 -05:00
marshmellow42
103c60ec7e
flag needed for some compile environments
...
used for 'z' and 'l' in printf commands.
2017-01-30 23:13:22 -05:00
pwpiwi
1888664863
Merge pull request #209 from micolous/14a-random-nonce
...
Adds random nonce (r) option to `hf mf sim`.
2017-01-28 17:11:13 +01:00
Michael Farrell
5b5489baf4
hf mf sim: Multiple fixes from review of PR #209 .
...
- Don't increment the nonce when random mode is disabled (this breaks the
standard attack).
- Don't attempt the standard attack when random mode is enabled (there's no
point as it won't work, per comments from @pwpiwi).
- Attempt the moebius attack if the standard attack fails.
2017-01-26 20:30:13 +11:00
pwpiwi
c783fd1bb8
Merge pull request #208 from marshmellow42/master
...
bug fixes - LF rawdemod am and ST
2017-01-26 09:10:38 +01:00
Michael Farrell
f9c1dcd9f6
Adds random nonce (r) option to hf mf sim
.
...
This makes the PM3 generate pseudo-random nonces rather than sequential
nonces, to make it act a bit more like a "real" MFC card. A reader would
otherwise be able to detect the PM3 probing based on the predictable nonces
and throw different authentication challenges (or refuse to authenticate at
all).
The code includes an implementation of a rand-like function (prand), similar
to the one from libc, which is seeded automatically based on the time it
takes between the PM3 starting up and the first call to the RNG.
This isn't cryptographically random, but should be "good enough" to be able
to evade basic detection.
2017-01-26 18:32:25 +11:00