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

825 commits

Author SHA1 Message Date
iceman1001 4b78d6b317 CHG: having a go at finding the WDT death second time we run "hf mf mifare"... 2016-02-10 21:46:52 +01:00
iceman1001 5192a0a689 CHG: syntax suger 2016-02-10 21:45:03 +01:00
iceman1001 b7536e11e1 FIX: added @marshmellow42 's fixes for StandAloneMode. Some debug printed wrong sized hex and the call to CopyHIDtoT55x7 had the parameters in wrong order. 2016-02-10 17:33:12 +01:00
iceman1001 bd9dfaa891 CHG: Syntax suger 
EXperimented:  unfolded a loop.
 2016-01-25 20:24:23 +01:00
iceman1001 4c0cf2d215 Experimeting with finding the "WDT_HIT" bug in "Hf mf mifare", which not shows if "hf mf dbg" is set to 3 or more... 2016-01-25 20:21:11 +01:00
iceman1001 5f5254d631 FIX: Possible usage of NULL. 2016-01-25 20:19:47 +01:00
iceman1001 65c2d21d05 CHG: Syntax suger 2016-01-25 20:19:15 +01:00
iceman1001 da198be4b5 CHG: Syntax suger 2016-01-25 20:17:08 +01:00
iceman1001 810f53792e ADD: added the possibility to choose which block num to attack with "hf mf mifare" Before it only worked on block 0. 2016-01-20 22:26:01 +01:00
iceman1001 5ebcb867a3 FIX: Some uninitialized variables, some syntax suger, and some extra WDT_HIT calls inside "ReaderMifare" to stop it from trigger when running multiple times in a row. 2016-01-20 19:53:58 +01:00
iceman1001 d798d31cbe FIX: Coverity scans, uninitialized variables, 
CHG: unfolded some loops..
 2016-01-20 17:44:51 +01:00
iceman1001 4a71da5a35 FIX: Coverity Scan complains about resourceleaks, array reads outside of index, uninitialized variables. 2016-01-20 17:13:25 +01:00
iceman1001 bf22fab73b FIX: Coverity Scans complain about uninitialized usage of struct. Setting s->ODD and s->EVEN to zero should do the trick. 2016-01-20 11:31:24 +01:00
iceman1001 495d7f1326 FIX: Coverity scan, forgot one fread ... 
CHG: Syntax suger
 2016-01-19 22:25:34 +01:00
iceman1001 8130eba4d1 CHG: Syncronized so all different parts uses the same implementation of Crapto1 v3.3 2016-01-19 18:01:16 +01:00
iceman1001 7d5169a0e9 CHG: minor change initializing array. 2016-01-19 16:59:06 +01:00
iceman1001 02a405967e CHG: The nonce from "hf mf nested" is fixed to this one, why is that one selected? Why not just all zeros or ones? 2016-01-19 16:32:29 +01:00
iceman1001 9974991e4b CHG: Syntax suger 2016-01-19 16:31:38 +01:00
iceman1001 417f4ae127 CHG: Crapto1 v3.3 for the ARMSRC 2016-01-19 16:19:59 +01:00
iceman1001 c2d2a5a6b5 CHG: Tried to unfold some loops inside ARM/crypto1 imp. It can't hurt, feels stabil. 2016-01-13 22:24:12 +01:00
iceman1001 0d5ee8e245 ADD: @pwpiwi 's latest changes to 'hf mf hardnested' 2016-01-13 09:31:13 +01:00
iceman1001 5cc88edfaf CHG: syntax suger 2016-01-09 17:19:09 +01:00
iceman1001 dd79e03a1a ADD: a new pwdgen algo Nicknamed C, (Huge props to @Bettse for everything) also added to the "hf mfu info" command. However, that will not work given the system's lockbits.. :( Maybe I'll add a function to test all imp pwdgens given a UID without making a authentication call to tag. 
ADD:   BSWAP_32 macro, for changing endianness.
 2016-01-09 17:17:36 +01:00
iceman1001 7f6ccd3926 FIX: coverty scan defects. 
- bigbuf.c  is comparision correct (iLen versus numofparity)
- cmdhfepa.c  resourceleak, add a call to free
- cipherutils.c  resourceleak, added calls to free
 2016-01-08 15:28:24 +01:00
iceman1001 614da335f6 Syntax suger, making the code easier to read (for me at least) 2016-01-08 14:26:35 +01:00
iceman1001 ab7bb49475 FIX: coverty scan reveals some resourceleaks and overruns, which is supposed to be fixed now. 
/armsrc/des.c   overflow 7 instead of 6
/client/cmdlfhitag.c  overflows traclen
/client/util.c   sprint_bin_break  overflows.
/client/cmdhficlass.c   need to free memory after malloc.

ADD:  RotateRight macro in util.h
 2016-01-08 14:25:10 +01:00
iceman1001 09181a5462 code clean up, added some comments to hitag 2016-01-03 17:17:44 +01:00
iceman1001 c35145bf7a FIX: the usb_poll_validate_length() check should be inversed, thanks @marshmellow42 2015-12-22 16:14:03 +01:00
iceman1001 9332b857ff ADD: @marshmellow42 's fixes for Q5, t55xx, fskclock, 
ADD:  got tired of always writing wrong "hf 14a list",  so I hooked it back up to call the "hf list" with argument. Things becomes smoother that way.
 2015-12-16 11:01:46 +01:00
iceman1001 2b1f4228c2 ADD: @marshmellow42 's changes to "hf mfu *" , 
ADD: @marshmellow42 's changes to "hf mf sim",
ADD: @pwpiwi 's parity files was missing.
 2015-12-15 09:34:55 +01:00
iceman1001 f8ada309e9 ADD: @pwpiwi 's latest code from his 'hardnested' branch. 2015-12-15 08:51:29 +01:00
iceman1001 508b37ba9c REM: removed an unused doublett function "printBits" in util.c 
ADD:  added a new string helper function "sprint_hex_ascii" in util.c
ADD:  added "LF AWID BRUTE", a very simple bruteforce command for the awid commands.
      it takes a facility-code,  and iterates all possible 0xFFFF cardnum by sending sim command. It also uses the usb_poll function to stop the bruteforce on keypress and not leaving the pm3 device running the simulation.
the command implements the help parameter.
 2015-12-14 22:50:54 +01:00
iceman1001 8ce3e4b4e9 add: missing two hard_nested files.. 2015-12-02 16:48:25 +01:00
iceman1001 3f26796673 FIX: the lfsampling.c for t55xx had a tendecy to enter a neverending loop. Moved exit branch into the while statement, which seems to solve it. 
FIX: Strange int -> uint8_t casting behavior  (0x05 gets the 25bit set and becomes 0x10005 instead) in fskdemod,  removed int and sscanf.
 2015-12-01 22:38:37 +01:00
iceman1001 c188b1b9b2 ADD: @go_tus simple bruteforce for t55xx, refactored a bit. 
ADD: @pwpiwi 's implementation of Hardnested
 2015-11-27 16:24:00 +01:00
iceman1001 1a570b0a6a CHG: Missing some headers 
FIX: some message/warning in pm3_binlib.c  @gm4tr1x
 2015-11-23 10:49:16 +01:00
iceman1001 e9a92fe237 FIX: the read counter in "hf 14a sim" (for ntag/ev) should work better now. Instead of always returning zero, it increases aswell. 
--Started to add the TI demod into the 'LF SEARCH"
 2015-11-22 21:48:15 +01:00
iceman1001 a126332a7b ADD: @marshmellow's fixes to awid, viking and T55x7 
ADD: 'lf t55xx detect' now can be called with a password.
ADD: trying to add the read counter and increase counter commands for ntag sim.
 2015-11-22 17:33:41 +01:00
iceman1001 6426f6ba86 @marshmellows last LF changes. 
- wipe a t55x7 tag
- stable demods
-
 2015-11-20 16:56:43 +01:00
iceman1001 0956e0dba5 FIX: an error that I introduced to the csetblock command with wrong length of crc calcs. 
CHG:  variable name in csetblock change.  just trying to be consistant.
ADD:  code clean up in hf 14a,  added some help text methods.
 2015-11-10 11:45:45 +01:00
iceman1001 70459879e9 added @marshmellows new viking demod. 
adjusted it to fit with the clone/demod  that is under  "lf viking" commands.

did some code clean up,  3spaces into tab.
 2015-11-10 11:42:59 +01:00
iceman1001 edaf10af99 CHG: minor code clean up, removed commented old code. 
ADD: usb_poll_validate_length  to some deviceside loops.
ADD: @marshmellow42 's fixes to LF
 2015-11-09 21:51:34 +01:00
iceman1001 7c5f2ced5b ADD: @piwi's fixes to "hf snoop" where it empties the bigbuffer before snooping. 2015-11-09 21:48:09 +01:00
iceman1001 c2731f37be CHG: a major remake of the "hf mf c*" commands. Ie chinese magic tags. Tried to make them consistent in parameter calls and simplified. And fixed the annoying gen1 tags that answers with a ACK/NACK on HALT commands.. 2015-11-09 21:46:15 +01:00
iceman1001 94422fa23f ADD: @marshmellow42 's fixex and resetread t55x7 2015-11-02 20:46:17 +01:00
iceman1001 acd7ccdbc9 CHG: some magic generation1 tags is not following protocol and answers to the "halt" command. This gives an error and makes the users think something went wrong. This also affected the magic identification in "Hf 14a reader" command, where it in those moments stated "NO" even if the tag is indeed a generation1. 2015-11-01 22:16:16 +01:00
iceman1001 afa86e5c03 ADD: help text for 'hf snoop' / 'hf search' / 'hf list' 
CHG: minor code changes.
CHG: makefile ,  moved hi_sniffer.v from LF into HF row.  @piwi suggestion for PR https://github.com/Proxmark/proxmark3/pull/141
 2015-11-01 19:49:08 +01:00
iceman1001 857bc2ff6a CHG: some desfire changes from @bforbort fork. *untested* 2015-10-30 09:09:35 +01:00
iceman1001 1d0ccbe04b ADD: added the "hf snoop" patch original from @Enio, rearranged by @Etmatrix. 
ADD:  added the "t55x7" refactoring by @marshmellow42
 2015-10-27 21:47:21 +01:00
iceman1001 1c8fbeb93e ADD: 'LF T55X7 WAKEUP' command. For tags with AOR bit set, send this command with password to wake tag up and be able to do a "LF SEARCH" etc on it. 
CHG:  Minor code changes on T55X7 code.   Default password is back to 'FF FF FF FF',
REM:  removed @marshmellow42 's wakeup option in "lf t55x7 read",

---  BASICALLY:
if a  T55X7 tag has following bits set:
AOR -  send wakeup command with pwd, to enable LF interacting with it.
PWD -  send read/write/trace/info command with pwd.  No need to send wakeup.
 2015-10-21 09:12:33 +02:00
iceman1001 2efd639484 CHG: some cleanup of pcf7931.c 2015-10-20 19:02:03 +02:00
iceman1001 9276e859a6 ADD: @marshmellows42 's fixes for "lf cmdread" and CHANGELOG.md 
ADD:  Added the "lf t55x7 wakeup" command. It will send a pwd,  and leave the antenna on.
Process like:
1. lf t55x7 wakeup p 11223344
2. lf search

---
It is still not finished,  will work together with the "lf t55x7 commands" in next step when I figure out the process from the datasheets.
 2015-10-20 19:00:02 +02:00
iceman1001 a739812e89 FIX: thanks @tony, for pointing out a "end" statement inside tnp3sim.lua 
ADD: @marshmello42 fixs for t55x7
 2015-10-16 23:16:46 +02:00
iceman1001 6a09bea427 CHG: code clean up. Have some questions regarding the CopyVikingTo method. The configblock looks wrong.. 2015-10-15 11:30:37 +02:00
iceman1001 e16054a468 CHG: minor updates in the T55x7 methods. added the LED_A_ON / LED_A_OFF to indicate when a T55x7 command is running. 
CHG: added some more comments to T55x7,  next person who looks at this will have it easier.
 2015-10-15 11:00:07 +02:00
iceman1001 ac2df3460a ADD: @marshmellows fixes for t55x7 reading signal. 
ADD: @marshmellows "diphase" definition for T55x7.
MOV: extracted the aquisition from the t55x7 methods and put them inside lfsampling.c
FIX: pcf7931 write,   there is 16bytes in a block.. not 4 as I thought before.
FIX: t55x7 lowered the WRITE_0 to 16.  Even bigger gap.
 2015-10-15 10:23:15 +02:00
iceman1001 368044201a FIX: The T55x7ReadBlock method, should not have the startgap since it indicats that it might be a write command. See if this fixes the bug. 
ADD:  Extracted the whole pcf7931 functionality into seperat files.  The lfops.c is starting to become too large.
 2015-10-14 11:39:51 +02:00
iceman1001 2285d9dd94 FIX: I did a clean up of the "LF PCF7931" code. The write command is not quite done. 
FIX: Added some more "clearCommandBuffer" calls before sending..
 2015-10-12 21:30:54 +02:00
iceman1001 5ee53a0e75 ADD: There were lot of calls to enable tracing, but very few to turn it of afterwards in the methods. 
Don't know if it has some influence but can't hurt calling  "set_tracing(FALSE);"  when method returns.
 2015-10-11 19:14:17 +02:00
iceman1001 3bc7b13d23 ADD: @marshmellow42's decrypt crypto-1 method, 
ADD:  @piwi's latest commit to PM3 Master, aiming at the WDR in "hf mf mifare".
 2015-10-11 09:07:29 +02:00
iceman1001 e98572a1e2 I just merged @marshmellow's branch "iclass" and that was a lot of new functionality. *great work* 
Things like the ICLASS, tryDecryptWord,

--
My other stuff like default keys, some new Mifare EV1 commands 0x40, 0x43 for the logging annotation,  start of the T55x7 configblock helper functionality (ripped from Adam Lauries RFIdler code)
Changes to the PCF7931 functions written,  which has a lousy input check..
 2015-10-07 23:00:46 +02:00
iceman1001 0de8e3874d A lot of changes... 
.. ntag simulation stuff from @marshmellows branch "ntag/sim"
.. hf mf mifare fixes from @pwpivi.
.. hw status command
.. speedtest function from @pwpivi
.. Viking Functionalities,   (not a proper DEMOD, but a start)
.. GetCountUS  better precision from @pwpivi
.. bin2hex,  hex2bin  from @holiman

...
starting with getting the T55x7 CONFIGURATION_BLOCK for different clone situations. Ripped from Adam Lauries RFidler,   nothing working or finished..
...
Started working with the T55x7 read command with password actually performs a write block...  See Issue #136  https://github.com/Proxmark/proxmark3/issues/136    Not solved yet.

...
Started add SHA256..   not working yet..
 2015-10-04 18:01:33 +02:00
iceman1001 f62b5e1204 added @piwi 's usb speed test. 
.. found out that my usb speed is really slow.  Started to look for reasons. Have a win7 64 env, running on a vmware image.
 2015-07-31 10:37:24 +02:00
iceman1001 0db6ed9a71 Merge some PM3 master commits. Had to re-make the StandAloneMode to work with flags in SimulateIso14443aTag 2015-07-29 01:10:06 +02:00
iceman1001 5de79e20f1 MOD:: reverse back changes to 14443b.c 
ADD: the hid-flasher/usb_cmd.h  wasn't up to date with how it's other file /common/usb_cmd.h looks like.
ADD: utils.lua  14443v crc inside LUA.
ADD: utils.lua  ConvertAsciiToHex method and minor adjustments checks.
 2015-07-28 21:33:09 +02:00
iceman1001 6427695bb4 ADD: using @holiman's "ubs_poll_validate_length() function in some device-side functions. 
-hitag2, -legicrf, HIDdemodFSK, CmDAWIDdemodFSK, CmdEM410xdemod, CmdIOdemodFSK

It should enable them to be aborted with a call to  "hw ping / hw status" instead of only button-press. Which is good when you are scripting stuff.
 2015-07-22 23:45:41 +02:00
iceman1001 11fe3a8975 REM: Removed a debugstatment 2015-07-22 23:36:28 +02:00
iceman1001 7838f4beba MERGED: @holimans changes 
MERGED: @piwi changes
MERGED: @marshmellows changes.

I'm not even gonna try write up all that stuff..

ADD: changed some commands inside the "Hf 14a sim" on deviceside.
ADD: @mobeius "two nonce" version for mfkey32.   It is also inside the "hf 14a sim" with the "x" parameter.
 2015-07-22 23:00:52 +02:00
iceman1001 f445df401e ADD: started with adding a "LS" command that lists the commands without the help text printed. To give easy clean list. 2015-07-22 11:19:15 +02:00
iceman1001 5b59bf20c7 FIX: "hf list 7816", the s-blocks is now also printed. 
FIX: iso14443b.c got some minor adjustments in the demod and codeas14443btag. Seems it works better for me.
I still have the problem with powerup of a 14b tag.  I need to run the "14b raw -c -p 05 00 08" a couple of times before I get an answer.
 2015-07-19 23:24:19 +02:00
iceman1001 db25599d7f ADD: @holiman's clearCommandBuffer in cmdlft55xx.c 
ADD: @VERTCraig's AVID commands.

TEST: testing some changes to iso14443 demod.
 2015-07-18 20:43:14 +02:00
iceman1001 d8af608f8e TEST: Moebius two noce mfkey32... 2015-07-13 23:06:49 +02:00
iceman1001 a62bf3afe1 @frederikmoellers EPA changes, with APDU for ISO14443b support 2015-07-13 00:04:16 +02:00
iceman1001 b10a759fef @PM3 master merges, Piwi fix for mfnested 
@Marshmellow42 's fix for FDB
 2015-07-12 22:58:16 +02:00
iceman1001 99cf19d9e8 ADD: @pwpivi 's latest fixes for bigbuff 
ADD:  @marshmellow 14b changes.

fix:  fixes to the timing inside iso14443b.c  sniff/sending.  Between TX & RX there should be a 151us pause.
 2015-06-29 22:36:55 +02:00
iceman1001 c830303d7e FIX: @pwpiwi 's fixes for darkside / nested attack about the NACK/PRNG bugs. 2015-06-25 12:41:39 +02:00
iceman1001 5ce7e22af6 ADD: forgot the zlib and some new fpga compress file.s 2015-06-25 12:29:41 +02:00
iceman1001 17ad0e0948 ADD: @marshmellow42 's 14b fixes. 
FIX: 14b sim changes in  iso14443b.c ,  *experimental*   I took some timing loops from "14a sim" armsrc/iso14443a.c  and merged it into the "14b sim".   Now using two pm3's I can have one simulating and the other reading and it works.  Ask @pwpiwi if you want to know more of what those timing loops does.  Something about waiting for the fpga delay queue...
 2015-06-25 12:25:44 +02:00
iceman1001 9783989b40 ADD: pwpiwi 's FPGA compress 2015-06-25 12:22:34 +02:00
iceman1001 f53020e729 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/Makefile
	armsrc/iso14443b.c
	armsrc/lfops.c
	client/cmdhf14b.c
	client/cmdhfmfu.c
	fpga/fpga_hf.bit
	fpga/hi_read_rx_xcorr.v
 2015-06-23 23:02:29 +02:00
iceman1001 d0f3338e0c ADD: PACE functionality ref: https://github.com/Proxmark/proxmark3/pull/121 
FIX:  some missing usb_commands for EPA.
 2015-06-23 22:30:18 +02:00
Martin Holst Swende 1e1de234ac Merge pull request #121 from frederikmoellers/master 
Add PACE replay functionality
 2015-06-23 22:23:08 +02:00
Martin Holst Swende b8d34d0598 Merge pull request #118 from marshmellow42/master 
fix t55xx write timing
 2015-06-23 22:18:50 +02:00
pwpiwi 01b7a6a898 Merge pull request #114 from pwpiwi/iso14443b_fix 
fixing iso14443b (issue #103): fix bug introduced during Bigbuf rework
 2015-06-23 07:14:52 +02:00
pwpiwi 705bfa1058 fixing iso14443b (issue #103): 
- increased DMA_BUFFER_SIZE to avoid occasional circular buffer overflows.
- minor code cleanups
 2015-06-22 22:03:43 +02:00
Frederik Möllers 3bb07d96c8 Add PACE replay functionality 
This function allows the user to specify APDUs which are sent to a card
supporting the PACE protocol. The response times are measured and
printed.
The code was pulled from the old Google Code repository (branch "epa")
and modified to fit into the new code base.
 2015-06-22 14:20:13 +02:00
iceman1001 ce3d6bd25a FIX: fastread dont do multiplication by zero, thanks @marshmellow42 
ADD: "hf 14a sim t 7" now implements a simple incr_counter command. it sends ACK to all requests.
ADD: "hf 14a sim t 7" now prints the password when a "0x1B" (Authenticate) command is received.
 2015-06-22 09:49:12 +02:00
iceman1001 5e42846302 CHG: "hf 14 sim t 7" ie NTAG simulation, now reads the emulator memory for read commands. this means you need to load the emulatormemory before... if you want it answer more correct.. 2015-06-21 21:57:52 +02:00
iceman1001 36f84d4748 ADD: @pwpivi latest fixes. 
ADD: @marshmellows fixes.
 2015-06-21 21:56:44 +02:00
pwpiwi 467340996e fixing iso14443b (issue #103): 
- fix hf 14b snoop
- fix hf 14b sim
 2015-06-21 18:04:24 +02:00
iceman1001 c9216a92aa FIX: "hf 14a sim" fixes to CRC calc. 
ADD: added CHECK_TEARING command support in "hf 14a sim" (EV1/NTAG216 command)
BUGS:  the read range probably will could currupt memory..ref:: http://www.proxmark.org/forum/viewtopic.php?pid=16611#p16611
 2015-06-21 11:09:54 +02:00
iceman1001 22e2470051 ADD: @marshmellow42 fudan detection in hf mfu 
ADD: @marshmellow42 14b reader changes.
ADD: @pwpiwi 14b fixes
 2015-06-21 11:07:05 +02:00
pwpiwi da586b1702 fixing iso14443b (issue #103): 
- revert removal of FPGA_HF_READER_RX_XCORR_848_KHZ. Need to be able to switch to 424kHz for ISO15693.
 2015-06-18 15:41:30 +02:00
iceman1001 569009f3f7 ADD: @pwpiwi 's fix 50365fedcb 2015-06-18 13:51:00 +02:00
pwpiwi 50365fedcb fix issue #116: remove includes of stdio.h in armsrc 2015-06-18 11:33:53 +02:00
iceman1001 abb215301c add: @pwpipi 's fixes to 14B 2015-06-18 09:52:53 +02:00
pwpiwi 132a02179c fixing iso 14443b (issue #103): 
- fix: treat empty commands as error
- deleting dead code
- rename USB-Commands (ISO14443 -> iso14443B)
 2015-06-18 09:49:22 +02:00
pwpiwi d5875804a3 fixing iso14443b (issue #103): 
fix: don't waste time to calculate parity bits. Instead add void parity bits to trace and ignore them on client side
 2015-06-18 07:56:08 +02:00
pwpiwi 51d4f6f114 fixing iso14443b (issue #103): 
- fix: IQ demodulator (FPGA)
- fix: approximately align reader signal delay to tag response delay (FPGA)
- fix: remove deprecated RSSI calculation to improve decoder speed (iso14443b.c)
- fix: better approximation of signal amplitude to avoid false carrier detection (iso14443b.c)
- fix: remove initial power off in iso14443b raw command (iso14443b.c)
- add: enable tracing for iso14443b raw command (iso14443b.c)
- fix: client crashed when checking CRC for incomplete responses (iso14433b.c)
- speeding up snoop to avoid circular buffer overflow
- added some comments for better documentation
- rename functions (iso14443 -> iso14443b)
- remove unused code in hi_read_rx_xcorr.v
 2015-06-17 20:27:36 +02:00
iceman1001 d71d59dbd1 ADD: @marshmellow42 's 14b changes. 2015-06-15 20:59:01 +02:00
iceman1001 839a53ae4c ADD: added support for commands. READ_SIGNATURE 0x3C, READ_COUNTER 0x39 for NTAGs in "hf 14a sim" 
the ECC signature is taken from a NTAG 215 tag. Might work.
      Counters always returns 0,  :)
 2015-06-15 14:01:34 +02:00
iceman1001 32719adfa1 ADD: added support for some NTAG/EV1 commands to "hf 14a sim" on device side. 
0x1B (authenticate)
          0x3a (fast read)
          0x60 (get_version)

       This is used in a new mode on client,  "hf 14a sim t 7"
 2015-06-14 22:40:18 +02:00
iceman1001 550a929a69 FIX: Reverting the t55x7 timings. (@marshmellow42 's fix) 2015-06-13 12:13:21 +02:00
marshmellow42 4a3f1a3793 revert t55xx start gap and write timing changes 
also noted specs in comments
 2015-06-11 23:52:40 -04:00
iceman1001 47286d89e4 ADD @pwpiwi 's fixes for "HF 14B" commands. 2015-06-03 21:12:55 +02:00
pwpiwi 09c66f1f09 fixing iso14443b (issue #103): fix timing issue (speeding up 
the decoders)
 2015-06-03 13:28:28 +02:00
pwpiwi 5b95953d42 fixing iso14443b (issue #103): 
- most significant bit of tag data (which happens to be the sign bit)
had been dropped when snooping (FPGA change)
- avoid trying to decode both tag and reader data when snooping (we don't
have the time to do so).
 2015-06-02 22:50:16 +02:00
iceman1001 77533e21ae DEL: removed old iso14443.c since @pwpiwi renamed it.. 2015-06-02 12:23:06 +02:00
iceman1001 489ef36cf6 ADD: @pwpiwi 's fixes for 14b. Including a rename from iso14443.c -> iso14443b.c 2015-06-02 12:17:34 +02:00
pwpiwi 67ac4bf75c fix issue #103: revert type change. Samples from FPGA are signed. 
Renamed iso14443.c to iso14443b.c
 2015-06-02 07:28:47 +02:00
pwpiwi 0d9a86c724 Fix issue #103 (hopefully). Quite an old bug which was previously 
masked by a big DMA_BUFFER_SIZE.
 2015-06-01 19:47:21 +02:00
iceman1001 2d2f7d1948 ADD: @marshmellow42 's changes / fixes. 2015-05-31 21:47:33 +02:00
iceman1001 95aeb706d7 CHG: @marshmellow42 changes on deviceside. 
ADD: increase debuglevel for printing a statment in ul_ev1_auth
 2015-05-27 23:23:46 +02:00
marshmellow42 e35031d2b7 MFU code cleanup - final ? 
fixed bug in debug print in MF 1k sim.
 2015-05-27 17:21:42 -04:00
marshmellow42 4973f23d3c clean up mfu device side code 
+ add xor calc to util (prep for desfire)
commented out MifareUWriteBlockCompat as it isn't used in client
currently (it is a command we could support..  but why?)
relabeled a few device side mfu functions to be clearer.
 2015-05-27 12:24:13 -04:00
marshmellow42 22342f6dfe Add clearCommandBuffer before SendCommand 
adjust output of mfu rdbl to be consistent
fix output of mfu dump in case startPage was specified. (also was
missing "i" in second print...)
 2015-05-26 10:40:23 -04:00
iceman1001 c3c241f389 CHG: moved a xor function into util.c 
CHG: added some calls to clearCommandBuffer() in /hf mfu/hf 14a sim/hf mf sim/ commands.
CHG: minor adjustments to relative pathing.
 2015-05-26 11:04:57 +02:00
iceman1001 c068ebb78f Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/mifarecmd.c
	client/cmdhfmf.c
 2015-05-25 13:13:06 +02:00
iceman1001 46cd801c5a FIX: dumptoemul.lua removed the extra linebreak in the end, making some load commands complain. 
MOV: moved the try32/try64 attacks (mfkey32/mfkey64) into the nonce2key.c file
CHG: added @marshmellow42 changes to hf mfu dump layout.
ADD: an extra call to BigBuf_free in readcard..  just to make sure that it doesn't leak memory.
ADD: expermimental call to "try32" for "hf mf sim x".
 2015-05-25 13:10:55 +02:00
marshmellow42 79d7bcbb51 updated mfu rdbl and wrbl commands 
@iceman1001 s rdbl and wrbl cmd updates.
dump screen output adjusted
 2015-05-24 22:28:21 -04:00
iceman1001 7444d916c6 FIX: hf mfu dump, now reads correct memory from device-side. 
CHG: hf mfu dump - output data styled :)
 2015-05-24 21:51:44 +02:00
marshmellow42 0ce03d9ab0 fix mfu dump getbigbuffer bug 
Thanks @iceman1001 for catching my oops, and fixing it :)
 2015-05-23 22:35:50 -04:00
iceman1001 ce432659f2 Adjustments after the big merge from PM3 master. 2015-05-23 08:38:46 +02:00
iceman1001 bcf61bd34a Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	README.txt
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/des.c
	armsrc/iclass.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	client/cmddata.c
	client/cmdhf.c
	client/cmdhf14a.c
	client/cmdhficlass.c
	client/cmdhfmfu.c
	client/cmdhfmfu.h
	client/cmdscript.c
	client/lualibs/commands.lua
	client/lualibs/html_dumplib.lua
	client/scripting.c
	client/util.c
	common/protocols.h
	include/usb_cmd.h
 2015-05-23 08:16:40 +02:00
iceman1001 fff69a1e34 CHG: Merged the "hf mfu rdbl" and "hf mfu crdbl" commands into "hf mfu rdbl". One read command. 
CHG:  Merged the "hf mfu wrbl" and "hf mfu cwrbl" commands into "hf mfu wrbl". One write command.

Both new commands implement a help, authentication (0x1A/0x1B) for ULC and the rest,
 2015-05-20 23:44:11 +02:00
iceman1001 0a0d9a5828 @Marshmellow42 's fixes for bigbuf. 2015-05-19 18:46:38 +02:00
marshmellow42 d7acc6403e hf mfu dump - bigbuf allocation fix 
some larger nfc tags can get large so set the allocation to the 4k
CARD_MEMORY_SIZE buffersize.
 2015-05-19 11:30:50 -04:00
iceman1001 d26849d4ae CHG: the device-side code for "hf 14a sim x" 
BUG: bcc1 xored error fix in "hf mf sim"
CHG: function rename Snoop -> Sniff.
 2015-05-19 08:56:53 +02:00
marshmellow42 29250969b0 @iceman1001 s comments/updates mfu cmds 2015-05-18 22:07:11 -04:00
iceman1001 e7e9508883 @Marshmellow42 's cleanup isn device-side "hf mfu" code. Looks nice. Dump uses bigbuffer now, and can dump NTAG216 :) 
Consistency on the client-side code "hf mfu".  looks nice.
 2015-05-18 20:58:33 +02:00
marshmellow42 9d87eb6650 MF ultralight code cleanup 2015-05-18 13:11:00 -04:00
marshmellow42 8258f40969 Iceman1001 s MFU clean up 
cleaned up MF UL_C auth code device side.
 2015-05-17 20:49:25 -04:00
iceman1001 4d2e4eea58 CHG: the "HF MFU" authentication changes. 
CHG: name change from "hf 14a snoop"  ->  "hf 14a sniff"..
 2015-05-16 15:34:01 +02:00
marshmellow42 cceabb79e6 mfu info / dump attempt at missing auths 
NOT TESTED.  will test soon.  probably has bugs!
 2015-05-16 01:00:31 -04:00
marshmellow42 2b3af97df2 various bug fixes 2015-05-13 11:07:47 -04:00
iceman1001 664bb5ae72 BUGS: more Coverity scan fixes. 2015-05-13 14:08:59 +02:00
iceman1001 8949bb5dad Added @marshmellow42 "hf search" 2015-05-13 09:13:42 +02:00
marshmellow42 6ce0e5386a HF Search - refactoring cmds to work with it 2015-05-12 16:45:48 -04:00
marshmellow42 75377d29d6 MFU - Icemans further improvements 
add UL-C device side read card with authentication
add MF_UL-Annotations
add ntag, and more ul descriptions in hf mfu info
 2015-05-06 00:55:29 -04:00
iceman1001 cd07302754 CHG: reverted a method declaration. 2015-05-05 00:35:56 +02:00
iceman1001 74daee24b8 CHG: for the 2k3des changes 2015-05-05 00:34:20 +02:00
iceman1001 8d53ea1403 CHG: added 2k3des to ULC READCARD. 2015-05-05 00:33:07 +02:00
marshmellow42 b3125340f3 Icemans UL-C Auth dev side fix plus a few other ... 
... small UL fixes
 2015-05-03 15:41:11 -04:00
iceman1001 062b7cb956 FIX: the HF MFU CREAD command on deviceside now can do a proper ATUTHENTICATION request with 2KEY3DES. 2015-05-01 15:29:19 +02:00
marshmellow42 92690507ab Iceman's updates to MFU info and dump 2015-04-30 09:28:43 -04:00
iceman1001 1ec21089b2 CHG: the work in progress of making "HF MFU INFO" / "HF MFU DUMP" goes on. 
ook @marshmellows changes and remade them a bit. TagTypeUL_t behaves like a flag-enum.
     "HF MFU DUMP" now autodetects tagtype, and the deviceside should report back proper length.
 2015-04-30 10:15:52 +02:00
marshmellow42 f168b2633b MF Ultralight - Iceman's updates + mine 
Beginning of Ultralight additions.
detection of Ultralight Types added
dump command now auto detects type
can authenticate Ultralight C
 2015-04-29 18:27:31 -04:00
iceman1001 c8ba098a9b REM: Removed the CSETUID stub. Its implemented on the client side instead. 2015-04-28 23:34:16 +02:00
marshmellow42 e9b8d0dd6e Iceman's mf sim 7bt UID fix from #97 2015-04-28 15:43:58 -04:00
iceman1001 76984409b9 FIX: forgot an argument. 2015-04-26 18:06:36 +02:00
iceman1001 fb2d24882e Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/cmddata.c
	client/cmddata.h
	client/cmdhfmf.c
	client/cmdlf.c
	client/cmdlfem4x.h
	client/cmdlft55xx.c
	client/lualibs/default_toys.lua
	client/scripts/tnp3clone.lua
	client/scripts/tnp3dump.lua
	client/scripts/tnp3sim.lua
 2015-04-24 19:04:01 +02:00
iceman1001 add0504dea ADD: Started a "collect nonces" concept to be able to analyse the tag generated nonces. 2015-04-24 18:41:49 +02:00
iceman1001 5eae566a28 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-04-08 21:24:08 +02:00
marshmellow42 25d3e5cc83 Merge remote-tracking branch 'upstream/master' 2015-04-08 14:19:19 -04:00
Martin Holst Swende 83602affe5 Fixed buffer initialization errors, as reported in http://www.proxmark.org/forum/viewtopic.php?pid=15337#p15337 2015-04-08 13:31:04 +02:00
marshmellow42 fef74fdce4 lf ask consolidation 
backend:
askman and askraw demods merged into askdemod (args adjusted
accordingly)
re-arranged lfdemod.h in alphabetical order and by category

front end:
data detectclock a (ask) now also reports the selected best start
position for demod
data manrawdecode takes an invert arg now
 2015-04-08 01:07:39 -04:00
iceman1001 49dc1d0a9e Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/Makefile
	armsrc/lfops.c
	client/cmdlft55xx.c
	common/ldscript.common
	common/lfdemod.c
 2015-04-01 18:02:10 +02:00
iceman1001 b8f705e73e ADD: added some changes from Marshmellow 
CHG: minor change to the help text for "LF HITAG WRITE"
 2015-04-01 17:58:35 +02:00
iceman1001 e204bb7fb2 CHG: revert -O2 -> -Os compile 2015-04-01 17:52:24 +02:00
pwpiwi f83c41c75b Merge pull request #89 from pwpiwi/image_shrink 
Reclaim more than 19K of ARM flash memory.
 2015-03-31 22:57:33 +02:00
Martin Holst Swende d5d6f22718 Merge pull request #91 from marshmellow42/master 
lfdemod.c refactoring  (+ bug fixes)
 2015-03-31 22:11:19 +02:00
pwpiwi e335ca2846 Reclaim more than 19K of ARM flash memory. 
- added compiler options -fdata-sections and -ffunction-sections (thanks to iceman for the hint)
- removed float operations from common/lfdemod.c to avoid adding float libraries to the ARM os image
- moved the fpga images to the data section to avoid reserving unused space for a separate section
 2015-03-31 08:07:26 +02:00
iceman1001 02d352fea7 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/iclass.c
	armsrc/lfops.c
	client/cmdlf.c
	common/lfdemod.c
	include/usb_cmd.h
 2015-03-30 21:11:37 +02:00
iceman1001 46c65fed6c CHG: adding some variable initalisation to the Uart. 2015-03-30 16:29:30 +02:00
iceman1001 aa60d1560e NEW: HF MFU SETPWD - set password to a Ultralight C tag. 
NEW: HF MFU SETUID - set UID to a magic UL / UL-C tag.   *not implemented*
CHG: minor alignment for "Hf list" output.
CHG: removed unneeded function parameters to the ultralight commands
CHG: the const MAX_MIFARE_FRAME_SIZE is changed to MAX_FRAME_SIZE in the ultralight commands since the UL-Ev1 can have bigger frames than 18bytes.
CHG: adding DES support for the Ultralight-c read commands on deviceside.
 2015-03-30 16:24:03 +02:00
Martin Holst Swende caaf9618ae Minor mod to 'hf iclass read', it now also reads and prints the configuration of the tag found 2015-03-29 21:49:58 +02:00
marshmellow42 2eec55c8a4 lfdemods streamline & bug fixes 
removed duplicate code countPSK_FC - adjusted countFC to work.
bug fixes & streamlined code in:
lf hid fskdemod
lf em em410xdemod

cleaned up lfdemod.c some
 2015-03-27 00:02:30 -04:00
marshmellow42 e0165dcf3a Fixed indents to Tabs from Spaces 
Spacing changes ONLY - no code changes
 2015-03-25 14:24:36 -04:00
marshmellow42 327a690813 EM410x bug fix 2015-03-24 23:05:46 -04:00
iceman1001 0ec548dc21 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	client/cmdlf.c
	client/cmdlft55xx.c
	client/cmdlft55xx.h
	client/scripts/test_t55x7_bi.lua
 2015-03-24 11:45:31 +01:00
marshmellow42 1fbf895616 lf updates 
applies icemans full ata55x7 read/write settings
adds checksum to ioprox (thanks to iceman)
adds silent mode for lf read and getSamples
fix lf em em410xwatch and lf em410xspoof
improve data rawdemod ar -  for biphase demods
improve detectclock a for strong antennas
 2015-03-23 16:29:50 -04:00
iceman1001 754a35e72b ADD: added the ioprox checksum test to IOdemodFSK 
MENTIONED HERE:  http://www.proxmark.org/forum/viewtopic.php?id=364&p=6
ADD:  changed the layout of the HID descramble patterns a bit,  and rearranged some hex/dec outputs.
 2015-03-23 17:11:45 +01:00
marshmellow42 13d77ef964 lf t5 read plus lf demod adjustments 
lf t5xx commands updated from ICEMAN
lf em410x commands updated
lf search bug fix for 2 args
test scripts from iceman
lf demod:
better ask clock detection with Strong fully clipped waves
better ask raw demod with strong fully clipped waves
fsk demod add back in skipped bits during demod
nrz demod add back in skipped bits during demod
 2015-03-22 15:28:48 -04:00
iceman1001 b1db38e1b7 ADD: piwi's compiler flags -O2 2015-03-18 20:29:58 +01:00
iceman1001 78e875807f FIX: narrowed down the detect modulation even further. 
FIX: minor adjustment to t55xx inside of lfops.c when waiting for the antenna to settle.
FIX: added the possiblity to use graphbuffer fpr LF T55XX DETECT/TRACE/INFO .

MISSING:
the detect, trace, info,  doesn't use a password for those tags with enabled password-mode.
 2015-03-16 22:45:06 +01:00
iceman1001 05446d5bc3 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	common/crc.c
	common/crc.h
	common/lfdemod.c
	include/crc.h
	include/crc.h.old
 2015-03-16 13:13:18 +01:00
marshmellow42 b41534d142 adjust ask/biphase handling - more complete 
also added XL EM410x formats
 2015-03-15 22:03:50 -04:00
iceman1001 f2d46122d3 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-12 19:01:09 +01:00
Martin Holst Swende f7048dc8a9 Implemented usb_poll() within LF sim. This means the LF sim will be aborted whenever something comes over the USB 2015-03-12 16:32:01 +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 96f39a47a9 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-11 22:21:01 +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
marshmellow42 ada339a10f biphase bug fixes 2015-03-09 15:27:20 -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 c8387e85e3 iClass full simulation of tags now officially works, with some cheating regarding reader update and write commands 2015-03-02 21:30:22 +01: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
Martin Holst Swende e5cd4ee4b4 Tag MAC finally works! (Full sim not yet, though) 2015-03-02 20:14:35 +01:00
Martin Holst Swende 61fe90736b Implemented the correct way to calculate MAC from a tag, feeding it an extra 32 zeroes. Also divided it up into two parts, one of which can be precalculated by the device before the simulation begins 2015-03-02 00:38:36 +01:00
marshmellow42 73da818743 lf simulation tests 
added SimulateTagLowFrequencyTest function
with some adjustments that help ASK simulations
FSK and PSK still need help.  Left original HID sim alone as for some it
may partially work.
 2015-02-28 14:33:05 -05:00
Martin Holst Swende c99dc845b1 Added the ciphers also.. doh 2015-02-27 20:19:10 +01:00
Martin Holst Swende 10a8875c72 Implemented new optimized version of MAC-calculation for iclass 2015-02-26 20:35:35 +01:00
marshmellow42 872e3d4d6f NEW lf simpsk 2015-02-21 21:36:02 -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 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 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
iceman1001 d716ca2fc1 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/iclass.c
 2015-02-16 18:59:44 +01: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 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 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
iceman1001 4e7af352b4 chg: step two for t55xx commnads 2015-02-13 10:16:21 +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
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
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 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
Martin Holst Swende 61972abbdd Merge branch 'master' into GenericTracing 
Conflicts:
	armsrc/iso14443a.c
 2015-02-10 21:25:14 +01:00
iceman1001 1e3a799d47 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-02-10 09:01:31 +01:00
iceman1001 2b61c24212 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/lfops.c
 2015-02-10 08:58:14 +01:00
Martin Holst Swende 904a96cd80 Merge pull request #59 from marshmellow42/master 
lf demod additions/fixes
 2015-02-09 20:28:12 +01:00
pwpiwi 0c8d25ebd8 Fixed: hf mf sim failed on fast reader responses 
In Miller Decoder: don't wait too long for a stable signal
In Miller Decoder: Don't accept sequences of four or more zeroes as start bit
In EmSendCmd14443aRaw: don't wait for emptying the FPGA delay queue if it isn't filled
 2015-02-09 06:51:04 +01:00
Martin Holst Swende beefe5bc4d Minor dox 2015-02-07 21:22:53 +01:00
Martin Holst Swende 665775c844 Some documentation and formatting to LogTraceHitag 2015-02-07 21:05:14 +01:00
Martin Holst Swende aabb719dc4 Moved LogTraceHitag to BigBuf (no changes to the function ... yet) 2015-02-07 20:55:17 +01:00
Martin Holst Swende 3000dc4e7e Generic tracing; removed iso14a_XX-functions, removed traceLen as global varible 2015-02-07 20:49:40 +01:00
pwpiwi 3b692427ac Bugfix hw tune, hf tune: voltage measures were VERY wrong 
Modified hw detectreader: display reader field strength in mV units and to be less phony
 2015-02-07 10:14:49 +01:00
marshmellow42 be2cf126bf Merge remote-tracking branch 'upstream/master' 2015-02-06 14:45:46 -05:00
Martin Holst Swende 7d5ebac993 Merge branch 'master' into GenericTracing 
Conflicts:
	armsrc/iso14443.c
	armsrc/iso14443a.c
	client/cmdhf.c
	client/cmdhf14b.c
 2015-02-06 08:41:02 +01:00
marshmellow42 e770c64824 lf psk/nrz split, add maxErr argument 
changed psk to use wave lengths instead of peaks
split out NRZ from psk demod
added maxErr argument to raw demods (except fsk)
 2015-02-05 17:01:18 -05:00
Martin Holst Swende bb42a03ef1 Fix #1 for pm3 iclass simulation, remove erroneous extra bit after transmission 2015-02-05 19:40:47 +01:00
iceman1001 385f398740 prepare to update the LF T55XX commands 2015-02-04 11:48:36 +01:00
Martin Holst Swende 0644d5e3a3 Merged with master 2015-01-31 18:21:38 +01:00
Martin Holst Swende 31abe49fd3 Some more fixes to longer lf recordings. Now also supports longer snoops, and an additional command 'lf config' has been defined, instead of having to specify all params for every call 2015-01-30 23:03:44 +01:00
iceman1001 64d1b4efc9 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/Makefile
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/epa.c
	armsrc/iclass.c
	armsrc/iso14443a.c
	armsrc/iso14443a.h
	armsrc/iso15693.c
	armsrc/lfops.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	armsrc/string.h
	armsrc/util.h
	bootrom/bootrom.c
	client/Makefile
	client/cmddata.c
	client/cmddata.h
	client/cmdhf.c
	client/cmdhf14a.c
	client/cmdhf14b.c
	client/cmdhf15.c
	client/cmdhficlass.c
	client/cmdhfmf.c
	client/cmdhfmfu.c
	client/cmdlf.c
	client/cmdlfem4x.c
	client/cmdlfhid.c
	client/cmdlfhitag.c
	client/cmdlfio.c
	client/cmdmain.c
	client/data.h
	client/flash.c
	client/graph.c
	client/graph.h
	client/loclass/elite_crack.c
	client/loclass/fileutils.c
	client/lualibs/commands.lua
	client/lualibs/html_dumplib.lua
	client/lualibs/mf_default_keys.lua
	client/lualibs/utils.lua
	client/mifarehost.c
	client/nonce2key/crapto1.c
	client/proxmark3.c
	client/scripting.c
	client/scripts/tnp3dump.lua
	client/scripts/tnp3sim.lua
	client/scripts/tracetest.lua
	common/Makefile.common
	common/cmd.c
	common/cmd.h
	common/lfdemod.c
	common/lfdemod.h
	common/usb_cdc.c
	common/usb_cdc.h
	include/usb_cmd.h
 2015-01-29 21:39:33 +01:00
Martin Holst Swende b3cc5f2987 Reverted erroneous commit from bigbuf-rework 2015-01-29 19:58:46 +01:00
Martin Holst Swende f6d9fb173f Added client-side support for recording longer samples, fixed last (?) issues on device-side 2015-01-29 00:57:22 +01:00
marshmellow42 0892b968ce fix hid prox standalone bug 
Fixed standalone bug by re-making the function return the hi and lo
values. (used only by samyrun function in appmain.c)
 2015-01-28 12:55:04 -05:00
marshmellow42 08ebca682c lf hid fskdemod bug 
re-introduced in last bigbuf changes
 2015-01-28 11:45:31 -05:00
pwpiwi f71f4deb8f BigBuf and tracing rework: allow much longer traces in in hf commands 
- provided a BigBuf_malloc() function to dynamically allocate parts of BigBuf
  e.g. for DMA-Buffers, Frame-Buffers, Emulator-Memory
- the whole rest of BigBuf is now available for traces (instead of a small fixed amount)
- send actual traceLen together with trace data
- changed client side to cope with varying traceLen
- changed small buffers to automatic variables instead of parts of BigBuf
 2015-01-28 07:18:51 +01:00
pwpiwi 117d9ec25c Refactoring of BigBuf handling in order to prepare for more efficient memory allocation and longer traces. 2015-01-27 22:25:55 +01:00
marshmellow42 a1d17964a2 lf demod bug fix & refactor 
fixed bug in lfops.c in hid fskdemod
refactored data fskXXXDemods for specific tags to use more common code.
 2015-01-27 14:51:12 -05:00
Martin Holst Swende 16b75f27c3 Minor tweaks to iso14443b snoop tracing 2015-01-27 16:34:11 +01:00
Martin Holst Swende 03dc174036 Minor refactoring 2015-01-27 09:06:01 +01:00
marshmellow42 9c0f13d5dd Merge remote-tracking branch 'upstream/master' 2015-01-26 17:07:49 -05:00
Martin Holst Swende aeadbdb216 Generic tracing: Some fixes in iso14443b snooping, to how DMA access is performed, sizes and buffers. 2015-01-26 22:10:05 +01:00
Martin Holst Swende 7c676e7269 Some documentation 2015-01-26 21:15:28 +01:00
Martin Holst Swende 7242efa07c bugfix 2015-01-22 23:04:59 +01:00
Martin Holst Swende cb366e9dbd Added a lf acquisition-mode which can do decimation and quantization, in order to be able to record longer transactions 2015-01-22 23:01:29 +01:00