RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-07 16:48:15 +08:00
Code Issues Projects Releases Packages Wiki Activity
1450 commits 3 branches 15 tags 87 MiB
Commit graph

1450 commits

This branch
This branch
All branches
Author SHA1 Message Date
iceman1001
984f957105 ADD: some more default keys. 2015-04-26 18:05:06 +02:00
iceman1001
c309eca94a CHG: added some linebreaks for the help output in LF. 2015-04-26 18:03:57 +02:00
iceman1001
11b1e2e506 ADD: "HF 14A READ", got ULTRALIGHT C / EV1 annotation 2015-04-26 18:03:21 +02:00
iceman1001
fb2d24882e Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/cmddata.c
	client/cmddata.h
	client/cmdhfmf.c
	client/cmdlf.c
	client/cmdlfem4x.h
	client/cmdlft55xx.c
	client/lualibs/default_toys.lua
	client/scripts/tnp3clone.lua
	client/scripts/tnp3dump.lua
	client/scripts/tnp3sim.lua
 2015-04-24 19:04:01 +02:00
iceman1001
add0504dea ADD: Started a "collect nonces" concept to be able to analyse the tag generated nonces. 2015-04-24 18:41:49 +02:00
iceman1001
395f6a814f ADD: changes to the Ultralight diviersification algo. 2015-04-24 18:38:24 +02:00
iceman1001
1b3c567df2 ADD: charatect name, level, sequence number, 
CHG: minor code clean up.
 2015-04-24 18:37:40 +02:00
iceman1001
0beb94e67b CHG: some minor code cleanup. 2015-04-24 18:36:11 +02:00
iceman1001
bb84c38196 ADD: found another sub-type, 2015-04-24 18:35:09 +02:00
iceman1001
e8b07838ab ADD: more toy-tokens, among others some missing swapforce. 2015-04-24 18:34:24 +02:00
iceman1001
64ad618e9c ADD: some missing enums: 
ISO14A_SET_TIMEOUT = 0x40,
	ISO14A_NO_SELECT = 0x80,
	ISO14A_TOPAZMODE = 0x100
 2015-04-24 18:33:31 +02:00
iceman1001
abcb166ffe ADD: a minor modification to "HF 14A READ" to enable the correct identification between ULTRALIGHT / ULTRALIGHT-C / ULTRALIGHT EV1 tags. 2015-04-24 18:19:51 +02:00
Martin Holst Swende
a3abb02897 Merge branch 'master' of github.com:Proxmark/proxmark3 2015-04-23 09:51:04 +02:00
Martin Holst Swende
0e6c7336b0 Fixed issue with dumping iclass tags > 2KB in size 2015-04-23 09:50:44 +02:00
Martin Holst Swende
cb8220ee76 Merge pull request #92 from marshmellow42/master 
lf cleanup, dedup & minor additions
 2015-04-14 20:36:10 +02:00
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
iceman1001
5eae566a28 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-04-08 21:24:08 +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
Martin Holst Swende
2c772e6cf0 Added info to changelog about bootroom update 2015-04-06 21:47:09 +02: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
acaeccf841 update changelog 2015-04-03 00:40:38 -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
b8f705e73e ADD: added some changes from Marshmellow 
CHG: minor change to the help text for "LF HITAG WRITE"
 2015-04-01 17:58:35 +02:00