RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-13 18:57:12 +08:00
Code Issues Projects Releases Packages Wiki Activity
1169 commits 3 branches 15 tags 87 MiB
Commit graph

446 commits

Author SHA1 Message Date
iceman1001
5ff3c4017b add: a experimental lualib, unstable. 
fix: Introduced a wrong variable name due to "cut & paste" before, now fixed.
 2015-03-12 09:50:22 +01:00
iceman1001
96f39a47a9 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-11 22:21:01 +01:00
pwpiwi
04bc1c660b fix: hf 14a raw was broken 
(see http://www.proxmark.org/forum/viewtopic.php?id=2351)
 2015-03-11 20:19:30 +01:00
iceman1001
12d708fec1 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/cmddata.c
	client/cmddata.h
 2015-03-10 09:18:35 +01:00
marshmellow42
ada339a10f biphase bug fixes 2015-03-09 15:27:20 -04:00
marshmellow42
712ebfa6df 1 bug fix + code trimming 2015-03-07 23:31:23 -05:00
marshmellow42
df51693f95 Merge remote-tracking branch 'upstream/master' 2015-03-06 12:30:16 -05:00
marshmellow42
78f5b1a77c lf sim fixes/creations correct now 
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim  (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
 2015-03-06 12:28:54 -05:00
marshmellow42
e09f21fa7b Revert "lf sim fixes/creations" 
This reverts commit 293de1bad7.
 2015-03-06 12:26:33 -05:00
marshmellow42
293de1bad7 lf sim fixes/creations 
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim  (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
 2015-03-06 12:25:36 -05:00
iceman1001
3ac59c7fed Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/crapto1.c
	armsrc/iclass.c
	client/nonce2key/crapto1.c
 2015-03-06 09:02:15 +01:00
ikarus
9cefee6f42 Fixed issue #36 & improved file consistency. 2015-03-04 11:00:39 +01:00
marshmellow42
39676885b4 Merge remote-tracking branch 'upstream/master' 2015-03-03 20:44:37 -05:00
Martin Holst Swende
c8387e85e3 iClass full simulation of tags now officially works, with some cheating regarding reader update and write commands 2015-03-02 21:30:22 +01:00
marshmellow42
8d960002c8 lf cmds fix, add, show 
show command to UI:
data printdemodbuffer - allow printing of demod buffer
Add:
data askgproxiidemod - demod a gproxii tag

Fix:
adjust lf simxxx commands further for testing
 2015-03-02 14:42:55 -05:00
Martin Holst Swende
e5cd4ee4b4 Tag MAC finally works! (Full sim not yet, though) 2015-03-02 20:14:35 +01:00
Martin Holst Swende
61fe90736b Implemented the correct way to calculate MAC from a tag, feeding it an extra 32 zeroes. Also divided it up into two parts, one of which can be precalculated by the device before the simulation begins 2015-03-02 00:38:36 +01:00
marshmellow42
73da818743 lf simulation tests 
added SimulateTagLowFrequencyTest function
with some adjustments that help ASK simulations
FSK and PSK still need help.  Left original HID sim alone as for some it
may partially work.
 2015-02-28 14:33:05 -05:00
Martin Holst Swende
c99dc845b1 Added the ciphers also.. doh 2015-02-27 20:19:10 +01:00
Martin Holst Swende
10a8875c72 Implemented new optimized version of MAC-calculation for iclass 2015-02-26 20:35:35 +01:00
marshmellow42
872e3d4d6f NEW lf simpsk 2015-02-21 21:36:02 -05:00
Martin Holst Swende
b19caaefc2 Fixed minor bugs in iclass fullsim, does not work yet though 2015-02-21 20:47:40 +01: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
iceman1001
f4a57e861d Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/iclass.c
	client/loclass/cipher.c
	client/loclass/fileutils.h
 2015-02-19 11:32:11 +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
iceman1001
d716ca2fc1 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/iclass.c
 2015-02-16 18:59:44 +01:00
Martin Holst Swende
e80aeb9695 Started iclass emulator support on device side. Not functional yet 2015-02-14 21:30:26 +01:00
Martin Holst Swende
428d622160 Fixed bug with iclass dump which prevented saving to file 2015-02-14 20:42:23 +01:00
Martin Holst Swende
0cd2a41ac0 Made 125KHz default sampling, instead of 134KHz for LF 2015-02-14 19:55:23 +01:00
iceman1001
68008fb517 add: timeouts for "lf read" 
chg: change command consistency "lf t55xx rd" -> "lf t55xx read"
chg: buffer size used for armside is quite big. maybe to big. takes too long to read.
 2015-02-14 12:29:02 +01:00
iceman1001
4e7af352b4 chg: step two for t55xx commnads 2015-02-13 10:16:21 +01:00
iceman1001
31b3689f0b Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/epa.c
 2015-02-12 09:54:21 +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
0310364d23 chg: the inital modification of t55xx commands to use Marshmellows new demod functions. 
fix:  merged  readblock & readblockPWD command.
      New syntax:    "lf t55xx rd <block> <password>"   -- OPTIONAL password

fix.  merged  writeblock & writeblockPWD command.
      New syntax:    "lf t55xx wr <block> <data> <password>"   -- OPTIONAL password
 2015-02-11 17:13:30 +01:00
iceman1001
4ecde0e1ff Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/iclass.c
 2015-02-10 21:53:16 +01:00
Martin Holst Swende
61972abbdd Merge branch 'master' into GenericTracing 
Conflicts:
	armsrc/iso14443a.c
 2015-02-10 21:25:14 +01:00
iceman1001
1e3a799d47 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-02-10 09:01:31 +01:00
iceman1001
2b61c24212 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/lfops.c
 2015-02-10 08:58:14 +01:00
Martin Holst Swende
904a96cd80 Merge pull request #59 from marshmellow42/master 
lf demod additions/fixes
 2015-02-09 20:28:12 +01:00
pwpiwi
0c8d25ebd8 Fixed: hf mf sim failed on fast reader responses 
In Miller Decoder: don't wait too long for a stable signal
In Miller Decoder: Don't accept sequences of four or more zeroes as start bit
In EmSendCmd14443aRaw: don't wait for emptying the FPGA delay queue if it isn't filled
 2015-02-09 06:51:04 +01:00
Martin Holst Swende
beefe5bc4d Minor dox 2015-02-07 21:22:53 +01:00
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
pwpiwi
3b692427ac Bugfix hw tune, hf tune: voltage measures were VERY wrong 
Modified hw detectreader: display reader field strength in mV units and to be less phony
 2015-02-07 10:14:49 +01:00
marshmellow42
be2cf126bf Merge remote-tracking branch 'upstream/master' 2015-02-06 14:45:46 -05:00