RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-12 12:41:49 +08:00
Code Issues Projects Releases Packages Wiki Activity
4035 commits 3 branches 14 tags 86 MiB
Commit graph

4035 commits

This branch
This branch
All branches
Author SHA1 Message Date
Martin Holst Swende
10a8875c72 Implemented new optimized version of MAC-calculation for iclass 2015-02-26 20:35:35 +01:00
marshmellow42
ec9882b18c PSKDemod Bug Fix 2015-02-22 21:11:25 -05:00
marshmellow42
3f41e73c7f PSK demod adjustment 
add carrier length test to weed out false positive demods
 2015-02-22 20:09:58 -05:00
marshmellow42
3bc66a96fe added PSK2 to lf simpsk 
testing still ongoing.
 2015-02-21 22:54:52 -05:00
marshmellow42
872e3d4d6f NEW lf simpsk 2015-02-21 21:36:02 -05:00
marshmellow42
b4a2fcf676 Split output from nrz raw demod function 
missed this one last time
 2015-02-21 18:37:15 -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
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
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
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
iceman1001
3a72fdf5b0 CHG: minor modification to "hf mf csetblk" The usuage of UID array is not needed. 2015-02-16 19:01:52 +01:00
iceman1001
5b3811fc0e ADD: added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's 2015-02-16 19:01:09 +01:00
iceman1001
bd8baee9df CHG: added some more token-tags. 2015-02-16 19:00:17 +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
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
e80aeb9695 Started iclass emulator support on device side. Not functional yet 2015-02-14 21:30:26 +01: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
Martin Holst Swende
0cd2a41ac0 Made 125KHz default sampling, instead of 134KHz for LF 2015-02-14 19:55:23 +01:00
iceman1001
6af88242eb Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/util.c
 2015-02-14 12:30:08 +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
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
iceman1001
b359cee677 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-02-13 10:16:39 +01:00
iceman1001
4e7af352b4 chg: step two for t55xx commnads 2015-02-13 10:16:21 +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
iceman1001
31b3689f0b Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/epa.c
 2015-02-12 09:54:21 +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
pwpiwi
7554370c30 bugfix hf 14a sim / hf mf sim: polarity of tag subcarrier modulation was wrong 2015-02-11 21:14:34 +01:00
iceman1001
070e36d421 ADD: identification of EM4233 2015-02-11 17:14:26 +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
00a863f9ad ADD: identification of EM4233 2015-02-11 17:08:16 +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