marshmellow42
40148ab609
Merge remote-tracking branch 'upstream/master'
2015-02-19 21:38:17 -05:00
marshmellow42
abd6112fc4
Revert "Revert "lf simask, lf simfsk and bug fixes""
...
This reverts commit e396001c47
.
2015-02-19 21:35:34 -05:00
marshmellow42
e396001c47
Revert "lf simask, lf simfsk and bug fixes"
...
This reverts commit fb0c84c3df
.
2015-02-19 21:22:05 -05:00
marshmellow42
fb0c84c3df
lf simask, lf simfsk and bug fixes
2015-02-19 21:21:11 -05:00
Martin Holst Swende
0387cd3393
Merge pull request #68 from iceman1001/feature
...
ADD: identifications.
2015-02-19 10:51:10 +01:00
Martin Holst Swende
181e6db6a9
Merge pull request #67 from marshmellow42/master
...
Small help and command description updates
2015-02-19 10:50:51 +01:00
Martin Holst Swende
1defcf606f
More work on iclass full simulation, and some work on iclass tag dump parsing
2015-02-19 10:48:33 +01:00
Martin Holst Swende
b67f7ec359
Further implementation of iclass 'fullsim'. Moved protocol definitions to shared file. Had to add some loclass-function to arm-side to support authentication in fullsim mode
2015-02-18 20:02:44 +01:00
Martin Holst Swende
9a9bcea82b
Iclass decrypt error, shouldn't have decrypted block 6 according to Heart of darkness-paper
2015-02-17 23:17:43 +01:00
Martin Holst Swende
41524d8a39
Implemented 'hf iclass decrypt <tagdump>'. This performs the 3des decryption of iclass tag dumps, but requires the decryption file to be present on the filesystem
2015-02-17 22:07:40 +01:00
iceman1001
0853ffa29c
ADD: added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's
2015-02-16 19:06:24 +01:00
iceman1001
33315928fb
CHG: added some more token-tags.
2015-02-16 19:05:59 +01:00
marshmellow42
8db0534ed1
Merge remote-tracking branch 'upstream/master'
2015-02-14 21:16:27 -05:00
marshmellow42
cc2ea5ed82
Clean up Helps and command descriptions
2015-02-14 21:15:13 -05:00
Martin Holst Swende
a4749080d9
Removed un-implemented 'hf iclass write', it's confusing to have there since there's no actual support for this on the device side
2015-02-14 21:18:39 +01:00
Martin Holst Swende
534445139c
Reformatted
2015-02-14 21:17:08 +01:00
Martin Holst Swende
7781a65656
Started work on 'hf iclass eload' - only client side so far, not yet supported in the device
2015-02-14 21:15:53 +01:00
Martin Holst Swende
428d622160
Fixed bug with iclass dump which prevented saving to file
2015-02-14 20:42:23 +01:00
marshmellow42
abd16c456a
fix help on data rawdemod commands
2015-02-13 21:17:15 -05:00
Martin Holst Swende
2e2fc9fa6b
Merge branch 'master' of github.com:Proxmark/proxmark3
2015-02-13 19:59:50 +01:00
Martin Holst Swende
699bb9dc27
Removed some dev- printouts
2015-02-13 19:59:28 +01:00
Martin Holst Swende
17c60b1248
Merge pull request #63 from marshmellow42/master
...
lf data combine rawdemods & depreciate cmds
2015-02-13 10:11:40 +01:00
Martin Holst Swende
37735250ca
Merge pull request #66 from iceman1001/feature
...
ADD: identification of EM4233
2015-02-13 10:11:09 +01:00
Martin Holst Swende
8b9393d3bd
fixed issue #65
2015-02-12 08:21:58 +01:00
pwpiwi
19a700a8b5
hf 14a: if the tag supports it, set default timeout according to ATS
...
hf epa: remove explicit but arbitrary timeout settings
Bugfix: don't timeout when frame transmission has already started
2015-02-11 22:20:22 +01:00
iceman1001
070e36d421
ADD: identification of EM4233
2015-02-11 17:14:26 +01:00
Martin Holst Swende
61972abbdd
Merge branch 'master' into GenericTracing
...
Conflicts:
armsrc/iso14443a.c
2015-02-10 21:25:14 +01:00
Jesse Hallio
3bba7deac0
Add settable ATQA and SAK to hf mf csetuid command.
2015-02-10 04:31:53 +02:00
marshmellow42
7e72f90a7f
Merge remote-tracking branch 'upstream/master'
2015-02-09 16:47:24 -05:00
pwpiwi
0d0d049967
hw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning graph only when LF antenna is connected.
2015-02-09 22:36:53 +01:00
marshmellow42
19ff0210fa
lf data combine rawdemods & depreciate cmds
...
new:
data rawdemod
replaces:
data askmandemod
data askrawdemod
data fskrawdemod
data nrzrawdemod
data psk1rawdemod
data psk2rawdemod
also commented out of the CommandTable but did not remove the commands:
data askdemod
data bitstream
data fskdemod
data mandemod
data threshold
2015-02-09 16:25:12 -05:00
marshmellow42
f3bf15e484
lf/data combined detectclock functions to one
...
cleaned up detect clock functions - now uses one main function that
takes a char argument to select which modulation to detect the clock for
REMOVED commands: pskdetectclock, nrzdetectclock, fskfcdetect.
renamed DetectClock function to DetectAskClock to be more descriptive.
2015-02-09 11:11:04 -05:00
marshmellow42
b4fb11ba92
fix inconsistent spacing within functions
...
did not convert spaces to tabs but made the functions consistent with
what it used so it can be auto converted.
(sorry for the annoying space/tab usage in the past.)
we can convert all to tabs later.
2015-02-08 00:48:00 -05:00
marshmellow42
be2cf126bf
Merge remote-tracking branch 'upstream/master'
2015-02-06 14:45:46 -05:00
marshmellow42
6de4350803
data askraw patches, data askedgedetect demod,
...
data askraw patches - added amp option (for stubborn waves)
NEW data askedgedetect demod for manual demod,
adjusted detectclock (ask clock) in case of cleaned (edgedetect) waves
finish maxErr args
finish psk detect
2015-02-06 14:36:25 -05:00
Martin Holst Swende
7d5ebac993
Merge branch 'master' into GenericTracing
...
Conflicts:
armsrc/iso14443.c
armsrc/iso14443a.c
client/cmdhf.c
client/cmdhf14b.c
2015-02-06 08:41:02 +01:00
marshmellow42
e770c64824
lf psk/nrz split, add maxErr argument
...
changed psk to use wave lengths instead of peaks
split out NRZ from psk demod
added maxErr argument to raw demods (except fsk)
2015-02-05 17:01:18 -05:00
Martin Holst Swende
146c201cbe
Merge pull request #55 from jessegit/master
...
Add flasher from SVN r623 for HID bootprom and current Mac OS X kext
2015-02-05 19:43:46 +01:00
Martin Holst Swende
b37235637f
Merge pull request #57 from iceman1001/feature
...
FIX: LF TI WRITE inparameters didn't get copied by sscanf.
2015-02-05 19:43:26 +01:00
iceman1001
5c2b11eb3c
FIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64" and uses the 012"llx" instead.
2015-02-05 15:46:23 +01:00
iceman1001
a6cfa75035
add: lots of new toytypes in default_toys.lua
...
fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua)
add: showing bytes for trap-types in tnp3dump.lua
2015-02-04 11:49:21 +01:00
Jesse Hallio
e9281ae812
Add flasher from SVN r623 for HID bootprom and current Mac OS X kext
2015-02-03 23:22:39 +02:00
Martin Holst Swende
1f78a4d305
Merge pull request #54 from Proxmark/lf_recorder
...
LF: Ability to do longer traces/snoops
2015-02-02 19:54:07 +01:00
Martin Holst Swende
0644d5e3a3
Merged with master
2015-01-31 18:21:38 +01:00
Martin Holst Swende
c856ceae8a
Fixed undecimation command
2015-01-31 12:42:40 +01:00
Martin Holst Swende
698b649e0e
Added undec to un-decimate data on the client side, so we can use all those sweet demodders even if the data has been decimated on the ARM side
2015-01-31 00:05:04 +01:00
Martin Holst Swende
31abe49fd3
Some more fixes to longer lf recordings. Now also supports longer snoops, and an additional command 'lf config' has been defined, instead of having to specify all params for every call
2015-01-30 23:03:44 +01:00
Iceman
0c5998c051
Update cmddata.c
...
as suggested, a bitwise bounds check in cmddata.
2015-01-30 15:17:07 +01:00
iceman1001
33c7e2f3bc
wrong letter in variable name
...
Conflicts:
client/cmddata.c
2015-01-29 22:35:19 +01:00
Martin Holst Swende
92623113b4
Minor documentation on 'hf list'
2015-01-29 20:01:30 +01:00
Martin Holst Swende
f6d9fb173f
Added client-side support for recording longer samples, fixed last (?) issues on device-side
2015-01-29 00:57:22 +01:00
pwpiwi
f71f4deb8f
BigBuf and tracing rework: allow much longer traces in in hf commands
...
- provided a BigBuf_malloc() function to dynamically allocate parts of BigBuf
e.g. for DMA-Buffers, Frame-Buffers, Emulator-Memory
- the whole rest of BigBuf is now available for traces (instead of a small fixed amount)
- send actual traceLen together with trace data
- changed client side to cope with varying traceLen
- changed small buffers to automatic variables instead of parts of BigBuf
2015-01-28 07:18:51 +01:00
Martin Holst Swende
936e0729f9
Merge pull request #49 from marshmellow42/master
...
LF Demod Bug Fix & new traces
2015-01-27 22:14:39 +01:00
Martin Holst Swende
383608a63a
Minor fixes to iso14443a annotations
2015-01-27 21:55:08 +01:00
marshmellow42
a1d17964a2
lf demod bug fix & refactor
...
fixed bug in lfops.c in hid fskdemod
refactored data fskXXXDemods for specific tags to use more common code.
2015-01-27 14:51:12 -05:00
Martin Holst Swende
08e8317c21
More annotations to iso14443b protocol listings
2015-01-27 16:34:45 +01:00
marshmellow42
8c65b650e8
clean up some comments
2015-01-26 17:49:30 -05:00
marshmellow42
04d2721b3c
lf psk demods
...
clarify existing as psk1
added psk2 demod
2015-01-26 17:23:19 -05:00
marshmellow42
9c0f13d5dd
Merge remote-tracking branch 'upstream/master'
2015-01-26 17:07:49 -05:00
Martin Holst Swende
dca558bf9e
Removed last trace of crypto from makefile
2015-01-26 20:56:33 +01:00
Martin Holst Swende
e629181f5a
Fixed issue where -1 size_t was returned
2015-01-22 21:04:16 +01:00
Martin Holst Swende
afceaf4018
Removed openssl from the mfu-stuff
2015-01-22 21:02:21 +01:00
marshmellow42
03e6bb4aed
lf FSK demod tools/fixes
...
added full ability to detect FSK clocks
applied autodetect of fsk clock to data fskrawdemod
this finished data fskfcdetect (now detects field clocks and bit clock)
2015-01-22 14:24:03 -05:00
Martin Holst Swende
388c92bde5
Generic tracing pt.4: Deprecated old 'hf 14b list' command
2015-01-22 00:19:20 +01:00
Martin Holst Swende
c54d1394c6
Fixed compiler error
2015-01-22 00:10:09 +01:00
Martin Holst Swende
9e8255d4e9
Generic tracing pt.3 : reworking how iso14443b-traces are stored in ARM-memory
2015-01-21 23:53:40 +01:00
iceman1001
df3e429d71
minor fix for a help in "hf 14a snoop"
2015-01-21 21:24:37 +01:00
marshmellow42
ec75f5c10a
lf Bug Fixes and lf demod additions
...
added data fskparadoxdemod
added data setdebugmode (for demods)
added data shiftgraphzero (to help clean weak reads)
fixed a few bugs with the data detectaskclock
added data fskfcdetect to detect FSK clocks
adjusted most of my demods to put raw tag binary to demod buffer for
future sim and clone commands (psk still needs work)
2015-01-20 17:28:51 -05:00
iceman1001
a1557c4c2f
Minor fixes: Array inits, some array bounds checks.
...
ADD: some extra help text for lf snoop
ADD: HasGraphData - function in graph.c
ADD: DetectHighLowInGraph - function in graph.c
2015-01-20 22:14:56 +01:00
iceman1001
e469159145
FIX: another file_path found in loadTraceCard and saveTraceCard, is now corrected to follow FILE_PATH_SIZE variable.
...
FIX: some filehandles that didn't get closed.
2015-01-20 21:58:53 +01:00
iceman1001
80b1b53fa3
SUGGESTED FIX:
...
Issue: https://github.com/Proxmark/proxmark3/issues/35
Forum: http://www.proxmark.org/forum/viewtopic.php?pid=7883#p7883
Where "hf mf csetuid" empties the rest of the block0 bytes.
This fix loads the old block0 and replaces the uid+sak+ataq bytes only.
2015-01-20 21:55:19 +01:00
iceman1001
fe5b3a4424
FIX: The 14b write command (CmdHF14BWrite) now turns off antenna after call.
2015-01-20 21:50:49 +01:00
iceman1001
e3c235654f
Minor fixes to some help-texts.
2015-01-20 21:48:39 +01:00
iceman1001
81740aa519
STEP 3 - the actual new files for Ultralight.
...
ADD: script remagic.lua -- a script to make a "dead" Mifare s50 generation 1 alive again.
ADD: tracetest.lua - This script will load several traces files in ../traces/ folder and do
"data load"
"lf search"
ADD: test_t55x7_psk.lua - iterates thru a lot of calls to check the new psk demods.
all new scripts implements the "-h" for help text.
2015-01-20 21:29:55 +01:00
iceman1001
5ee701292f
Step 2 - Ultralight / Ultralight-C
...
With this the Pentura Labs / Midnitsnakes's original ultralight / ultralight-c implementation is enhanced and move to its own file. cmdhfmfu.c
2015-01-20 21:23:04 +01:00
iceman1001
c8b6da2295
Merge branch 'master' of https://github.com/holiman/proxmark3
...
Conflicts:
armsrc/appmain.c
armsrc/apps.h
Step 1 for the Ultralight / Ultralight-c
2015-01-20 20:59:24 +01:00
iceman1001
5149e37e66
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/appmain.c
armsrc/apps.h
2015-01-20 09:32:53 +01:00
marshmellow42
53d85a8fa1
Merge remote-tracking branch 'upstream/master'
2015-01-18 18:19:26 -05:00
marshmellow42
1e090a61a1
lf demod additions
...
data fskfcdetect (field clock and bit clock detect for FSK)
data fskdemodawid -AWID demod/decode
data fskdemodpyramid - AWID demod/decode
2015-01-18 18:13:32 -05:00
Martin Holst Swende
b689b842b6
Bugfix 'hf list 14b' and 'hf list raw'
2015-01-16 22:48:30 +01:00
Martin Holst Swende
41fdd0f061
First stab at adding 'hf list 14b' and 'hf list raw'
2015-01-16 22:41:19 +01:00
Martin Holst Swende
55c7e3520f
Merge branch 'master' of github.com:Proxmark/proxmark3
2015-01-16 15:49:11 +01:00
Martin Holst Swende
49726b4088
Improved 'hf list iclass' a bit, better understanding of the protocol and when to apply CRC checks
2015-01-15 23:00:39 +01:00
Martin Holst Swende
5c72368e2d
Merge pull request #44 from marshmellow42/master
...
small lf demod bug fixes and threshold adjustments
2015-01-15 21:53:18 +01:00
Martin Holst Swende
d60418a05f
Synchronized loclass library, imported the legal warning
2015-01-15 16:30:05 +01:00
marshmellow42
84871873a4
Small lf bug fixes and threshold adjustments
...
adjusted lf demod thresholds based on additional testing
fixed bug in hid bit length calc in cmddata.c
fixed bugs in lf search
2015-01-13 17:21:36 -05:00
marshmellow42
ae6ead3dc8
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
client/cmdlf.c
2015-01-13 16:02:23 -05:00
Martin Holst Swende
896473399b
Actually add the FILES also, doh
2015-01-12 22:16:46 +01:00
Martin Holst Swende
1f6417a9b2
Removed dependency on openssl, added AES implementation from polarssl instead
2015-01-12 21:47:36 +01:00
Martin Holst Swende
68033ed776
Fixed error when no match is found for uidmapping
2015-01-11 21:49:13 +01:00
marshmellow42
ac3ba7ee69
lf search use new psk, small demod adjustments
...
adjust thresholds for ask, fsk, io, psk based on more sample testing
adjust indala decode to set clock to 32 if no input (autodetect not
always correct)
2015-01-09 16:46:17 -05:00
Martin Holst Swende
473124be92
removed double include
2015-01-09 21:51:34 +01:00
Martin Holst Swende
f44a01235c
Merge branch 'master' of https://github.com/iceman1001/ForPm3
2015-01-09 21:50:36 +01:00
iceman1001
952a8bb59b
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/lfops.c
client/cmddata.c
client/graph.c
2015-01-08 22:23:45 +01:00
Martin Holst Swende
31d1caa526
Reverted some minor things, altered other things to get it to compile cleanly
2015-01-08 17:51:52 +01:00
iceman1001
03d7b60f2b
ADD: default_toys.lua a script which identify tnp3xx tags
2015-01-08 17:36:01 +01:00
marshmellow42
c12512e99a
minor code cleanup
2015-01-07 23:02:00 -05:00
marshmellow42
d6d20c5435
cmddata.c changes by others - reapply
...
i overwrote some changes in cmdsamples. i fixed that
i also removed some comments in graph.c
2015-01-07 19:06:29 -05:00
marshmellow42
3179383f85
put cmdlf.c back (only changes spaces to tabs)
...
to make my pull request easier to weed through
i did not make any changes to cmdlf just de-spaced it - so i put it back
for now.
2015-01-07 18:45:47 -05:00
iceman1001
8e863ab641
FIX: forgot to add the function in the header file.
2015-01-08 00:20:22 +01:00