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
1170 commits 3 branches 15 tags 87 MiB
Commit graph

666 commits

Author SHA1 Message Date
iceman1001
3d83b58b50 ADD: added a reference to a generic CRC-8 checksum algo in common/crc.c 2015-03-12 10:10:22 +01:00
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
04a6113fb5 FIX: correct some lookups in tnp3dump.lua, tnp3sim.lua 
ADD: added optional parameter (-p) to tnp3dump.lua
 2015-03-12 09:46:28 +01:00
iceman1001
963fa1c2b8 FIX: minor correction of the command description for HF 14A RAW. 2015-03-11 22:43:49 +01:00
iceman1001
96f39a47a9 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-11 22:21:01 +01:00
iceman1001
3ee8c808c4 ADD: added a CRC64_ECMA implementation 2015-03-11 22:06:23 +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
Martin Holst Swende
58e93ff593 Merge pull request #74 from marshmellow42/master 
new and fixed lf sim commands, lf demod refactoring, data gproxIIdemod
 2015-03-10 00:25:51 +01:00
iceman1001
652c39c63b Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-09 22:03:24 +01:00
marshmellow42
1302428367 finish data printdemodbuffer command 2015-03-09 16:56:00 -04:00
pwpiwi
16a95d76ac fix: (issue #73) hf mf cload didn't work. Add more annotations for Magic Cards operation. 2015-03-09 21:36:27 +01:00
marshmellow42
5658e82e1e sim buffer max settings tests 2015-03-09 15:58:06 -04:00
marshmellow42
ada339a10f biphase bug fixes 2015-03-09 15:27:20 -04:00
marshmellow42
d66d484347 fixed rawdemod help options 2015-03-08 18:07:01 -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
27eabcdccb Added brackets around crc field in protocol listings 2015-03-02 21:05:44 +01:00
marshmellow42
40b9bb85e6 oops... should this file should not have been there 2015-03-02 14:44:05 -05: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
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
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