marshmellow42
4ac906d1c2
split output from rawdemod functions
...
now allows for non-verbose calling:
ASKmanDemod
ASKrawDemod
FSKrawDemod
PSKDemod
2015-02-21 00:27:48 -05:00
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
iceman1001
c3bfb9c76b
ADD: a CmdEM410xWatchnSpoof in cmdlfem4x.c , looks for a tag, then replays it.
...
minor code clean up.
2015-01-08 00:17:40 +01:00
marshmellow42
3aa4014baa
Fix Tune Samples (broken in commit 12/31 by me)
2015-01-07 18:14:28 -05: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
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
79bf1ad2cc
ADD: Jonor's timeout patch for "Hf 14a raw".
...
minor code clean up
2015-01-07 23:23:17 +01:00
iceman1001
b5be31f996
FIX: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault.
...
ADD: crc32.c functionality
2015-01-07 22:56:20 +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
b915fda392
FIX: a solution for the issue "hf mf esave - always saves 4K"
...
FIX: a solution for the issue "hf eload, esave, cload, save - filepath variable too short"
CHG: minor code clean up.
ADD: AES / CRC16 for lua. (and tnp3xx scripts.)
ADD: tnp3dump.lua script to dump tnp3xx tags.
ADD: tnp3sim.lua script to let PM3 imitate an tnp3xx tag. Needs to be tested live
2015-01-07 22:00:29 +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
Martin Holst Swende
4df54240c1
Added some more protocol support to the list annotation. Based on http://www.proxmark.org/forum/viewtopic.php?pid=13541#p13541
2015-01-07 21:14:32 +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
79544b28ad
CHG: minor code clean up
...
ADD: added some helper-functions in util.c
2015-01-07 20:52:03 +01:00
iceman1001
3af373f352
CHG: Added support for tnp3xx in lua scripts.
...
ADD: a save file function in lua.
2015-01-07 20:45:43 +01:00
iceman1001
002c1ce57a
CHG: removed leftover debugging statements proxmark3.c
...
CHG: hint from Marshmellow that the flag "-lcrypto" needs be also in CFLAGS.
2015-01-07 11:10:46 +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
6f101995b6
Added loclass-functionality into the pm3,the functionality provided by loclass can now be invoked directly from the pm3. Also fixed some issues with how prnlog called PrintAndLog, and added some testdata for the loclass self-tests
2015-01-05 09:16:06 +01:00
Martin Holst Swende
337818f7ab
Minor dox
2015-01-04 21:26:10 +01:00
Martin Holst Swende
4c3de57ad2
Reworked how 'hf 14a list' and 'hf iclass list' works, to use the same method. Now. use 'hf list 14a' and 'hf list iclass' instead. Plus, the output is now annotated (although the annotation-engine could use a bit more love from someone more familiar with the available commands
2015-01-04 21:22:54 +01:00
Martin Holst Swende
c8dd9b092e
Some work on iclass dump and iclass list, now the dumping is a lot more stable. I think the comms should be measured and tuned a bit more, right now it kind of works thanks to retry-functionality, but the retries are probably not needed if we are a bit more careful about timing, so we don't send commands too fast for the tag to handle
2015-01-04 14:53:26 +01:00
Martin Holst Swende
2e9d4b3ff4
Some work on iclass, started on some better support in 'hf iclass list' and also fixes to 'hf iclass reader' so it exits better when the button is pressed
2015-01-03 15:11:48 +01:00
marshmellow42
ac914e56db
minor adjustment to askmandemod for lf search
...
returns false if it finds data but not an EM410x format.
2014-12-31 14:55:58 -05:00
marshmellow42
9ec1416ad2
added data rtrim command
...
enter location to trim all samples after
2014-12-31 14:43:49 -05:00
marshmellow42
f822a063b3
lf demod code cleanup - added fskraw arguments
...
merged code and added arguments to data fskrawdemod to allow other fsk
mode demodulations (FSK2a = RF/10 & RF/8) another might be (RF/8 & RF/5)
2014-12-31 02:27:30 -05:00
marshmellow42
d5a72d2fee
LF demod/cmd code cleanup + new lf search
...
cleaned up and error proof code. plus added new command lf search
when online it will lf read - data samples 20000 - and test for EM410x,
HID, IO Prox, and indala cards. when offline it will test current
graphbuffer.
2014-12-30 16:08:33 -05:00
marshmellow42
6bfa18eab4
Merge pull request #1 from Proxmark/master
...
Test
2014-12-29 16:14:23 -05:00
marshmellow42
2df8c07907
minor setting adjustments/cleanup
...
clean up code
2014-12-29 15:58:59 -05:00
marshmellow42
66707a3b3c
LF Demod bug fixes and add lf em em410xdemod
...
fixed a few bugs in lf demod that the streamlining added. added new lf
em em410xdemod command that loops until button pressed. (similar to lf
hid fskdemod
2014-12-29 15:32:53 -05:00
marshmellow42
7db5f1ca25
slight adjustment to include
...
removed extra unneeded path
2014-12-28 21:29:33 -05:00
marshmellow42
eb191de615
LF Demod streamlining
...
one shared location for demoding lf for arm and client. also added a
few raw demod commands.
2014-12-28 20:33:32 -05:00
marshmellow42
9e6dd4eb69
rename askrawdemod to askmandemod
2014-12-24 13:01:09 -05:00
marshmellow42
0e74c023bd
Created new detectclock function + EM decode addons
...
new detectclock is somewhat more reliable for ASK modulated tags. added
this detect to askrawdemod if no clock in passed as an argument. also
added more EM ID formats to output
2014-12-24 11:48:41 -05:00
marshmellow42
cd48c19c31
minor askrawdemod adjustment if errors in demoding are found
...
if it can't find a demod position with no errors it will find the one
with fewest errors and mark errors with 77.
2014-12-23 15:16:53 -05:00
marshmellow42
2fc2150ea8
Add auto check for EM410x format to askrawdemod cmd
...
added EM410x format check and print to the data askrawdemod command. if
it finds valid em410x format & parities it will print the EM ID and
Unique ID and a few others.
2014-12-23 12:00:13 -05:00
pwpiwi
52bfb95543
bugfixes in iso14443a.c and hf 14a reader
...
- introduced with the big frame and parity support (commit 6a1f2d82
): tag responses with len%8 == 0 were dropped - thanks iceman for testing and finding
- after unsuccessful hf 14a reader the field stayed on. Thanks to iceman for proposing the fix.
2014-12-23 11:21:42 +01:00
marshmellow42
ea7d657f75
minor fix - got too comment happy removing test code
...
should not have commented this code out
2014-12-22 22:50:13 -05:00
marshmellow42
e888ed8e62
added new data askrawdemod command
...
added new data askrawdemod command returned data fskdemod and separated
out new fskrawdemod commands
2014-12-22 17:46:28 -05:00
pwpiwi
545f203826
adapted hf iclass list to new trace format
2014-12-20 21:32:44 +01:00
marshmellow42
ae2f73c12d
put ask demod and mandemod
...
put ask demod and mandemod back until i have time to test it
2014-12-19 12:39:41 -05:00
marshmellow42
b3b706693b
Final touches on IO prox and HID prox demod
...
makes both more robust and handles various error situations.
2014-12-19 12:14:27 -05:00
pwpiwi
db4de4d82f
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2014-12-18 19:42:49 +01:00
pwpiwi
57642f63fa
bugfixes hf epa cnonces
...
- extended length (more than 1 byte) not handled correctly
- nonces not printed on Windows due to type mismatch
2014-12-18 19:40:35 +01:00
pwpiwi
f10bf20c6c
Format hf 14a list output for bigger frame sizes
2014-12-18 19:39:16 +01:00
Martin Holst Swende
8e9768399c
minor change
2014-12-18 14:46:38 +01:00
Martin Holst Swende
0eea34a2a3
Fixed error in hash1 (from loclass), now it possibly calculates the KSel correctly for actually dumping data
2014-12-18 14:41:17 +01:00
Martin Holst Swende
7496d8d822
Merge pull request #32 from marshmellow42/master
...
Fixes and additions to lf io fskdemod and addon parameter to lf hid fskdemod
2014-12-18 08:56:26 +01:00
pwpiwi
2bdd68c370
unify/refactor hw tune and data tune
...
- unified hw tune and Enio's great data tune
- don't use BigBuf (and hardcoded Offset)
- removed special handling of CMD_MEASURED_ANTENNA_TUNING
in UsbCommandReceived()
2014-12-17 20:57:26 +01:00
marshmellow42
083ca3de73
LF HID & IO prox fixes/options
2014-12-17 09:51:40 -05:00
pwpiwi
471c514167
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2014-12-16 07:47:02 +01:00
pwpiwi
6a1f2d82bb
bugfixes iso14443a (hf 14a commands)
...
- buffers were too small to handle 256 byte frames
- parity bits were only handled for up to 32 byte frames
- trace format was inefficient
- removed parity calculation from decoders in iclass.c (parity not used on air anyway)
2014-12-16 07:41:07 +01:00
Martin Holst Swende
6116c79618
Reverted to original malicious CSNs from paper, it appears legit readers does not accept if they dont end with F7,FF,12,E0
2014-12-14 21:37:56 +01:00
Martin Holst Swende
b160432340
Merge branch 'master' of github.com:Proxmark/proxmark3
2014-12-14 18:07:38 +01:00
Martin Holst Swende
eabba3df7e
Fix (iclass)
2014-12-14 18:07:12 +01:00
András Veres-Szentkirályi
0ff9a93966
Typofix: occurrences
...
It's spelled with two rs.
2014-12-10 16:42:31 +01:00
Martin Holst Swende
d6a120a25b
Added Enios cool tuning-trick (LF) from forum-post: http://www.proxmark.org/forum/viewtopic.php?pid=13060#p13060
2014-11-30 22:30:36 +01:00
Martin Holst Swende
ca4714cd23
More coverity fixes
2014-10-30 21:49:18 +01:00
Martin Holst Swende
97d582a692
More coverity findings
2014-10-27 22:33:37 +01:00
Martin Holst Swende
90e278d3da
Fixed several issues found using a coverity-scan
2014-10-27 21:46:04 +01:00
Martin Holst Swende
f97d4e2378
First try att merging with head
2014-10-24 20:46:02 +02:00
Martin Holst Swende
e6ee6c4cd1
Merge remote-tracking branch 'origin/master' into PenturaLabs-iclass-research
2014-09-19 09:45:38 +02:00
pwpiwi
c626c56ef5
hf mf dump bugfix: wrongly tried key A instead of key B for a specific Access Condition
2014-09-12 07:45:04 +02:00
pwpiwi
79db03ef63
hf mf dump error handling, revive hf mf chk d option, provide known keys dictionary file
...
- hf mf dump: abort on unrecoverable errors. Don't create file dumpdata.bin in this case.
- hf mf chk: re-enabled and fixed option d (dump keys to dumpkeys.bin).
if there are unknown keys, write 0xffffffffffff instead to the file.
- provide a default key dictionary file for hf mf chk (default_keys.dic). Contents taken from
mf_default_keys.lua
2014-09-11 20:58:34 +02:00
pwpiwi
baeaf57950
fix/add support for 4K (and other non 1K) card sizes in hf mf commands
...
- hf mf rdsc (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39
- hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards
- hf mf dump (add): added (optional) card size parameter and support for non 1K cards
- hf mf dump (fix): Access Condition 011 not handled correctly (tried to access with key A)
- hf mf restore (add): added (optional) card size parameter and support for non 1K cards
- hf mf nested (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39
- hf mf nested (fix): always dumped 16 keys to dumpkeys.bin instead of correct number
- hf mf chk (fix): always dumped 16 keys to dumpkeys.bin instead of correct number
- hf mf eget (fix): displayed three instead of one block
- hf mf eload (add): load 4K .eml files (but accepts 1K .eml files for backwards compatibility)
- hf mf esave (add): always save the whole emulator memory (4K) instead of 1K only
- hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards
2014-09-10 19:04:50 +02:00
Martin Holst Swende
fdefed663f
Some more lua-scripts and library fixes from iceman, including more default keys
2014-08-29 09:11:36 +02:00
Martin Holst Swende
5b1311fba2
Various scripts from iceman
2014-08-29 09:09:23 +02:00
pwpiwi
b03c0f2d86
bugfixes hf mf sim
...
- output of debug messages caused communication failures due to timing issues.
hf mf dbg 4 now required to see these debug messages.
- changed help text for hf mf dbg
- fixed minor bugs in help texts for hf mf sim and hf mf ecset
- display "key A" or "key B" instead of "key=0" or "key=1 in hf mf sim
2014-07-30 21:23:02 +02:00
pwpiwi
991f13f27d
minor bugfixes to hf mf sniff and hf 14a snoop
...
- tracing was not always enabled when starting hf mf sniff or hf 14a snoop
- ATQA was displayed in wrong byte order in hf mf sniff
- 4 Byte UIDs were displayed as 7 Byte UIDs (padded with 0x000000) in hf mf sniff
- same for logfile names.
- assignment (=) had been used instead of == in comparisons (shouldn't have been relevant though)
2014-07-15 08:39:56 +02:00
pwpiwi
9a573554e0
minor bugfix and enhancement to hf 14a reader
...
- "SAK incorrectly claims ... " message was displayed incorrectly
- now decodes FSCI, SFGI, FWI and displays FSC, SFGT, FWT resp.
2014-07-15 08:35:27 +02:00
pwpiwi
1604d0a290
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2014-07-01 07:09:21 +02:00
Martin Holst Swende
9e28ee9f14
Only documentation and minor changes
2014-06-30 11:23:14 +02:00
pwpiwi
19d6d91fd5
hf 14a reader enhancement
...
In order to be able to distinguish between Mifare Classic and Mifare Plus
in Security Level 1 (SL1, Mifare Classic Compatibility Mode), hf 14a reader
now always tries RATS - even if SAK claims not to support ISO14443-4.
2014-06-30 08:21:50 +02:00
Martin Holst Swende
9b82de75f4
more work towards iclass elite dumping.. not quite finished yet though :(
2014-06-30 00:20:40 +02:00
Martin Holst Swende
aa41c6058a
Merged two iclass-reader functions into one to remove duplicated code, update loclass library with hash2 algo
2014-06-29 23:34:24 +02:00
Midnitesnake
74a3880283
Changes inorder for iclass dump to work correctly
2014-06-29 09:25:31 +01:00
Martin Holst Swende
26c0d833ac
Some minor changes [iclass-related]
2014-06-28 22:57:48 +02:00
Martin Holst Swende
3ad48540d4
Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research
...
Conflicts:
README.txt
armsrc/apps.h
client/Makefile
client/cmdhficlass.c
client/cmdhficlass.h
2014-06-28 20:52:37 +02:00
Martin Holst Swende
42f57e0294
Merged with master
2014-06-27 13:16:31 +02:00
Martin Holst Swende
77abe781af
fix for better csns
2014-06-27 12:52:28 +02:00
pwpiwi
72b1090acf
Bugfixes:
...
- Byteorder was wrong when displaying ATQA in hf 14a read
- 7 Byte UIDs were truncated to 4 Bytes when displaying in hf 14a cuids
2014-06-26 07:57:49 +02:00
iZsh
b014c96d68
new command "lf snoop" to snoop raw ADC values
...
fpga/lo_read.v (lf_field): new argument.
fpga/fpga_lf.v: modify accordingly.
armsrc/apps.h (FPGA_MAJOR_MODE_LF_READER): Rename as FPGA_MAJOR_MODE_LF_ADC.
armsrc/apps.h (FPGA_LF_ADC_READER_FIELD): New LF option.
armsrc/lfops.c: Modify accordingly.
client/cmdlf.c (CmdLFSnoop): New command.
armsrc/appmain.c, armsrc/lfops.c, client/cmdlf.h, include/usb_cmd.h: Modify accordingly.
2014-06-21 21:33:54 +02:00
iZsh
7cc204bff8
THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand.
2014-06-20 01:02:59 +02:00
penturalabs
fecd8202a5
implemented 'hf iclass dump xxxx',
...
all you need is the magic key to dump contents of an iclass card
2014-06-17 10:55:37 +01:00
Martin Holst Swende
9f6e9d1575
More work on iclass simulation attack
2014-06-16 21:27:12 +02:00
Martin Holst Swende
d51b2eda8f
Added enios dirthreshold command, patch from http://www.proxmark.org/forum/viewtopic.php?pid=11577#p11577
2014-06-11 08:42:37 +02:00
penturalabs
fe53c0311c
improved calc_iclass_mac to work independant of size
2014-05-02 23:30:03 +01:00
Andrew Davies
a66fca86b9
Updated proxmark research with Holiman's loclass framework
2014-05-02 11:11:54 +01:00
Martin Holst Swende
f83cc12613
More work on iclass
2014-04-24 15:48:00 +02:00
Martin Holst Swende
17cba2693d
Implemented client side changes for iclass hack, attempted to fix issues with trace. The trace functionality from iso14443 has been rewritten, unfortunately iclass used that also, which made iclass 'list' stop functioning, both for simulation and snooping
2014-04-24 14:13:33 +02:00
penturalabs
c3963755b7
Implement replay command.
2014-04-15 11:47:01 +01:00
Martin Holst Swende
07976a256d
Refactoring low frequency operations, now 'lf hid fskdemod' is more stable. Also did changes to handling ioprox tags, this is yet untested, so until it's been tested it should be kept off 'stable' branch
2014-03-31 17:57:14 +02:00
Philippe Teuwen
19e2a10de5
Markdown help: use fixed column width
2014-03-27 16:49:37 +01:00
Philippe Teuwen
46782176fc
Restore original inline help behavior as we've now separate fcts for -h/-m
2014-03-26 23:51:22 +01:00
Philippe Teuwen
dec8e8bd9f
Provide option -m for markdown help dump, -h for text dump
2014-03-26 23:50:34 +01:00
Philippe Teuwen
6f5dd6010e
Fix description in help dump
2014-03-26 22:44:25 +01:00
Philippe Teuwen
b5727175c0
Fix offline column in help dump
2014-03-26 22:40:41 +01:00
Martin Holst Swende
57c695563f
Fixes to implement generation of markdown auto-generated documentation
2014-03-26 22:39:37 +01:00
Philippe Teuwen
ae7aa73dd5
Add option -h to dump complete set of supported commands
...
Usage: ./proxmark3 -h
Display both offline & online commands, online commands are flagged.
git-svn-id: https://proxmark3.googlecode.com/svn/trunk@850 ef4ab9da-24cd-11de-8aaa-f3a34680c41f
2014-03-26 22:33:11 +01:00
holiman
f5a1a9ce47
Merge pull request #8 from pwpiwi/master
...
add .gitignore and merge svn r852
2014-03-25 21:49:05 +01:00
pwpiwi
d714d3effc
Improvements/Fixes to 14443 sniffing/snooping
...
- fixed a circular buffer rollover bug in iso14443a.c
- fixed 7 Byte UID handling in hf mf sniff
- fixed "cannot append" error in hf mf sniff d
- fixed hint on mfkey32 in hf mf sim x
- fixed hf mf sniff sometimes showing rogue data from previous calloc
- improve snooping/sniffing by syncing modulation detector window with reader signal (hi_iso14443a.v)
- code cleanup of hi_iso14443a.v
2014-03-25 21:38:24 +01:00
W8M2Hg9lLmWqXSGC
88c637e6cd
Merge pull request #7 from PenturaLabs/master
...
Re-submitting Midnitesnake's Mifare Ultralight Patch
2014-03-25 07:07:48 +11:00
W8M2Hg9lLmWqXSGC
347dea669a
Merge pull request #5 from PenturaLabs/master
...
Kantech ioProx Support - Fix
2014-03-21 20:35:14 +11:00
PenturaLabs
94faa59465
Update cmdlfio.h
2014-03-21 07:51:51 +00:00
penturalabs
c86220246e
Sorry, included missing files from last pull request
2014-03-21 07:45:18 +00:00
W8M2Hg9lLmWqXSGC
cf608ac8f3
Merge pull request #2 from PenturaLabs/master
...
Added Kantech ioProx Support
2014-03-19 08:47:28 +11:00
penturalabs
a1f3bb120f
Added Kantech ioProx Support
2014-03-18 20:52:48 +00:00
PenturaLabs
1801456ede
Re-submitting Midnitesnake's Mifare Ultralight Patch
2014-03-18 14:02:32 +00:00
midnitesnake
cb967ea976
Added Unique Code to EM41x
2014-03-18 07:42:54 +00:00
midnitesnake
080ff30a9e
Added Unique Code to EM41x
2014-03-18 07:41:02 +00:00
martin.holst@gmail.com
0c12504a5a
Patch submitted by 'FireFart', for some issues with 'hf mf chk'. See http://www.proxmark.org/forum/viewtopic.php?id=1888 for more info
2014-02-27 18:10:12 +00:00
micki.held@gmx.de
7bc95e2e43
- fixed iso1443a ManchesterDecoder in order to fix broken Snoop/Sniff
...
- enhanced tracing: hf 14a list now shows meaningful timing information. With new option f it also shows the frame delay times (fdt)
- small fix for hf 14b list - it used to run into the trace trailer
- hf 14a sim now obeys iso14443 timing (fdt of 1172 or 1234 resp.)
Note: you need to flash FPGA as well.
More details in http://www.proxmark.org/forum/viewtopic.php?pid=9721#p9721
2014-02-19 20:35:04 +00:00
martin.holst@gmail.com
d2f487af9c
Various improvements on the Mifare1kSimulation. Fixed issue with tracebuffer not being cleared, fixed issue with 'static' errors, added modes for doing reader-only attack, added interactive mode, added possibility to set UID from cmdline, either 7-byte or 4-byte. See http://www.proxmark.org/forum/viewtopic.php?id=1529 and http://www.proxmark.org/forum/viewtopic.php?id=1649&p=3 for some more background and discussion
2014-01-31 21:17:34 +00:00
micki.held@gmx.de
e691fc45bc
- improved reader sensitivity for 14443a cards (FPGA change!)
...
- implemented ISO 14443A anticollision loop
See http://www.proxmark.org/forum/viewtopic.php?id=1797 further details
2013-11-19 18:52:40 +00:00
martin.holst@gmail.com
6cacefa48d
Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html
2013-11-07 11:33:48 +00:00
martin.holst@gmail.com
4c367827b5
Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html
2013-11-07 11:32:13 +00:00
martin.holst@gmail.com
77cd612f15
Added a lua bit manipulation library, added Lua-api to iso 15693 crc-calculation
2013-11-06 18:34:10 +00:00
martin.holst@gmail.com
da9d456e9f
Minor fix, sometimes when data is sent without the pm3 is connected, it causes a spin-loop condition to occur which blocks the processor. fixed
2013-11-06 18:32:11 +00:00
martin.holst@gmail.com
b11542a7f6
Minor fix in html skeleton
2013-10-31 18:24:03 +00:00
martin.holst@gmail.com
e26df8425a
Some more tinkering with a generic 13.56MHz reader, still not finished
2013-10-31 10:35:03 +00:00
martin.holst@gmail.com
5198f2e23c
First steps towards creating a generic HF reader/identifier. A coop with Asper.
2013-10-30 21:10:47 +00:00
martin.holst@gmail.com
62a95012e9
Changed html template, in order to make it more generic and be usable on other types of data than mifare, now supports different highlighters. Implemented are NDEF and Mifare
2013-10-30 18:21:42 +00:00
dn337t@gmail.com
a00411152f
use CLOCKS_PER_SEC instead of platform-specific hardcoded value
2013-10-22 12:14:32 +00:00
martin.holst@gmail.com
412afdb87b
Fixed linebreak error
2013-10-20 19:05:52 +00:00
martin.holst@gmail.com
b3123cf603
Added functionality to dump data into .eml-file
2013-10-20 18:51:21 +00:00
martin.holst@gmail.com
db132ea0e8
Script to convert emulator file (ASCII dump of data) into HTML
2013-10-20 18:48:04 +00:00
martin.holst@gmail.com
c44241fdea
Fixed minor errors
2013-10-20 18:47:15 +00:00
izsh@fail0verflow.com
06b82e6a6d
cmdhf14b.c: fixing a crash in the crc computation when missing data (e.g. with 'hf 14b raw -c -p')
2013-10-20 11:46:51 +00:00
izsh@fail0verflow.com
3f7c993d78
fix compilation issues with gcc 4.6: anonymous unions are not c99
2013-10-20 11:40:00 +00:00
martin.holst@gmail.com
6742c089b1
Changes to how dumping is performed, now utilises a library. This is in preparation for a more generic dumping of different types of cards. Also added functionality to html-dump .eml-files
2013-10-19 20:18:50 +00:00
martin.holst@gmail.com
ba33066cef
Minor change
2013-10-18 11:35:06 +00:00
martin.holst@gmail.com
1686e4d1db
Added script to dump ndef-compliant tags. Written in collaboration with @asper
2013-10-18 11:14:23 +00:00
martin.holst@gmail.com
3c9ed0e180
Put manufacturer country within brackets
2013-10-18 07:36:20 +00:00
martin.holst@gmail.com
65e344df3e
Some refactoring, also placed wait14443a here
2013-10-17 19:21:04 +00:00
martin.holst@gmail.com
5eab31c336
Manufacturer-info, to be used in upcoming script
2013-10-17 19:20:10 +00:00
martin.holst@gmail.com
57d384004d
Changes to html-dump generateion, credits to en4rab http://www.proxmark.org/forum/viewtopic.php?pid=8576
2013-10-17 18:28:21 +00:00
roel@libnfc.org
981bd4292e
integrated MIFARE ultralight features, contributed by 'midnitesnake'
2013-10-11 08:43:23 +00:00
roel@libnfc.org
05f23c593c
with the declaration of 'uint8_t destination[8]', 'destination' is already a pointer, don't try to get the address of it by using '&destination', then you will get a pointer to a pointer.
2013-10-11 08:37:08 +00:00
martin.holst@gmail.com
51defdd4a2
Fixed issue where the 'nested'-part of autopwn only used 16 sectors, not bothering with the rest
2013-10-09 19:37:55 +00:00
martin.holst@gmail.com
b969713989
Fixed error with mifare_autopwn where keys were reversed, see http://www.proxmark.org/forum/viewtopic.php?pid=8494#p8494
2013-10-09 19:08:17 +00:00
roel@libnfc.org
b1231445c7
removed unused compiler directives, cleaned up some code
2013-10-09 09:59:14 +00:00
martin.holst@gmail.com
0dae56d81e
Committed mifare_autopwn.lua. For more infromation, see http://martin.swende.se/blog/Proxmark_Scripting_1.html and http://martin.swende.se/blog/Proxmark_Scripting_2.html
2013-10-08 18:50:54 +00:00
martin.holst@gmail.com
ed77aabe00
Patch from 'buzzy' to add automatic flushing of output, see http://www.proxmark.org/forum/viewtopic.php?id=1740 for more details.
2013-10-08 18:30:01 +00:00
martin.holst@gmail.com
2dcdf1a683
Added nonce2key-API to lua
2013-10-07 10:11:15 +00:00
martin.holst@gmail.com
7d2313912c
Fixed what may have been one cause of seg-faults in nonce2key... not sure, it still happens at times
2013-10-07 10:10:34 +00:00
martin.holst@gmail.com
e481bc3299
Removed double print-out
2013-10-07 10:02:25 +00:00
fnargwibble@gmail.com
e654346b79
i'm a retard. no idea why i did it that way! get rid of compile warnings, and print string properly. duh.
2013-10-05 16:55:53 +00:00
fnargwibble@gmail.com
e12b82d362
show device name during flashing and change advice on hanging
2013-10-05 16:44:48 +00:00
martin.holst@gmail.com
0a85b72549
Reworked how to call 'standard' stuff from within lua scripts, so now it's much simpler both in lines of code and usage. A script can now call core.console('hf mf nested 1 0 a ffffffffffff') in order to execute anything via the old command line parser
2013-10-04 19:29:46 +00:00
jonor@live.it
4f269f63da
Added more informations at command hw version. Now we can get some informations of microcontroller.
...
Maybe is useful when someone got a bigger AT91
Example:
#db# Prox/RFID mark3 RFID instrument
#db# bootrom: svn 756-unclean 2013-09-14 15:04:07
#db# os: svn 796-unclean 2013-10-04 18:50:44
#db# FPGA image built on 2013/ 9/26 at 9:17:32
uC: AT91SAM7S256 Rev B
Embedded Processor: ARM7TDMI
Nonvolatile Program Memory Size: 256K bytes
Second Nonvolatile Program Memory Size: None
Internal SRAM Size: 64K bytes
Architecture Identifier: AT91SAM7Sxx Series
Nonvolatile Program Memory Type: Embedded Flash Memory
2013-10-04 18:54:10 +00:00
martin.holst@gmail.com
6a2c1d8e14
Minor issue, usability
2013-10-04 18:47:38 +00:00
roel@libnfc.org
78e7cf984c
fixed some more compiler warnings
2013-10-03 14:52:21 +00:00
roel@libnfc.org
f66021cf48
fixed compiler warnings
2013-10-03 14:36:42 +00:00
martin.holst@gmail.com
2fca3ad92d
Some documentation improvement
2013-10-03 13:58:14 +00:00
martin.holst@gmail.com
c9e2f7807e
Added a utility script to convert a 'dumpdata.bin'-file into the 'eml'-format that the emulator uses. Did not find any built-in way to do this, perhaps such functionality already exists.. ?
2013-10-03 13:56:11 +00:00
martin.holst@gmail.com
acfdf9528b
Fixed error in htmldumper
2013-10-03 13:26:17 +00:00
martin.holst@gmail.com
61caacda2b
Added a utility which takes a mifare-dumpfile and creates a html-report visualising the data. The html-dump is self-sufficient and standalone .. part 2
2013-10-03 12:34:28 +00:00
martin.holst@gmail.com
d78792f515
Added a utility which takes a mifare-dumpfile and creates a html-report visualising the data. The html-dump is self-sufficient and standalone
2013-10-03 12:33:58 +00:00
martin.holst@gmail.com
05ed5c496a
Made script-based default key check a bit more intelligent, so it works not only on 4k cards. Also added option to save data to a dump-file
2013-10-01 19:58:42 +00:00
douniwan5788@gmail.com
b19bd5d689
Add support in 'hf mf mifare' for some unlicensed/compatible mifare card which always answer NACK.
...
Change the 'nttmp' start from nt distance 500 to 100 in mifarecmd.c to compatible some unlicensed/compatible mifare card.
2013-09-29 11:44:07 +00:00
martin.holst@gmail.com
686f0a1794
Moved script libraries into lualibs/folder, and added a patch to include the folder in the LUA_PATH (a.k.a package.path). See http://proxmark.org/forum/viewtopic.php?id=1750 for more details
2013-09-28 20:07:28 +00:00
martin.holst@gmail.com
5f6d6c9003
Raw 14a in commandline, patch by jonor, see http://proxmark.org/forum/viewtopic.php?id=1751 for more info
2013-09-28 19:28:55 +00:00
henryk@ploetzli.ch
bf7163bdb3
* Add an option to lf read command to use an arbitrary divisor, enabling reading at frequencies other than 125 and 134 kHz.
2013-09-27 13:48:20 +00:00
roel@libnfc.org
7bb9d33e2c
fixed warnings on Mac OS 10.8, xcode 5
2013-09-25 10:40:16 +00:00
martin.holst@gmail.com
450d2e3a96
Minor changes, usage examples and selftests
2013-09-21 20:46:32 +00:00
martin.holst@gmail.com
70c8077c99
Changed the name of writeraw into 14araw
2013-09-21 20:40:32 +00:00
martin.holst@gmail.com
b61f426c2d
Fixed the write raw 14a, now finally functional... at least let's hope so
2013-09-21 20:37:22 +00:00
martin.holst@gmail.com
427cdbe2cd
Fixed error from r769 where I added -ldl switch for linux, but still forgot to remove it for others...
2013-09-20 10:11:17 +00:00
martin.holst@gmail.com
24d48e60fc
Fix two errors in writeraw (14a)-script that were found by jonor
2013-09-20 07:32:37 +00:00
martin.holst@gmail.com
42daa759c1
Only superficial changes, to get rid of compiler warnings
2013-09-19 19:53:09 +00:00
martin.holst@gmail.com
eaea9de900
Removed the -ldl switch from r763, so it only is added for Linux (it apparently caused errors on windows/mingw)
2013-09-19 19:33:56 +00:00
martin.holst@gmail.com
30a5d35529
Implemented parameter passing into script, added a minimal getop-parser, added an example script which takes parameters
2013-09-19 19:21:12 +00:00
martin.holst@gmail.com
b13fa4448f
merged trunk changes into branch
2013-09-16 19:08:19 +00:00
martin.holst@gmail.com
a403a55959
In the middle of some work to get arguments into scripts. Also fixed so you don't have to specify .lua on 'script run foobar'
2013-09-16 19:04:29 +00:00
martin.holst@gmail.com
869cabf7dd
Patch by jonor for hf list 14b, wait of ack was missing. See http://www.proxmark.org/forum/viewtopic.php?pid=8260#p8260
2013-09-16 18:38:47 +00:00
micki.held@gmx.de
9492e0b098
Major rework of hf mf nested:
...
- PM: used GetCountMifare in MifareNested() for improved timing accuracy and to deliver better quality nonces
- PM: MifareNested now delivers exactly two different nonces to avoid time consuming multiple lfsr_recovery32() on client side
- Client: replaced quicksort by bucketsort in crapto1.c which is faster
- Client: use multithreading (two parallel calls to lfsr_recovery32())
- Client: fixed a small bug in mfnested() (always showed trgkey=0)
- Client: introduced a mutex for PrintAndLog() to avoid interlaced printing
Minor rework of hf mf chk:
- Avoid time consuming off/on cycles. Send a "halt" instead.
2013-09-15 09:33:17 +00:00
martin.holst@gmail.com
500c972914
Fixed some kind of of linking error
2013-09-01 20:22:22 +00:00
martin.holst@gmail.com
cda2a4c0a5
Merged latest trunk changes into scripting-branch
2013-09-01 20:00:56 +00:00
martin.holst@gmail.com
babfcaa0f3
Patch by jonor, fixes so uart_receive does not block when data is continuosly received. See http://www.proxmark.org/forum/viewtopic.php?id=1735
2013-09-01 18:46:55 +00:00
martin.holst@gmail.com
7cf3ef203c
Patch by jonor for raw ISO 1444B commands. See http://www.proxmark.org/forum/viewtopic.php?id=1729 for more info
2013-09-01 18:41:05 +00:00
martin.holst@gmail.com
a763eb2126
Added a comment
2013-09-01 18:40:08 +00:00
martin.holst@gmail.com
3e69b21148
Minor changes to writeraw.lua, still not working as it should
2013-08-27 06:50:00 +00:00
martin.holst@gmail.com
4961e292aa
More patches from en4rab to the hexsamples, plus patches to legicsave and legicdecode (also by en4rab).
2013-07-12 20:03:31 +00:00
micki.held@gmx.de
1d59cd8d7a
Revoked unintended commit of cmdmain.c to scripting branch in r754.
2013-07-10 05:10:58 +00:00
micki.held@gmx.de
1c611bbd26
2013-07-08 17:56:05 +00:00
micki.held@gmx.de
a361cddfb9
2013-07-08 17:56:05 +00:00
martin.holst@gmail.com
4df3eb3f73
Attempt to use raw writing capabilities via scripting engine. Not functional yet
2013-07-04 12:56:00 +00:00
martin.holst@gmail.com
e772353f72
Major changes to hf mf mifare
2013-06-26 21:13:02 +00:00
martin.holst@gmail.com
c6e2bfcda1
Removed some crap-scripts for testing
2013-06-26 20:49:04 +00:00
martin.holst@gmail.com
ca363c2348
Fixed so correct sizes are used across different architectures in the binlib
2013-06-26 12:33:31 +00:00
martin.holst@gmail.com
3a4c72fe59
Added lua-mac building, added cleaning of lua files
2013-06-26 11:02:37 +00:00
martin.holst@gmail.com
ea833d39ff
Improved error handling
2013-06-26 09:18:31 +00:00
martin.holst@gmail.com
30a46ed86a
Attempt to make the makefile generic, so lua compilation works well also under windows
2013-06-25 20:25:18 +00:00
martin.holst@gmail.com
529488e87d
typo
2013-06-07 19:51:15 +00:00
martin.holst@gmail.com
9f7a854d7b
Fixed a minor error with the keys
2013-06-07 18:58:06 +00:00
martin.holst@gmail.com
a2d82b467a
Added library to read card info, made use of it from within mfkeys.lua script
2013-06-07 13:23:32 +00:00
martin.holst@gmail.com
fd368d18f1
Changes in cmd handling
2013-06-07 09:30:32 +00:00
martin.holst@gmail.com
21452811e6
implementation of command library in lua
2013-06-07 09:27:58 +00:00
martin.holst@gmail.com
16b04cb291
mf check keys in lua-space
2013-06-07 09:26:56 +00:00
martin.holst@gmail.com
c00f0dbfda
Fixed 'volatile' error in this branch also
2013-06-07 09:25:59 +00:00
martin.holst@gmail.com
44fffc5451
Work on the scripting library
2013-06-07 09:24:25 +00:00
martin.holst@gmail.com
1bad971361
Fixed so storeCommand/getCommand are multithread-safe (at least dual-thread). Hopefully. http://www.proxmark.org/forum/viewtopic.php?pid=7400#p7400
2013-06-06 18:30:00 +00:00
martin.holst@gmail.com
c338502409
Applied patch from http://www.proxmark.org/forum/viewtopic.php?id=1637 , where a compiler optimization resulted in hangs
2013-06-05 08:53:20 +00:00
martin.holst@gmail.com
ab7a8ea164
Fixed error pointed out here: https://code.google.com/p/proxmark3/issues/detail?id=46 , when null is passed to waitforresponse
2013-06-03 11:04:35 +00:00
martin.holst@gmail.com
a808a224f5
Found that USBcommands from the device are silently overwritten if the host does not quickly enough read them, which causes problems in several places. Implemented a circular buffer which stores up to 50 commands (still tiny, memorywise) and prints out a message if the buffer wraps around (overwrites).
2013-05-31 19:25:13 +00:00
martin.holst@gmail.com
f057bddb70
Added binlib, to handle binary data from lua, based on lpack http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lpack
2013-05-26 20:05:13 +00:00
martin.holst@gmail.com
3510cdff4b
Started an experiment with lua mifare hack
2013-05-24 21:43:02 +00:00
martin.holst@gmail.com
96e7a3a50b
Minor fixes, added some functionality to send data, but still some way to go
2013-05-24 21:39:08 +00:00
martin.holst@gmail.com
5b760b6cac
'core' library glue
2013-05-24 21:06:57 +00:00
martin.holst@gmail.com
1ef665776d
Added a PoC script which implements a commandline
2013-05-24 21:06:20 +00:00
martin.holst@gmail.com
a0655c45bd
Added 'core'-api, also added some error handling in scripts
2013-05-24 21:05:45 +00:00
martin.holst@gmail.com
5a92cb525e
Fixed so standard libraries can be used, added an example script, and fixed so all hf.mf-ops can be called
2013-05-22 13:04:01 +00:00
martin.holst@gmail.com
806dc07542
First implementation of user scripts - very experimental - YMMV
2013-05-21 18:37:43 +00:00
martin.holst@gmail.com
489e174541
Fixed problem with em4100, see http://www.proxmark.org/forum/viewtopic.php?pid=7235#p7235
2013-05-16 18:13:54 +00:00
apresence@gmail.com
e67b06b706
Support for cloning to T55x7 at different clock rates & 134KHz
...
* Modified commands (lf em4x):
em410xwatch ['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)
em410xwrite <UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate
* Better option checking for em410xwrite & fix for uninitialized vars
* Increased samples from 2000 to 4000 in em410xwatch (2000 is OK for clock=64, but too few for clock=32)
2013-05-12 08:11:00 +00:00
martin.holst@gmail.com
5b59cfb7b1
Added some information about flashing (linux)
2013-05-11 12:43:44 +00:00
martin.holst@gmail.com
5f91a683b7
Added some documentation regarding ports on linux
2013-05-11 12:33:04 +00:00
roel@libnfc.org
90d74dc206
next update from en4rab on data samples
2013-04-26 20:33:05 +00:00
roel@libnfc.org
a2847518d2
en4rab fixed the 'data samples' command
2013-04-23 19:55:43 +00:00
roel@libnfc.org
6c6d1ac1a6
fixed signed/unsigned problem
2013-03-26 20:42:18 +00:00
roel@libnfc.org
4890730a5f
fixed crash, when proxmark was claimed by other process
2013-03-26 16:01:52 +00:00
roel@libnfc.org
62ee4fedd5
Finally figured out a way to claim a serial port interface under unix
2013-03-22 16:42:26 +00:00
roel@libnfc.org
4a049b7847
avoid rolling dots over the screen when proxmark is not available (yet)
2013-03-21 16:06:09 +00:00
roel@libnfc.org
d8193fa5ac
flasher updated again, should work more solid now
2013-03-21 12:44:21 +00:00
roel@libnfc.org
2d7fc168a2
fixed missing header file
2013-03-21 11:38:48 +00:00
roel@libnfc.org
13dbdd6bb1
(dirty) fix for linux to clean up the /dev/ttyACM* quicker
2013-03-21 10:59:56 +00:00
roel@libnfc.org
0a24369c48
trying to tweak uart code, for better flashing
2013-03-19 16:19:20 +00:00
roel@libnfc.org
759c16b31f
client should compile without warnings on linux, mac, windows
2013-03-14 15:03:04 +00:00
roel@libnfc.org
19d9a7b0ce
fixed compiling under ubuntu with devkitARM_r41
2013-03-13 13:46:40 +00:00
cex123@gmail.com
38b20f7550
Fixed LF HID cloning command
2013-03-13 07:13:19 +00:00
roel@libnfc.org
47e18126ec
added hitag bit count output in log
2013-03-11 15:07:23 +00:00
roel@libnfc.org
d16d20b1fb
fixed CMD_HID_SIM_TAG
2013-03-10 11:37:59 +00:00
roel@libnfc.org
c1e745e465
optimized
2013-03-04 15:15:30 +00:00
thijsbreman@gmail.com
a7b4bf1eb4
polling per second in OpenProxmark
2013-03-04 13:07:15 +00:00
roel@libnfc.org
829fb342b5
uploaded new mingw-proxmark.zip, QT working again, so re-enabled QUI under windows
2013-03-01 14:28:14 +00:00
roel@libnfc.org
9d8f56e35d
fixed stupid 64-bit formatting for x86/amd64 and unix/windows - part4
2013-02-28 22:49:34 +00:00
roel@libnfc.org
a0bbdb76ca
fixed stupid 64-bit formatting for x86/amd64 and unix/windows - part3
2013-02-28 22:46:49 +00:00
roel@libnfc.org
1a07fd510d
fixed stupid 64-bit formatting for x86/amd64 and unix/windows - part2
2013-02-28 22:33:31 +00:00
roel@libnfc.org
125a98a110
fixed stupid 64-bit formatting for x86/amd64 and unix/windows
2013-02-28 22:22:24 +00:00
roel@libnfc.org
cb64309e4b
compiling on windows again
2013-02-28 21:36:09 +00:00
roel@libnfc.org
54a942b05d
merged all patches into CDC repository
2013-02-28 17:04:23 +00:00
roel@libnfc.org
50d6e4abc1
douniwan5788:
2013-02-28 16:04:21 +00:00
roel@libnfc.org
28fdb04fd8
Finally, rewrote bootrom and flasher program, much faster now
2013-02-28 15:11:52 +00:00
roel@libnfc.org
79a73ab2d1
fixed USB GPIO bug reported by gregy, and fixed 'hf 14a reader' command
2013-02-27 13:23:38 +00:00
roel@libnfc.org
ab4da50d99
added automatically saving the hitag2 memory content to file
2012-12-09 21:25:29 +00:00
roel@libnfc.org
9440213d6b
fixed 64-bit cmd/arg for windows
2012-12-09 13:00:19 +00:00
roel@libnfc.org
7dd1908b24
fixed 'hf mf' command and some others
2012-12-07 22:37:22 +00:00
roel@libnfc.org
fe7bfa7856
Windows7 working now! ugly fix for inaccurate Windows timer, quickfix for receiving multiple frames
2012-12-07 12:51:19 +00:00