Martin Holst Swende
665775c844
Some documentation and formatting to LogTraceHitag
2015-02-07 21:05:14 +01:00
Martin Holst Swende
aabb719dc4
Moved LogTraceHitag to BigBuf (no changes to the function ... yet)
2015-02-07 20:55:17 +01:00
Martin Holst Swende
3000dc4e7e
Generic tracing; removed iso14a_XX-functions, removed traceLen as global varible
2015-02-07 20:49:40 +01: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
Martin Holst Swende
bb42a03ef1
Fix #1 for pm3 iclass simulation, remove erroneous extra bit after transmission
2015-02-05 19:40:47 +01:00
Martin Holst Swende
0644d5e3a3
Merged with master
2015-01-31 18:21:38 +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
Martin Holst Swende
b3cc5f2987
Reverted erroneous commit from bigbuf-rework
2015-01-29 19:58:46 +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
marshmellow42
0892b968ce
fix hid prox standalone bug
...
Fixed standalone bug by re-making the function return the hi and lo
values. (used only by samyrun function in appmain.c)
2015-01-28 12:55:04 -05:00
marshmellow42
08ebca682c
lf hid fskdemod bug
...
re-introduced in last bigbuf changes
2015-01-28 11:45:31 -05: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
pwpiwi
117d9ec25c
Refactoring of BigBuf handling in order to prepare for more efficient memory allocation and longer traces.
2015-01-27 22:25:55 +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
16b75f27c3
Minor tweaks to iso14443b snoop tracing
2015-01-27 16:34:11 +01:00
Martin Holst Swende
03dc174036
Minor refactoring
2015-01-27 09:06:01 +01:00
marshmellow42
9c0f13d5dd
Merge remote-tracking branch 'upstream/master'
2015-01-26 17:07:49 -05:00
Martin Holst Swende
aeadbdb216
Generic tracing: Some fixes in iso14443b snooping, to how DMA access is performed, sizes and buffers.
2015-01-26 22:10:05 +01:00
Martin Holst Swende
7c676e7269
Some documentation
2015-01-26 21:15:28 +01:00
Martin Holst Swende
7242efa07c
bugfix
2015-01-22 23:04:59 +01:00
Martin Holst Swende
cb366e9dbd
Added a lf acquisition-mode which can do decimation and quantization, in order to be able to record longer transactions
2015-01-22 23:01:29 +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
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
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
Martin Holst Swende
355c8b4a7d
Generic trace pt2: made iso14443b use standard trace format
2015-01-18 20:23:58 +01:00
Martin Holst Swende
80fe723570
Generic trace pt1: Moved arm-side trace functionality into util-package
2015-01-18 20:21:53 +01:00
Martin Holst Swende
f164662363
Merge branch 'master' of https://github.com/iceman1001/ForPm3
...
Conflicts:
armsrc/appmain.c
armsrc/apps.h
2015-01-15 21:50:03 +01:00
Martin Holst Swende
758f1fd1f3
Fixed issue #43 on github
2015-01-15 16:07:58 +01:00
Martin Holst Swende
6b038d192a
Minor dox
2015-01-15 15:45:54 +01:00
Martin Holst Swende
1eb874ee3f
Merge branch 'master' of github.com:Proxmark/proxmark3
2015-01-15 15:45:15 +01:00
Martin Holst Swende
7b941c8d7f
Fixed memory corruption after reader-attack in armsrc, fixed annoying LED
2015-01-15 15:27:44 +01:00
Martin Holst Swende
645c960f61
Implemented new FPGA mode for iclass tag simulation. Reduces arm-side size of transfer/memory by a factor of 8. Makes for easier arm-side encoding of messages, for when we start needing to do that on the fly instead of using precalculated messages
2015-01-15 15:16:34 +01:00
iceman1001
a631936e84
ADD: Midnitesnaks's & Pentura labs Ultralight-c modifications in ARMSRC.
...
ADD: des.c , aes.c in ARMSRC
2015-01-13 23:18:04 +01:00
Martin Holst Swende
55eaed8f2a
Documentation to apps.h, documentation/renaming to iclass
2015-01-12 22:08:57 +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
marshmellow42
ba1a299ce6
code cleanup. re-added psk commands.
...
also fixed a bug in detect clock functions.
sync with master prep for pull request
2015-01-07 18:14:27 -05:00
marshmellow42
c07b79fcbf
sync with master lf files to resolve conflicts
2015-01-07 18:13:27 -05:00
marshmellow42
4118b74dc8
added data psk* cmds for pskdemod
...
fixed a couple small bugs in other lf functions as well including
detectaskclock, stopped changes from being made to graphbuffer.
2015-01-07 18:13:26 -05:00
iceman1001
787b5bd8a4
CHG: minor code clean up in ArmSrc.
...
ADD: added some more default keys in Hf mf nested, maybe it runs faster :)
2015-01-08 00:08:33 +01:00
iceman1001
024b97c507
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
client/cmdhf.c
2015-01-07 22:55:26 +01:00
iceman1001
d91a31f935
CHG: minor code clean up.
...
ADD: tunesamples in cmddata.c pullrequest #33 , was removed by Marshmellows other commits. I returned it.
2015-01-07 21:29:38 +01:00
iceman1001
52ab55ab0d
ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list.
...
ADD: added a manufacturer list in "hf 14a reader", only viable when UID is double or triple size. Thanks to Asper for the list.
ADD: detect chinese magic backdoor commands in "hf 14a reader"
CHG: minor code clean up.
2015-01-07 21:06:15 +01:00
iceman1001
4888b28195
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-01-07 11:09:05 +01:00
Martin Holst Swende
cb29e00a12
Save iclass dumps to file, like mifare-dump functionality works
2015-01-07 09:57:18 +01:00
iceman1001
9484ff3d6e
ADD: tnp3xxx identification in luascripts.
...
CHG: minor code clean up.
2015-01-06 21:20:41 +01:00
iceman1001
3fe4ff4f03
CHG: generic code clean up. Removal of commented code.
...
CHG: USB_CMD_DATA_SIZE is now used as maxsize for transfer of data between client and pm3device
CHG: suggested a fix for the underscore problem in ioclass\fileutils.c
ADD: tnp3xx support
ADD: nxp tag idents.
ADD: identifiction of chinese backdoor commands to hf 14a reader.
2015-01-05 15:51:27 +01:00
Martin Holst Swende
39d3ce5dd6
Moved iclass crc to be based on a lookup table
2015-01-04 22:10:25 +01:00
