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

698 commits

Author SHA1 Message Date
Martin Holst Swende e629181f5a Fixed issue where -1 size_t was returned 2015-01-22 21:04:16 +01:00
Martin Holst Swende afceaf4018 Removed openssl from the mfu-stuff 2015-01-22 21:02:21 +01:00
marshmellow42 03e6bb4aed lf FSK demod tools/fixes 
added full ability to detect FSK clocks
applied autodetect of fsk clock to data fskrawdemod
this finished data fskfcdetect (now detects field clocks and bit clock)
 2015-01-22 14:24:03 -05:00
Martin Holst Swende 388c92bde5 Generic tracing pt.4: Deprecated old 'hf 14b list' command 2015-01-22 00:19:20 +01:00
Martin Holst Swende c54d1394c6 Fixed compiler error 2015-01-22 00:10:09 +01:00
Martin Holst Swende 9e8255d4e9 Generic tracing pt.3 : reworking how iso14443b-traces are stored in ARM-memory 2015-01-21 23:53:40 +01:00
iceman1001 df3e429d71 minor fix for a help in "hf 14a snoop" 2015-01-21 21:24:37 +01:00
marshmellow42 ec75f5c10a lf Bug Fixes and lf demod additions 
added data fskparadoxdemod
added data setdebugmode (for demods)
added data shiftgraphzero (to help clean weak reads)
fixed a few bugs with the data detectaskclock
added data fskfcdetect to detect FSK clocks
adjusted most of my demods to put raw tag binary to demod buffer for
future sim and clone commands (psk still needs work)
 2015-01-20 17:28:51 -05:00
iceman1001 a1557c4c2f Minor fixes: Array inits, some array bounds checks. 
ADD: some extra help text for lf snoop
ADD: HasGraphData - function in graph.c
ADD: DetectHighLowInGraph  - function in graph.c
 2015-01-20 22:14:56 +01:00
iceman1001 e469159145 FIX: another file_path found in loadTraceCard and saveTraceCard, is now corrected to follow FILE_PATH_SIZE variable. 
FIX: some filehandles that didn't get closed.
 2015-01-20 21:58:53 +01:00
iceman1001 80b1b53fa3 SUGGESTED FIX: 
Issue: https://github.com/Proxmark/proxmark3/issues/35
Forum:  http://www.proxmark.org/forum/viewtopic.php?pid=7883#p7883

Where "hf mf csetuid"  empties the rest of the block0 bytes.
This fix loads the old block0 and replaces the uid+sak+ataq bytes only.
 2015-01-20 21:55:19 +01:00
iceman1001 fe5b3a4424 FIX: The 14b write command (CmdHF14BWrite) now turns off antenna after call. 2015-01-20 21:50:49 +01:00
iceman1001 e3c235654f Minor fixes to some help-texts. 2015-01-20 21:48:39 +01:00
iceman1001 81740aa519 STEP 3 - the actual new files for Ultralight. 
ADD: script remagic.lua  --  a script to make a "dead" Mifare s50 generation 1 alive again.
ADD: tracetest.lua  - This script will load several traces files in ../traces/ folder and do
"data load"
"lf search"
ADD: test_t55x7_psk.lua   -  iterates thru a lot of calls to check the new psk demods.

all new scripts implements the  "-h"  for help text.
 2015-01-20 21:29:55 +01:00
iceman1001 5ee701292f Step 2 - Ultralight / Ultralight-C 
With this the Pentura Labs / Midnitsnakes's original ultralight / ultralight-c implementation is enhanced and move to its own file. cmdhfmfu.c
 2015-01-20 21:23:04 +01:00
iceman1001 c8b6da2295 Merge branch 'master' of https://github.com/holiman/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h

Step 1 for the Ultralight / Ultralight-c
 2015-01-20 20:59:24 +01:00
iceman1001 5149e37e66 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
 2015-01-20 09:32:53 +01:00
marshmellow42 53d85a8fa1 Merge remote-tracking branch 'upstream/master' 2015-01-18 18:19:26 -05:00
marshmellow42 1e090a61a1 lf demod additions 
data fskfcdetect (field clock and bit clock detect for FSK)
data fskdemodawid -AWID demod/decode
data fskdemodpyramid - AWID demod/decode
 2015-01-18 18:13:32 -05:00
Martin Holst Swende b689b842b6 Bugfix 'hf list 14b' and 'hf list raw' 2015-01-16 22:48:30 +01:00
Martin Holst Swende 41fdd0f061 First stab at adding 'hf list 14b' and 'hf list raw' 2015-01-16 22:41:19 +01:00
Martin Holst Swende 55c7e3520f Merge branch 'master' of github.com:Proxmark/proxmark3 2015-01-16 15:49:11 +01:00
Martin Holst Swende 49726b4088 Improved 'hf list iclass' a bit, better understanding of the protocol and when to apply CRC checks 2015-01-15 23:00:39 +01:00
Martin Holst Swende 5c72368e2d Merge pull request #44 from marshmellow42/master 
small lf demod bug fixes and threshold adjustments
 2015-01-15 21:53:18 +01:00
Martin Holst Swende d60418a05f Synchronized loclass library, imported the legal warning 2015-01-15 16:30:05 +01:00
marshmellow42 84871873a4 Small lf bug fixes and threshold adjustments 
adjusted lf demod thresholds based on additional testing
fixed bug in hid bit length calc in cmddata.c
fixed bugs in lf search
 2015-01-13 17:21:36 -05:00
marshmellow42 ae6ead3dc8 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	client/cmdlf.c
 2015-01-13 16:02:23 -05:00
Martin Holst Swende 896473399b Actually add the FILES also, doh 2015-01-12 22:16:46 +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 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 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 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
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 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
iceman1001 9484ff3d6e ADD: tnp3xxx identification in luascripts. 
CHG: minor code clean up.
 2015-01-06 21:20:41 +01:00
iceman1001 99a714185e CHG: Refactored the HF MFU udump/ucdump commands into one method. 2015-01-06 21:08:20 +01:00
iceman1001 e3ab50cafb CHG: rename the HF MFU * commands. 
ADD: added a HF MFU INFO  commmand, where you can see some tag info. Used to be in the readcard command.
FIX: minor code clean up for ultralight & desfire commands in armsrc/mifarecmd.c, armsrc/mifaredesfire.c, armsrc/mifareutil.c
CHG: Lowered the default MF_DBGLEVEL, it set to MF_DBG_ERROR.
CHG: lowered a testing value for timeout in cmdhf14a.c
 2015-01-06 17:43:31 +01:00
iceman1001 dd683ece72 FIX: a compilation error for a static method in CmdHF14A.h 2015-01-06 15:36:33 +01:00
iceman1001 10403a6a30 ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list. 
ADD: added a manufacturer list for hf 14a reader,  only viable when UID is double or triple size.  Thanks to Asper for the list.
ADD: Some changes from Holimans commits.
CHG: some more code clean up.
 2015-01-06 11:17:02 +01: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
iceman1001 0452ec6c90 FIX: downloaded a fresh clone from my fork, and took away the build-errors. 2015-01-05 15:12:48 +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
iceman1001 d3a22c7dfa ADD: Holimans new changes in master. 2015-01-05 02:01:24 +01:00
iceman1001 f0cf62cd73 FIX: fixed a little bug I introduced from last commit in fskdemod 
CHG: tab fixes in cmdlf.c and minor code clean up
CHG: minor variable name change, printstatement in cmddata.c
 2015-01-04 23:43:07 +01:00
iceman1001 8d0a3e87d7 FIX: a shot at fixing the "_" underscore problem in fileutils.c. This one uses _ifdefine. I hope it works. Linux people can let me know if it works. 
FIX: changed the DetectASKClock in lfdemod.c to correct detect all clocks in the array.
CHG: I like code with more spaces inside of it and tried change some stuff according to our codestyle in HACKING.txt
ADD: some zero checks and overflows, god knows where it was.

The T55XX commands will be rewritten to use Marshmellows lfdemod.c instead.
CHG: Made the graph window smaller.
CHG: lf read  now does a "data samples" also.  (less writing commands)
CHG: data samples now defaults to samples size of 20000
 2015-01-04 22:49:54 +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
iceman1001 b1329a0264 chg: updated the README.txt 
chg: updated the commands.lua so it is in sync with usb_cnd.c definitions.
 2015-01-02 00:09:59 +01:00
iceman1001 0a966150a0 Updated the README.txt 
CHG:  added marshmellows last changes with rtrim, and minor fixes.
DEL:  code cleanup in usb_cdc.c
 2015-01-01 14:07:42 +01:00
marshmellow42 ac914e56db minor adjustment to askmandemod for lf search 
returns false if it finds data but not an EM410x format.
 2014-12-31 14:55:58 -05:00
marshmellow42 9ec1416ad2 added data rtrim command 
enter location to trim all samples after
 2014-12-31 14:43:49 -05:00
iceman1001 c579a5871e CHG: modified cmdlf.c - CmdLFfind with a parameter to accept traces loaded with "data load". ie: "lf search 1" == take data from previously loaded. 2014-12-31 12:01:00 +01:00
iceman1001 6ff6ade2f5 ADD: midnitesnakes desfire, ultralight changes from Unstable branch. 
ADD: Marshmellows fixes for the LF (demods) commands,  (LF SEACH)
ADD: Holimans changes with hash1_brute

FIXES:  minor fixes with some calls to "free" and redundant debug statement and code cleanup. removal of commented code.
 2014-12-31 11:35:43 +01:00
marshmellow42 f822a063b3 lf demod code cleanup - added fskraw arguments 
merged code and added arguments to data fskrawdemod to allow other fsk
mode demodulations (FSK2a = RF/10 & RF/8) another might be (RF/8 & RF/5)
 2014-12-31 02:27:30 -05:00
marshmellow42 d5a72d2fee LF demod/cmd code cleanup + new lf search 
cleaned up and error proof code.  plus added new command    lf search
when online it will lf read - data samples 20000 - and test for EM410x,
HID, IO Prox, and indala cards.  when offline it will test current
graphbuffer.
 2014-12-30 16:08:33 -05:00
marshmellow42 6bfa18eab4 Merge pull request #1 from Proxmark/master 
Test
 2014-12-29 16:14:23 -05:00
marshmellow42 2df8c07907 minor setting adjustments/cleanup 
clean up code
 2014-12-29 15:58:59 -05:00
marshmellow42 66707a3b3c LF Demod bug fixes and add lf em em410xdemod 
fixed a few bugs in lf demod that the streamlining added.  added new lf
em em410xdemod command that loops until button pressed. (similar to lf
hid fskdemod
 2014-12-29 15:32:53 -05:00
marshmellow42 7db5f1ca25 slight adjustment to include 
removed extra unneeded path
 2014-12-28 21:29:33 -05:00
marshmellow42 eb191de615 LF Demod streamlining 
one shared location for demoding lf for arm and client.  also added a
few raw demod commands.
 2014-12-28 20:33:32 -05:00
iceman1001 9c7c222c03 FIX: minor fixes to the new feature in "hf 14a reader". Not turning off the field and the consequent changes to the define names. (CMD_MIFARE_EML_CGETBLO -> CMD_MIFARE_CGETBLO) 2014-12-26 22:38:23 +01:00
iceman1001 d52e4e8819 ADD: HF 14A READER is now able to see if a presented card responses to the chinese magic backdoor commands. 
FIX: simple namechange of some defines where it hinted it was related to "eml" when it wasn't.
 2014-12-26 21:32:58 +01:00
iceman1001 1b492a97af ADD: marshmellows new lf command and DetectClock. (works great!) 
FIX: a suggested patch for "hf mf csetuid" (https://github.com/Proxmark/proxmark3/issues/35)
FIX: fixed a bug in iso14443a_select_card where the len variable wasnt set,  this made desfire/magic cards not work.
 2014-12-26 20:02:59 +01:00
marshmellow42 9e6dd4eb69 rename askrawdemod to askmandemod 2014-12-24 13:01:09 -05:00
marshmellow42 0e74c023bd Created new detectclock function + EM decode addons 
new detectclock is somewhat more reliable for ASK modulated tags.  added
this detect to askrawdemod if no clock in passed as an argument.  also
added more EM ID formats to output
 2014-12-24 11:48:41 -05:00
marshmellow42 cd48c19c31 minor askrawdemod adjustment if errors in demoding are found 
if it can't find a demod position with no errors it will find the one
with fewest errors and mark errors with 77.
 2014-12-23 15:16:53 -05:00
marshmellow42 2fc2150ea8 Add auto check for EM410x format to askrawdemod cmd 
added EM410x format check and print to the data askrawdemod command.  if
it finds valid em410x format & parities it will print the EM ID and
Unique ID and a few others.
 2014-12-23 12:00:13 -05:00
pwpiwi 52bfb95543 bugfixes in iso14443a.c and hf 14a reader 
- introduced with the big frame and parity support (commit 6a1f2d82): tag responses with len%8 == 0 were dropped  - thanks iceman for testing and finding
- after unsuccessful hf 14a reader the field stayed on. Thanks to iceman for proposing the fix.
 2014-12-23 11:21:42 +01:00
marshmellow42 ea7d657f75 minor fix - got too comment happy removing test code 
should not have commented this code out
 2014-12-22 22:50:13 -05:00
marshmellow42 e888ed8e62 added new data askrawdemod command 
added new data askrawdemod command returned data fskdemod and separated
out new fskrawdemod commands
 2014-12-22 17:46:28 -05:00
iceman1001 3bc3598e88 added the changes from PM3 master. 
added some code for the AWID26
 2014-12-22 15:14:05 +01:00
pwpiwi 545f203826 adapted hf iclass list to new trace format 2014-12-20 21:32:44 +01:00
marshmellow42 ae2f73c12d put ask demod and mandemod 
put ask demod and mandemod back until i have time to test it
 2014-12-19 12:39:41 -05:00
marshmellow42 b3b706693b Final touches on IO prox and HID prox demod 
makes both more robust and handles various error situations.
 2014-12-19 12:14:27 -05:00
iceman1001 f5ed4d12de ADD: started with adding a LF AWID26 write function. not done yet. 
ADD: latest pwpiwi & holiman changes.
 2014-12-19 13:46:02 +01:00
pwpiwi db4de4d82f Merge branch 'master' of https://github.com/Proxmark/proxmark3 2014-12-18 19:42:49 +01:00
pwpiwi 57642f63fa bugfixes hf epa cnonces 
- extended length (more than 1 byte) not handled correctly
- nonces not printed on Windows due to type mismatch
 2014-12-18 19:40:35 +01:00
pwpiwi f10bf20c6c Format hf 14a list output for bigger frame sizes 2014-12-18 19:39:16 +01:00
Martin Holst Swende 8e9768399c minor change 2014-12-18 14:46:38 +01:00
Martin Holst Swende 0eea34a2a3 Fixed error in hash1 (from loclass), now it possibly calculates the KSel correctly for actually dumping data 2014-12-18 14:41:17 +01:00
Martin Holst Swende 7496d8d822 Merge pull request #32 from marshmellow42/master 
Fixes and additions to lf io fskdemod  and addon parameter to lf hid fskdemod
 2014-12-18 08:56:26 +01:00
iceman1001 d3499d369d minor fixes regaring the newly released patches from the pm3 community 
plus removed old comments in cmdmain.c
 2014-12-17 22:26:16 +01:00
pwpiwi 2bdd68c370 unify/refactor hw tune and data tune 
- unified hw tune and Enio's great data tune
- don't use BigBuf (and hardcoded Offset)
- removed special handling of CMD_MEASURED_ANTENNA_TUNING
  in UsbCommandReceived()
 2014-12-17 20:57:26 +01:00
iceman1001 a501c82b19 Applied Holiman's fixes for iclass.c and CSNs 
Applied PwPiwi's new parity fix.
Applied Marshmellw's fixes for FSKdemod (HID, IO)

FIX: a potential bigbuffer fault given pwpiwi's change inside lfops.c CmdIOdemodFSK & CmdHIDdemodFSK
FIX: change some "int" parameters to uint's.
FIX: changed the lfops.c -  DoAcquisition125k_internal  to respect pwpiwi's definitions of FREE_BUFFER_OFFSET

HEADS up:  The ultralight functions hasn't been verified since pwpiwi's changes.
 2014-12-17 20:33:21 +01:00
marshmellow42 083ca3de73 LF HID & IO prox fixes/options 2014-12-17 09:51:40 -05:00
pwpiwi 471c514167 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2014-12-16 07:47:02 +01:00
pwpiwi 6a1f2d82bb bugfixes iso14443a (hf 14a commands) 
- buffers were too small to handle 256 byte frames
- parity bits were only handled for up to 32 byte frames
- trace format was inefficient
- removed parity calculation from decoders in iclass.c (parity not used on air anyway)
 2014-12-16 07:41:07 +01:00
Martin Holst Swende 6116c79618 Reverted to original malicious CSNs from paper, it appears legit readers does not accept if they dont end with F7,FF,12,E0 2014-12-14 21:37:56 +01:00
Martin Holst Swende b160432340 Merge branch 'master' of github.com:Proxmark/proxmark3 2014-12-14 18:07:38 +01:00
Martin Holst Swende eabba3df7e Fix (iclass) 2014-12-14 18:07:12 +01:00
András Veres-Szentkirályi 0ff9a93966 Typofix: occurrences 
It's spelled with two rs.
 2014-12-10 16:42:31 +01:00
Martin Holst Swende d6a120a25b Added Enios cool tuning-trick (LF) from forum-post: http://www.proxmark.org/forum/viewtopic.php?pid=13060#p13060 2014-11-30 22:30:36 +01:00
iceman1001 02306bac2d ADD: Enio's intuative function for the command: "hw tune", where you plot the tuning-data :) 
ADD:  added optional parameter to "hw tune" to show graf direct. Sample usage: "hw tune p"
 2014-11-30 19:16:28 +01:00
iceman1001 06b58a94f0 BUG: don't try to fix things that ain't broken.. or not. My try for a fix ended up making the PrintAndLog function stop working. Just by calling a fclose.. fixed. 2014-11-27 22:16:17 +01:00
iceman1001 95e635947b ADD: the option to simulate tnp3xxx inthe command "hf mf sim" 
ADD: found some new default keys
ADD: changed alot of memorys buffers to use constant values.  like usbbuffer sizes, tracelogs, etc etc
ADD: all changes Peter filmoore has in his pull request.
 2014-11-26 13:52:39 +01:00
iceman1001 463ca973e7 FIX: hf mf eload - now supports specifying 0,1,2,4 in card memory for the file to be loaded. 
FIX: hf mf esave - now supports specifying  0,1,2,4 in card memory for the file to be saved.
ADD: data.h -  added FILE_PATH_SIZE constant
ADD: hf legic load - a command help and checks for FILE_PATH_SIZE
ADD: hf legis save - now checks for FILE_PATH_SIZE
ADD: lf hitag - now checks for FILE_PATH_SIZE
ADD: util.c - AddLogLine now checks for FILE_PATH_SIZE
ADD: data load / save  - now checks for FILE_PATH_SIZE
FIX: ui.c - added a case of closing a filehandle
FIX: hf mf cload / csave now checks for FILE_PATH_SIZE
FIX: armsrc/mifarecmd.c - adjusted the buffersize in MifareEMemget from 48 to USB_CMD_DATA_SIZE
 2014-11-16 11:22:06 +01:00
iceman1001 961658bba9 FIX: rewrote the help text, cleaned up the code 2014-11-14 13:32:11 +01:00
iceman1001 bd5d0f07e9 REN: renamed tnp3.lua to tnp3dump.lua since that name is more explainatory 
ADD: added tnp3sim.lua  a script which loads a dump and sends it to the pm3 device memory.
 2014-11-14 13:24:45 +01:00
iceman1001 b22f7a6bc6 FIX: Minor correction of variablename. don't even ask. 2014-11-13 22:23:30 +01:00
iceman1001 85578fcd4e FIX: since the "hf mf ecfill" command supports 0,1,2,4 in card sizes, I consequently changed "hf mf ekeyprn" 2014-11-13 22:21:39 +01:00
iceman1001 a0bf7ba787 FIX: The hf mf ekeyprn defaults to print all 40 sectorblocks of keys. (ie 4K card). Now its optional 1K / 4K and defaults to 1K. 2014-11-13 22:13:46 +01:00
iceman1001 5c065fa089 FIX: Corrected the bug mention http://www.proxmark.org/forum/viewtopic.php?id=1612 filepath too short in "hf mf eload / esave / cload / csave" commands. Length was 14, is now 250. Should be enough for awhile. 2014-11-13 22:02:36 +01:00
iceman1001 f91f0ebb35 CHG - some lua functions in utils.lua 2014-11-13 20:14:14 +01:00
iceman1001 47cbb2d418 ADD: tnp3.lua can now validate the checkums in the dump 
ADD: added  CRC16 CCITT functionality to LUA
FIX: tnp3.lua is now correctly decryping data while dumping
 2014-11-12 23:18:46 +01:00
iceman1001 f595de25e9 ADD: html_dumplib.lua, added the functionality to save text-files. 
ADD: tnp3.lua, now will save the dumped data to BIN and EML
FIX: tnp3.lua, added some clearcommando buffer to help the pm3 not to be blocked
 2014-11-10 21:46:21 +01:00
iceman1001 cd5767d43d FIX: I think the dumping of data is correct now in tnp3.lua. MD5 string vs bytearrays in lua are tricky 
ADD: utils.lua some functions to convert between ascii, bytes and strings.
 2014-11-09 19:29:47 +01:00
iceman1001 22f1c57786 Updated tnp3.lua 
added some possibilities to abort the "hf mf nested" command
added a rudimentary items identification for tnp3xxx
 2014-11-09 17:22:04 +01:00
iceman1001 9b989c45b9 FIX: minor parseing bug when loading dumpkeys.bin file. 
ADD:  added some useful helperfunctions to utils.lua
 2014-11-05 19:16:54 +01:00
iceman1001 1a5ff2c2a7 FIX: fixed the layout of data in tnp3.lua 2014-11-03 22:29:43 +01:00
iceman1001 8aa79dee20 FIX: added some tnp3xxx identification i formatMifare.lua 
FIX: tnp3.lua is more or less finished. Needs testing.
 2014-11-03 21:59:31 +01:00
iceman1001 c70cef9734 fixing scripts/tnp3.lua 2014-11-03 15:25:54 +01:00
iceman1001 c15d2bdc9b ADD: added identification for Mifare TNP3xxx tags. 
ADD: MD5-lua functionality
ADD: AES 128 decrypt lua functionality
ADD: test luc script for reading TNP3xxx tags
CHG: testing some changes for "hf 14b sim" / "lf em4x 410xsim"
 2014-11-03 13:49:19 +01:00
Martin Holst Swende ca4714cd23 More coverity fixes 2014-10-30 21:49:18 +01:00
iceman1001 0222acfcf3 ADD: Implemented a "hf 14b write" function using the CmdHF14BCmdRaw method. The function can write to SRI512 and SRIX4K tags only. Be extremly cautious when writing to Block 0xFF 2014-10-30 15:28:45 +01:00
iceman1001 5ea2c88515 FIX: maybe I should actually send the uid bytes with the command request.... 2014-10-30 14:29:31 +01:00
iceman1001 3649b640e6 CHG: added possiblity to send <UID> into the "HF 15 SIM" 2014-10-30 14:11:37 +01:00
iceman1001 a61b4976bd FIXED: Merged all Holimans code-review issues which should fix a lot of memoryleaks. 2014-10-30 00:09:01 +01:00
Martin Holst Swende 97d582a692 More coverity findings 2014-10-27 22:33:37 +01:00
Martin Holst Swende 90e278d3da Fixed several issues found using a coverity-scan 2014-10-27 21:46:04 +01:00
iceman1001 7c756d6892 FIX: Another try to see if the "lf em4x 410xsim" becomes better, added the clock in the calls since the auto detection of the clock seems to be wrong. I get 67, instead of 64... 
FIX:  changes the transfersize from sim -> pm3,  was 48, now USB_CMD_DATA_SIZE (512) Much faster!
 2014-10-27 21:42:41 +01:00
iceman1001 2ae8a312e0 Inital test for the "lf em4x 410xsim / lf em4x 410xwatch" which I try to verify that the sim works. 
Something about speed,  the clock detection is not so good.  should be 64,  usually 67..
 2014-10-27 19:46:21 +01:00
iceman1001 1010aacca0 Minor corrections in fskdemod i lfops.c , see Holimans branch. 
BUG: fixed a variablename, that didn't get changed.
 2014-10-27 09:56:18 +01:00
iceman1001 c6be64da09 Some more nasty bugs fixed in the lf t55xx manchester_decode method. 
ADD: a little function to see if GraphBuffer is not used.
 2014-10-26 23:16:25 +01:00
iceman1001 db297e69e1 BUG: fixed a bug with the initialization of IV in cmdhfmfu.c CmdHF14AMfucAuth 2014-10-26 21:30:29 +01:00
iceman1001 149aeadaa6 Minor bug fixes with help from Holiman. 
FIX: sprint_hex, sprint_bin  has better length detection.
FIX: ui.c has removed all c99 array declarations, with malloc
FIX: hfmfmfu.c wrong length in one array caused crashes in CmdHF14AMfURdCard
FIX: cmdlft55xx.c CmdDump has now a correct pwd string.
 2014-10-26 21:25:06 +01:00
Martin Holst Swende f97d4e2378 First try att merging with head 2014-10-24 20:46:02 +02:00
iceman1001 081151eabb FIX: data mandemod read the wrong part of BigBuffer (no correct offset) 2014-10-24 15:34:50 +02:00
iceman1001 c2d25819d8 BUG: the lf read now uses "getbigbuffer" which the offset from where the data starts in "data samples nnnnn" needed to be set. 
ADD:  ioprox nxp identifikations
 2014-10-24 00:04:56 +02:00
iceman1001 72e930ef32 FIXED: lf t55xx fsk now demods but only to binary. 
ADD:  holimans lf io / hid fskdemod  changes.
 2014-10-23 18:36:44 +02:00
iceman1001 fbceacc5b8 add: "lf t55xx info" option to use data from Graphbuffer. 
add:  "lf t55xx trace"  option to use data from Graphbuffer.
 2014-10-16 22:25:38 +02:00
iceman1001 7bd30f12ac Small fixes, 
Fix: removed a call to free,  which I think made linux people unhappy during "lf t55xx rd 0"...
Add: "lf t55xx fsk"  now kind of outputs binary from "FSK2a R/40 R/50"..
 2014-10-16 15:05:27 +02:00
iceman1001 7737657747 Fixed: the dampening field detection is enhanced. If half a frame (clock rate) of values is within 40% of the mean value then it is a dampening field. 2014-10-07 21:34:02 +02:00
iceman1001 f6c18637ca chg: LF t55xx trace 
new:  LF t55xx info
 2014-10-06 19:42:50 +02:00
iceman1001 75465377b9 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/iclass.c
	client/Makefile
	client/cmdhficlass.c
	client/loclass/cipher.c
	client/loclass/fileutils.c
	client/loclass/ikeys.h
	include/usb_cmd.h
 2014-09-19 10:50:34 +02:00
Martin Holst Swende e6ee6c4cd1 Merge remote-tracking branch 'origin/master' into PenturaLabs-iclass-research 2014-09-19 09:45:38 +02:00
iceman1001 3d93d4f940 Add: simple Application enum. 
Fix:  Minor overflows found by Holiman.
 2014-09-18 14:15:48 +02:00
iceman1001 313ee67ea2 Fixed: "hf mfdes info" 2014-09-18 12:38:31 +02:00
iceman1001 b44e523300 LF t55xx and LF em4x commands now should manchester decode data. However t55xx can have other settings and different encodings. 2014-09-16 13:56:06 +02:00
iceman1001 35147d51e3 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2014-09-14 17:36:00 +02:00
pwpiwi c626c56ef5 hf mf dump bugfix: wrongly tried key A instead of key B for a specific Access Condition 2014-09-12 07:45:04 +02:00
iceman1001 76c7e6c363 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/cmdhfmf.c
 2014-09-11 23:29:14 +02:00
iceman1001 f38a152863 First check in. 2014-09-11 23:23:46 +02:00
iceman1001 4a79e52c0b Added piwis patch, 
first version of finding out the card size. Experimental.
 2014-09-11 22:33:43 +02:00
pwpiwi 79db03ef63 hf mf dump error handling, revive hf mf chk d option, provide known keys dictionary file 
- hf mf dump: abort on unrecoverable errors. Don't create file dumpdata.bin in this case.
- hf mf chk: re-enabled and fixed option d (dump keys to dumpkeys.bin).
  if there are unknown keys, write 0xffffffffffff instead to the file.
- provide a default key dictionary file for hf mf chk (default_keys.dic). Contents taken from
  mf_default_keys.lua
 2014-09-11 20:58:34 +02:00
pwpiwi baeaf57950 fix/add support for 4K (and other non 1K) card sizes in hf mf commands 
- hf mf rdsc (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39
- hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards
- hf mf dump (add): added (optional) card size parameter and support for non 1K cards
- hf mf dump (fix): Access Condition 011 not handled correctly (tried to access with key A)
- hf mf restore (add): added (optional) card size parameter and support for non 1K cards
- hf mf nested (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39
- hf mf nested (fix): always dumped 16 keys to dumpkeys.bin instead of correct number
- hf mf chk (fix): always dumped 16 keys to dumpkeys.bin instead of correct number
- hf mf eget (fix): displayed three instead of one block
- hf mf eload (add): load 4K .eml files (but accepts 1K .eml files for backwards compatibility)
- hf mf esave (add): always save the whole emulator memory (4K) instead of 1K only
- hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards
 2014-09-10 19:04:50 +02:00
Martin Holst Swende fdefed663f Some more lua-scripts and library fixes from iceman, including more default keys 2014-08-29 09:11:36 +02:00
Martin Holst Swende 5b1311fba2 Various scripts from iceman 2014-08-29 09:09:23 +02:00
pwpiwi b03c0f2d86 bugfixes hf mf sim 
- output of debug messages caused communication failures due to timing issues.
  hf mf dbg 4 now required to see these debug messages.
- changed help text for hf mf dbg
- fixed minor bugs in help texts for hf mf sim and hf mf ecset
- display "key A" or "key B" instead of "key=0" or "key=1 in hf mf sim
 2014-07-30 21:23:02 +02:00
pwpiwi 991f13f27d minor bugfixes to hf mf sniff and hf 14a snoop 
- tracing was not always enabled when starting hf mf sniff or hf 14a snoop
- ATQA was displayed in wrong byte order in hf mf sniff
- 4 Byte UIDs were displayed as 7 Byte UIDs (padded with 0x000000) in hf mf sniff
- same for logfile names.
- assignment (=) had been used instead of == in comparisons (shouldn't have been relevant though)
 2014-07-15 08:39:56 +02:00
pwpiwi 9a573554e0 minor bugfix and enhancement to hf 14a reader 
- "SAK incorrectly claims ... " message was displayed incorrectly
- now decodes FSCI, SFGI, FWI and displays FSC, SFGT, FWT resp.
 2014-07-15 08:35:27 +02:00
pwpiwi 1604d0a290 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2014-07-01 07:09:21 +02:00
Martin Holst Swende 9e28ee9f14 Only documentation and minor changes 2014-06-30 11:23:14 +02:00
pwpiwi 19d6d91fd5 hf 14a reader enhancement 
In order to be able to distinguish between Mifare Classic and Mifare Plus
in Security Level 1 (SL1, Mifare Classic Compatibility Mode), hf 14a reader
now always tries RATS - even if SAK claims not to support ISO14443-4.
 2014-06-30 08:21:50 +02:00
Martin Holst Swende 9b82de75f4 more work towards iclass elite dumping.. not quite finished yet though :( 2014-06-30 00:20:40 +02:00
Martin Holst Swende aa41c6058a Merged two iclass-reader functions into one to remove duplicated code, update loclass library with hash2 algo 2014-06-29 23:34:24 +02:00
Midnitesnake 74a3880283 Changes inorder for iclass dump to work correctly 2014-06-29 09:25:31 +01:00
Martin Holst Swende 26c0d833ac Some minor changes [iclass-related] 2014-06-28 22:57:48 +02:00
Martin Holst Swende 3ad48540d4 Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research 
Conflicts:
	README.txt
	armsrc/apps.h
	client/Makefile
	client/cmdhficlass.c
	client/cmdhficlass.h
 2014-06-28 20:52:37 +02:00
Martin Holst Swende 42f57e0294 Merged with master 2014-06-27 13:16:31 +02:00
Martin Holst Swende 77abe781af fix for better csns 2014-06-27 12:52:28 +02:00
pwpiwi 72b1090acf Bugfixes: 
- Byteorder was wrong when displaying ATQA in hf 14a read
- 7 Byte UIDs were truncated to 4 Bytes when displaying in hf 14a cuids
 2014-06-26 07:57:49 +02:00
iZsh b014c96d68 new command "lf snoop" to snoop raw ADC values 
fpga/lo_read.v (lf_field): new argument.
fpga/fpga_lf.v: modify accordingly.

armsrc/apps.h (FPGA_MAJOR_MODE_LF_READER): Rename as FPGA_MAJOR_MODE_LF_ADC.
armsrc/apps.h (FPGA_LF_ADC_READER_FIELD): New LF option.
armsrc/lfops.c: Modify accordingly.

client/cmdlf.c (CmdLFSnoop): New command.
armsrc/appmain.c, armsrc/lfops.c, client/cmdlf.h, include/usb_cmd.h: Modify accordingly.
 2014-06-21 21:33:54 +02:00
iZsh 7cc204bff8 THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand. 2014-06-20 01:02:59 +02:00
penturalabs fecd8202a5 implemented 'hf iclass dump xxxx', 
all you need is the magic key to dump contents of an iclass card
 2014-06-17 10:55:37 +01:00
Martin Holst Swende 9f6e9d1575 More work on iclass simulation attack 2014-06-16 21:27:12 +02:00