dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,290 Commits 7 Branches 1 Tag
4aa40061671fbfaa8564a3fe8aebc1d813e2ffd9
Commit Graph

5754 Commits

Author SHA1 Message Date
marshmellow42
8e0cf02308 minor change to lf em4x menu & iceman script... 
...updates
 2015-04-10 00:06:59 -04:00
iceman1001
9c09e006d6 CHG: removed unused code. 
FIX: moved some checks to make the script run a tad bit faster.
 2015-04-09 20:38:38 +02:00
iceman1001
26b8f38b63 CHG: changed some help texts. 2015-04-09 20:36:12 +02:00
iceman1001
68e6434527 FIX: some minor corrections to identify more tokens. 2015-04-09 20:35:04 +02:00
iceman1001
d87779d6d1 FIX: fixed a minor bug introduced when changing from OpenSSL -> PolarSSL. 
ADD:  changed code to handle both  encrypt and decrypt AES 128.
 2015-04-09 20:34:34 +02:00
marshmellow42
664f658650 nexwatch fix .h file + icemans mf csetblk w arg 
forgot to include the new nexwatch command in the header...
added icemans hf mf csetblk w parameter fix
 2015-04-08 15:08:05 -04:00
marshmellow42
25d3e5cc83 Merge remote-tracking branch 'upstream/master' 2015-04-08 14:19:19 -04:00
marshmellow42
411105e036 added nexwatch demod & iceman lua 
added nexwatch demod (also added to lf search)
added iceman's lua script adjustments
 2015-04-08 14:19:03 -04:00
marshmellow42
322f7eb111 fix to lf t5 detect/read cmds 
i think this functions fairly well...
still some issues with demod positioning for various reasons.
ASK/Biph/FSK work pretty well
the PSK Demod still needs a little attention to help it better demod
various carriers...
 2015-04-08 11:18:29 -04:00
marshmellow42
9632ecbe3d update t5 detection test() 
missed this file in last commit... sorry.
 2015-04-08 10:12:24 -04:00
Martin Holst Swende
83602affe5 Fixed buffer initialization errors, as reported in http://www.proxmark.org/forum/viewtopic.php?pid=15337#p15337 2015-04-08 13:31:04 +02:00
marshmellow42
fef74fdce4 lf ask consolidation 
backend:
askman and askraw demods merged into askdemod (args adjusted
accordingly)
re-arranged lfdemod.h in alphabetical order and by category

front end:
data detectclock a (ask) now also reports the selected best start
position for demod
data manrawdecode takes an invert arg now
 2015-04-08 01:07:39 -04:00
iceman1001
105ce39607 FIX: two parentheses were missing. 
FIX: setting the default key to Oxff bug. (http://www.proxmark.org/forum/viewtopic.php?pid15325#p15325)
FIX: proper initialisation of variables ;)
 2015-04-07 18:05:35 +02:00
iceman1001
cff17e78f5 FIX: a wrong comment inside default_toys.lua 
FIX: a wrong linking to default_toys.lua in tnp3 scripts.
 2015-04-07 18:02:29 +02:00
marshmellow42
49bbc60af3 lf cleaning++ 
data askedgedetect - removed unneeded code
lf em em4x50read bug fix / error checking
graph-save/restore auto repaint after restore.
 2015-04-07 00:53:06 -04:00
marshmellow42
cc15a1187b lf cleanup - fixes 
more lf em em4x50read fixes
adjust heavy clipping ask clock detection
clean up t55xx minor items
 2015-04-06 23:17:30 -04:00
iceman1001
ba3fd680fb FIX: fixed a bug in "hf mf csetblock" where it didn't used the "w" wipe parameter before. 
CHG: minor textual changes.
 2015-04-06 18:52:20 +02:00
iceman1001
7949523515 CHG: default_toys.lua is now able to correct identify over 200 different types. 2015-04-06 18:49:44 +02:00
iceman1001
c3fe354b19 CHG: fix the default_toys.lua file to handle more aspects of information for a given tag. 
CHG: corrected a bug in tnp3clone.lua that made the script fail to "wipe" a magic tag.
CHG: minor textual change in ndef_dump.lua
 2015-04-06 18:47:53 +02:00
marshmellow42
1f918317e2 add maxErr to data manrawdecode 2015-04-05 21:59:36 -04:00
marshmellow42
224ce36eb1 lf t5xx - icemans update 2015-04-05 16:37:41 -04:00
iceman1001
aa77d2b125 FIX: the test scripts hade a problem when sending the new configuration block. 2015-04-05 17:02:13 +02:00
iceman1001
5ac81d0f58 CHG: change the snprint call in GetModelStrFromCID. 
CHG: tighten up the maxium allowed errors in Biphase (from 1 to zero allowed errors)
 2015-04-05 14:28:29 +02:00
iceman1001
6c81ae5574 CHG: the default_toys.lua has the index bytes in mix endiansness. I tried to clean it up and verify them. 
CHG: The tnp3clone.lua is now faster, and uses the "wipe" parameter to clean the tag before writing all data.
 2015-04-05 14:27:12 +02:00
marshmellow42
2767fc0291 lf cleaning 
remove unneeded code/functions
fix lfdemod askmandemod bug with maxErr=0
silence output for getting samples in lf search
 2015-04-05 00:58:57 -04:00
marshmellow42
643fb10b2d Merge remote-tracking branch 'upstream/master' 2015-04-04 21:29:16 -04:00
marshmellow42
6e98444637 lfdemod reduce duplicate code 
remove check for best start position in demods and adjust the clock
detect to always return best start position to the demods
also small bug fix in lf em em4x50read
 2015-04-02 23:55:12 -04:00
marshmellow42
23f0a7d862 lfem4x cleanup/add/fix 
changed spacing to tabs for cmdlfem4x.c
finished the partially built lf em em4x50read function
added save/restore GraphBuffer function in graph.c
adjusted some tolerances in lfdemod.c
added a maxLen argument to the askmandemod
 2015-04-02 12:48:52 -04:00
iceman1001
b3a8c87d5c CHG: minor text changes. 
CHG: cmd+2, to skip first inparameter in string.
 2015-04-02 12:08:57 +02:00
iceman1001
7b47fa9b3d CHG: Script now also test to read block 0 via the chinese magic command if the normal read fails. 2015-04-02 12:07:51 +02:00
iceman1001
49dc1d0a9e Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/Makefile
	armsrc/lfops.c
	client/cmdlft55xx.c
	common/ldscript.common
	common/lfdemod.c
 2015-04-01 18:02:10 +02:00
iceman1001
218103efd3 ADD: added some changes from Marshmellow 
CHG: some minor changes to decode output for EM..
 2015-04-01 17:57:07 +02:00
iceman1001
815544537c CHG: code cleanup , added the year control to t55xx trace command. 2015-04-01 17:55:44 +02:00
iceman1001
f2019c773d CHG: minor comments. 2015-04-01 17:53:33 +02:00
Martin Holst Swende
9795e535c9 Compiler correctly identified a buffer overflow, fixed that and made the code use snprintf instead of unsafe sprintf 2015-04-01 09:24:29 +02:00
Martin Holst Swende
d5d6f22718 Merge pull request #91 from marshmellow42/master 
lfdemod.c refactoring  (+ bug fixes)
 2015-03-31 22:11:19 +02:00
marshmellow42
a4669d6ef3 small fix in t5 trace data 2015-03-31 11:30:16 -04:00
iceman1001
02d352fea7 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/iclass.c
	armsrc/lfops.c
	client/cmdlf.c
	common/lfdemod.c
	include/usb_cmd.h
 2015-03-30 21:11:37 +02:00
iceman1001
ec09716a65 CHG: removed some commented code. 2015-03-30 16:32:04 +02:00
iceman1001
ba765c9edc CHG: minor correction to the em410xsim help text. 2015-03-30 16:31:13 +02:00
iceman1001
aa60d1560e NEW: HF MFU SETPWD - set password to a Ultralight C tag. 
NEW: HF MFU SETUID - set UID to a magic UL / UL-C tag.   *not implemented*
CHG: minor alignment for "Hf list" output.
CHG: removed unneeded function parameters to the ultralight commands
CHG: the const MAX_MIFARE_FRAME_SIZE is changed to MAX_FRAME_SIZE in the ultralight commands since the UL-Ev1 can have bigger frames than 18bytes.
CHG: adding DES support for the Ultralight-c read commands on deviceside.
 2015-03-30 16:24:03 +02:00
iceman1001
4076250660 CHG: minor fixes to some tnp luascripts 
ADD:  a script to make a barebone clone for tnp3 on a chinese magic s50 generation 1 tag.
 2015-03-30 16:15:53 +02:00
Martin Holst Swende
caaf9618ae Minor mod to 'hf iclass read', it now also reads and prints the configuration of the tag found 2015-03-29 21:49:58 +02:00
marshmellow42
f8f894a50f rawdemod param cleanup 
plus lfdemod.h cleanup
 2015-03-27 23:47:31 -04:00
marshmellow42
2eec55c8a4 lfdemods streamline & bug fixes 
removed duplicate code countPSK_FC - adjusted countFC to work.
bug fixes & streamlined code in:
lf hid fskdemod
lf em em410xdemod

cleaned up lfdemod.c some
 2015-03-27 00:02:30 -04:00
marshmellow42
e0165dcf3a Fixed indents to Tabs from Spaces 
Spacing changes ONLY - no code changes
 2015-03-25 14:24:36 -04:00
marshmellow42
c7d169ec02 clean up em410x output 2015-03-24 22:11:32 -04:00
marshmellow42
90677ad99b EM410x bug fix 2015-03-24 20:26:14 -04:00
iceman1001
0ec548dc21 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	client/cmdlf.c
	client/cmdlft55xx.c
	client/cmdlft55xx.h
	client/scripts/test_t55x7_bi.lua
 2015-03-24 11:45:31 +01:00
marshmellow42
9680b11d9e remove debugging print calls 2015-03-23 20:25:54 -04:00