RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-16 06:43:29 +08:00
Code Issues Projects Releases Packages Wiki Activity
1267 commits 3 branches 14 tags 87 MiB
Commit graph

1267 commits

This branch
This branch
All branches
Author SHA1 Message Date
marshmellow42
ae6ead3dc8 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	client/cmdlf.c
 2015-01-13 16:02:23 -05:00
Martin Holst Swende
4e3d8d0f76 Merge pull request #40 from holiman/master 
Iceman's changes
 2015-01-13 19:40:41 +01:00
Martin Holst Swende
896473399b Actually add the FILES also, doh 2015-01-12 22:16:46 +01:00
Martin Holst Swende
55eaed8f2a Documentation to apps.h, documentation/renaming to iclass 2015-01-12 22:08:57 +01:00
Martin Holst Swende
1f6417a9b2 Removed dependency on openssl, added AES implementation from polarssl instead 2015-01-12 21:47:36 +01:00
Martin Holst Swende
68033ed776 Fixed error when no match is found for uidmapping 2015-01-11 21:49:13 +01:00
iceman1001
f004ba08d4 ADD: test_t55x7_psk.lua, a script which writes to block 0 (configation) of a T55x7 tag and tries do verify the psk demods. 12 different test configuration blocks is used. 2015-01-10 19:48:29 +01:00
iceman1001
86dab5168e FIX: arguments took too much. 
FIX:  lf search didn't load from graphbuffer..
 2015-01-10 15:59:05 +01:00
iceman1001
0a43c39617 ADD: scripts/tracetest.lua is a simple script that tries to load from traces folder files starting with EM* and MOD* and runs the following on them one-by-one. "Data load" ; "LF Search" 2015-01-10 15:50:10 +01:00
marshmellow42
ac3ba7ee69 lf search use new psk, small demod adjustments 
adjust thresholds for ask, fsk, io, psk based on more sample testing
adjust indala decode to set clock to 32 if no input (autodetect not
always correct)
 2015-01-09 16:46:17 -05:00
Martin Holst Swende
473124be92 removed double include 2015-01-09 21:51:34 +01:00
Martin Holst Swende
f44a01235c Merge branch 'master' of https://github.com/iceman1001/ForPm3 2015-01-09 21:50:36 +01:00
iceman1001
cb8c358f4d FIX: antenna was not turn off after "hf 14b write" command. The method is using "hf 14b raw" underneath, which meant an parameter "-p" had to be removed. 2015-01-09 21:45:49 +01:00
iceman1001
952a8bb59b Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	client/graph.c
 2015-01-08 22:23:45 +01:00
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
iceman1001
3de045905f ADD: a CmdEM410xWatchnSpoof in cmdlfem4x.c , looks for a tag, then replays it. 
minor code clean up.
 2015-01-08 00:16:33 +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
1d660bb993 Added Pm3-master changes from Holiman. 
REM: removed some old test code to cmdhf15 read.
 2015-01-07 23:52: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
iceman1001
14edfd09c3 CHG: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault. 
Minor code clean up.
Added from Pm3-master which will make this fork one step closer to Pm3-master.
 2015-01-07 22:51:34 +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
c0e6c18bf5 FIX: more minor issues with block Numbers. 
KNOWN BUG: Right now, it kind of defaults to Block 0 when a getparam8 failes. (like  writing "hf mfu rdbl k",  ie a letter instead of number). This bug is the same all over the pm3 source-code.
 2015-01-07 19:01:00 +01:00
iceman1001
5f2cb31bca CHG: spelling errors, added help texts in cmdhfmfu.c 
CHG: refactored the "hf mfu rdbl/wrbl/crdbl/wrbl" commands.
CHG: added a cauth test to "hf mfu info" command to see if the tag is a Ultralight-C tag or not.
 2015-01-07 18:50:51 +01:00
iceman1001
225ccb910e ADD: new defines: iso14443_CMD_AUTH_KEYA, iso14443_CMD_AUTH_KEYB, iso14443_CMD_AUTH_RESPONSE, iso14443_CMD_AUTH_STEP1, iso14443_CMD_AUTH_STEP2, CHINESE_BACKDOOR_INIT, CHINESE_BACKDOOR_STEP2, 
REM: removed old comments in bootrom.c
CHG: mifare ultralight & desfire commands inside arm has been cleaned up. Next step is to refactor it into armsrc/mifaredesfire.c
 2015-01-07 17:42:57 +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