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

1015 commits

This branch
This branch
All branches
Author SHA1 Message Date
Martin Holst Swende
07c808038c Merge pull request #38 from marshmellow42/master 
Add PSK, space to tabs, new trace, bug fixes to clock & demods
 2015-01-08 21:53:20 +01:00
Martin Holst Swende
31d1caa526 Reverted some minor things, altered other things to get it to compile cleanly 2015-01-08 17:51:52 +01:00
iceman1001
03d7b60f2b ADD: default_toys.lua a script which identify tnp3xx tags 2015-01-08 17:36:01 +01:00
marshmellow42
c12512e99a minor code cleanup 2015-01-07 23:02:00 -05:00
marshmellow42
d6d20c5435 cmddata.c changes by others - reapply 
i overwrote some changes in cmdsamples.  i fixed that
i also removed some comments in graph.c
 2015-01-07 19:06:29 -05:00
marshmellow42
3179383f85 put cmdlf.c back (only changes spaces to tabs) 
to make my pull request easier to weed through
i did not make any changes to cmdlf just de-spaced it - so i put it back
for now.
 2015-01-07 18:45:47 -05:00
iceman1001
8e863ab641 FIX: forgot to add the function in the header file. 2015-01-08 00:20:22 +01:00
iceman1001
c3bfb9c76b ADD: a CmdEM410xWatchnSpoof in cmdlfem4x.c , looks for a tag, then replays it. 
minor code clean up.
 2015-01-08 00:17:40 +01:00
marshmellow42
bce5d24494 Merge branch 'master' of https://github.com/marshmellow42/proxmark3 2015-01-07 18:15:14 -05:00
marshmellow42
3aa4014baa Fix Tune Samples (broken in commit 12/31 by me) 2015-01-07 18:14:28 -05:00
marshmellow42
ba1a299ce6 code cleanup. re-added psk commands. 
also fixed a bug in detect clock functions.
sync with master prep for pull request
 2015-01-07 18:14:27 -05:00
marshmellow42
c07b79fcbf sync with master lf files to resolve conflicts 2015-01-07 18:13:27 -05:00
marshmellow42
4118b74dc8 added data psk* cmds for pskdemod 
fixed a couple small bugs in other lf functions as well including
detectaskclock,  stopped changes from being made to graphbuffer.
 2015-01-07 18:13:26 -05:00
iceman1001
787b5bd8a4 CHG: minor code clean up in ArmSrc. 
ADD: added some more default keys in Hf mf nested,  maybe it runs faster :)
 2015-01-08 00:08:33 +01:00
iceman1001
79bf1ad2cc ADD: Jonor's timeout patch for "Hf 14a raw". 
minor code clean up
 2015-01-07 23:23:17 +01:00
iceman1001
b5be31f996 FIX: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault. 
ADD: crc32.c functionality
 2015-01-07 22:56:20 +01:00
iceman1001
024b97c507 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/cmdhf.c
 2015-01-07 22:55:26 +01:00
marshmellow42
809fb6aeab Fix Tune Samples (broken in commit 12/31 by me) 2015-01-07 16:34:02 -05:00
iceman1001
b915fda392 FIX: a solution for the issue "hf mf esave - always saves 4K" 
FIX: a solution for the issue "hf eload, esave, cload, save - filepath variable too short"
CHG: minor code clean up.
ADD: AES / CRC16 for lua. (and tnp3xx scripts.)
ADD: tnp3dump.lua  script to dump tnp3xx tags.
ADD: tnp3sim.lua script to let PM3 imitate an tnp3xx tag. Needs to be tested live
 2015-01-07 22:00:29 +01:00
iceman1001
d91a31f935 CHG: minor code clean up. 
ADD: tunesamples in cmddata.c  pullrequest #33,  was removed by Marshmellows other commits. I returned it.
 2015-01-07 21:29:38 +01:00
Martin Holst Swende
4df54240c1 Added some more protocol support to the list annotation. Based on http://www.proxmark.org/forum/viewtopic.php?pid=13541#p13541 2015-01-07 21:14:32 +01:00
iceman1001
52ab55ab0d ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list. 
ADD: added a manufacturer list in "hf 14a reader",  only viable when UID is double or triple size.  Thanks to Asper for the list.
ADD: detect chinese magic backdoor commands in "hf 14a reader"
CHG: minor code clean up.
 2015-01-07 21:06:15 +01:00
iceman1001
79544b28ad CHG: minor code clean up 
ADD: added some  helper-functions in util.c
 2015-01-07 20:52:03 +01:00
iceman1001
3af373f352 CHG: Added support for tnp3xx in lua scripts. 
ADD: a save file function in lua.
 2015-01-07 20:45:43 +01:00
iceman1001
23b598ee23 CHG: Minor code clean up. 
ADD: crc16.c - new crc16_ccitt calc.
 2015-01-07 20:40:22 +01:00
iceman1001
002c1ce57a CHG: removed leftover debugging statements proxmark3.c 
CHG: hint from Marshmellow that the flag "-lcrypto" needs be also in CFLAGS.
 2015-01-07 11:10:46 +01:00
iceman1001
4888b28195 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-01-07 11:09:05 +01:00
Martin Holst Swende
cb29e00a12 Save iclass dumps to file, like mifare-dump functionality works 2015-01-07 09:57:18 +01:00
marshmellow42
a6293168da code cleanup. re-added psk commands. 
also fixed a bug in detect clock functions.
sync with master prep for pull request
 2015-01-06 23:29:45 -05:00
iceman1001
9484ff3d6e ADD: tnp3xxx identification in luascripts. 
CHG: minor code clean up.
 2015-01-06 21:20:41 +01:00
iceman1001
bf8328e928 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-01-06 20:51:11 +01:00
marshmellow42
9269081341 Merge pull request #4 from Proxmark/master 
resync fork to master
 2015-01-06 14:28:59 -05:00
Martin Holst Swende
d2197f967a Changed io threshold to 140, fixed boolean error in comparison 2015-01-06 18:59:59 +01:00
Martin Holst Swende
e47e52a2c8 Fixed thresholding of io fskdemod 2015-01-06 18:43:37 +01:00
marshmellow42
389d0360e1 Merge pull request #3 from Proxmark/master 
re sync with masterB
 2015-01-06 11:02:11 -05:00
marshmellow42
1c4b102cd5 sync with master lf files to resolve conflicts 2015-01-06 10:58:35 -05:00
marshmellow42
5644791bdb added data psk* cmds for pskdemod 
fixed a couple small bugs in other lf functions as well including
detectaskclock,  stopped changes from being made to graphbuffer.
 2015-01-06 09:20:36 -05:00
iceman1001
3fe4ff4f03 CHG: generic code clean up. Removal of commented code. 
CHG: USB_CMD_DATA_SIZE is now used as maxsize for transfer of data between client and pm3device
CHG: suggested a fix for the underscore problem in ioclass\fileutils.c
ADD:  tnp3xx support
ADD:  nxp tag idents.
ADD:  identifiction of chinese backdoor commands to hf 14a reader.
 2015-01-05 15:51:27 +01:00
Martin Holst Swende
6f101995b6 Added loclass-functionality into the pm3,the functionality provided by loclass can now be invoked directly from the pm3. Also fixed some issues with how prnlog called PrintAndLog, and added some testdata for the loclass self-tests 2015-01-05 09:16:06 +01:00
Martin Holst Swende
39d3ce5dd6 Moved iclass crc to be based on a lookup table 2015-01-04 22:10:25 +01:00
Martin Holst Swende
337818f7ab Minor dox 2015-01-04 21:26:10 +01:00
Martin Holst Swende
4c3de57ad2 Reworked how 'hf 14a list' and 'hf iclass list' works, to use the same method. Now. use 'hf list 14a' and 'hf list iclass' instead. Plus, the output is now annotated (although the annotation-engine could use a bit more love from someone more familiar with the available commands 2015-01-04 21:22:54 +01:00
Martin Holst Swende
c8dd9b092e Some work on iclass dump and iclass list, now the dumping is a lot more stable. I think the comms should be measured and tuned a bit more, right now it kind of works thanks to retry-functionality, but the retries are probably not needed if we are a bit more careful about timing, so we don't send commands too fast for the tag to handle 2015-01-04 14:53:26 +01:00
Martin Holst Swende
2e9d4b3ff4 Some work on iclass, started on some better support in 'hf iclass list' and also fixes to 'hf iclass reader' so it exits better when the button is pressed 2015-01-03 15:11:48 +01:00
Martin Holst Swende
d0d1e24590 Set lower threshold for lf iodemod, it had too high threshold for filtering out noise. Now it works better at least with my antenna/setup 2015-01-03 14:36:38 +01:00
Martin Holst Swende
3400a4358d Fixed indentation 2015-01-03 14:29:22 +01:00
Martin Holst Swende
854b9a233f Removed unused variable 2015-01-03 14:29:07 +01:00
Martin Holst Swende
ae8e8a4372 Corrected indentation to tabs only 2015-01-03 14:21:07 +01:00
Martin Holst Swende
6ca4c6463e Removed wrong size-count, sizeof(bigbuf) would always return 40000 in lfops 2015-01-03 14:17:59 +01:00
Martin Holst Swende
45dda9fcd7 Merge pull request #34 from marshmellow42/master 
Fsk demod fixes and additions to client for offline demoding
 2015-01-01 13:46:48 +01:00