2175 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
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
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	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
Martin Holst Swende	355c8b4a7d	Generic trace pt2: made iso14443b use standard trace format	2015-01-18 20:23:58 +01:00
Martin Holst Swende	80fe723570	Generic trace pt1: Moved arm-side trace functionality into util-package	2015-01-18 20:21:53 +01:00
Martin Holst Swende	f164662363	Merge branch 'master' of https://github.com/iceman1001/ForPm3 ... Conflicts: armsrc/appmain.c armsrc/apps.h	2015-01-15 21:50:03 +01:00
Martin Holst Swende	758f1fd1f3	Fixed issue #43 on github	2015-01-15 16:07:58 +01:00
Martin Holst Swende	6b038d192a	Minor dox	2015-01-15 15:45:54 +01:00
Martin Holst Swende	1eb874ee3f	Merge branch 'master' of github.com:Proxmark/proxmark3	2015-01-15 15:45:15 +01:00
Martin Holst Swende	7b941c8d7f	Fixed memory corruption after reader-attack in armsrc, fixed annoying LED	2015-01-15 15:27:44 +01:00
Martin Holst Swende	645c960f61	Implemented new FPGA mode for iclass tag simulation. Reduces arm-side size of transfer/memory by a factor of 8. Makes for easier arm-side encoding of messages, for when we start needing to do that on the fly instead of using precalculated messages	2015-01-15 15:16:34 +01:00
iceman1001	a631936e84	ADD: Midnitesnaks's & Pentura labs Ultralight-c modifications in ARMSRC. ... ADD: des.c , aes.c in ARMSRC	2015-01-13 23:18:04 +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	f44a01235c	Merge branch 'master' of https://github.com/iceman1001/ForPm3	2015-01-09 21:50:36 +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	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	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	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	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
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	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	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	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	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	d3a22c7dfa	ADD: Holimans new changes in master.	2015-01-05 02:01:24 +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	39d3ce5dd6	Moved iclass crc to be based on a lookup table	2015-01-04 22:10:25 +01:00
Martin Holst Swende	c8dd9b092e	Some work on iclass dump and iclass list, now the dumping is a lot more stable. I think the comms should be measured and tuned a bit more, right now it kind of works thanks to retry-functionality, but the retries are probably not needed if we are a bit more careful about timing, so we don't send commands too fast for the tag to handle	2015-01-04 14:53:26 +01:00
Martin Holst Swende	2e9d4b3ff4	Some work on iclass, started on some better support in 'hf iclass list' and also fixes to 'hf iclass reader' so it exits better when the button is pressed	2015-01-03 15:11:48 +01:00
Martin Holst Swende	854b9a233f	Removed unused variable	2015-01-03 14:29:07 +01:00
Martin Holst Swende	ae8e8a4372	Corrected indentation to tabs only	2015-01-03 14:21:07 +01:00
Martin Holst Swende	6ca4c6463e	Removed wrong size-count, sizeof(bigbuf) would always return 40000 in lfops	2015-01-03 14:17:59 +01:00
Iceman	7c5f70dd9f	Merge pull request #1 from bforbort/master ... Added DES AUTH command support	2015-01-01 23:02:23 +01:00
Blaine Forbort	23b80a7334	Merge remote-tracking branch 'origin/DESFireAuth'	2015-01-01 10:41:14 -08: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	6bfa18eab4	Merge pull request #1 from Proxmark/master ... Test	2014-12-29 16:14:23 -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
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
iceman1001	3bc3598e88	added the changes from PM3 master. ... added some code for the AWID26	2014-12-22 15:14:05 +01:00
Blaine Forbort	082789c4df	Using defined command code	2014-12-22 00:21:20 -08:00
Blaine Forbort	46e14b0f96	Minor formatting change	2014-12-21 23:54:29 -08:00
Blaine Forbort	4e2e4bcf9b	Tested by changing the master key from the default to a custom value	2014-12-21 22:59:24 -08:00
Blaine Forbort	0673263230	code to check RndA' from PICC was unreachable	2014-12-20 19:25:31 -08:00
Blaine Forbort	6a1aa12df0	Called the OnSuccess() method for whatever reason that's there.	2014-12-20 19:15:48 -08:00
Blaine Forbort	3c05723ee2	Limit to single-DES operation and return session key to client.	2014-12-20 17:18:26 -08:00
Blaine Forbort	085b0e2ea9	Create session key	2014-12-20 00:10:59 -08:00
Blaine Forbort	6534821365	Accept key number from command line	2014-12-19 21:37:06 -08:00
Blaine Forbort	a07a448220	Removed unneeded verbosity and checked for a 0x00 response from PICC after challenge response	2014-12-19 20:38:25 -08:00
Blaine Forbort	1051dee04a	Challenge is now sent to PICC	2014-12-19 19:44:32 -08:00
Blaine Forbort	0127902ee6	Calculates response to PICC challenge	2014-12-19 19:36:19 -08:00
Blaine Forbort	b6f41bfdfe	Successfully decrypted RandB from PICC challenge	2014-12-19 12:15:45 -08: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
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	eabba3df7e	Fix (iclass)	2014-12-14 18:07:12 +01:00
marshmellow42	4860172789	LF HID & IO prox demod translation addons ... lf hid fskdemod - add bit format length, facility code and card numbers for different formats	2014-12-13 20:23:59 -05: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	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	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	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
iceman1001	a25d5c1cde	test: hf 15 sim..	2014-10-31 09:26:35 +01:00
Martin Holst Swende	ca4714cd23	More coverity fixes	2014-10-30 21:49:18 +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	2ed270a854	Coverity-fixes in armsrc	2014-10-28 21:44:17 +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
Martin Holst Swende	9cc8a1e588	Some more docs, also made lf hid fskdemod a bit more stable. Should be no more false readings now	2014-10-25 22:42:27 +02:00
Martin Holst Swende	b225678574	Some minor changes and some documentation	2014-10-24 21:12:31 +02:00
Martin Holst Swende	1a5a0d7590	Fixed compilation issues, but functionality not tested	2014-10-24 20:53:43 +02:00
Martin Holst Swende	f97d4e2378	First try att merging with head	2014-10-24 20:46:02 +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	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	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	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	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
pwpiwi	bfb6a143ea	bugfix hf mf sim ... - an additional erronous byte was sent after SAK	2014-08-05 18:40:19 +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	c7324bef28	Bugfix hf 14a raw: ... number of bits sent was wrong when option -c was used without option -b	2014-07-01 08:28:28 +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
Martin Holst Swende	dbf732ee41	Minor	2014-06-29 13:48:13 +02: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	6db28145ea	Merge remote-tracking branch 'origin/master' into iclass-fixes	2014-06-28 12:47:40 +02:00
iZsh	3b2fee43ea	New LF edge detection algorithm + lowpass filter ... This is a new LF edge detection algorithm for the FPGA. - It uses a low-pass IIR filter to clean the signal (see https://fail0verflow.com/blog/2014/proxmark3-fpga-iir-filter.html) - The algorithm is able to detect consecutive peaks in the same direction - It uses an envelope follower to dynamically adjust the peak thresholds - The main threshold used in the envelope follower can be set from the ARM side fpga/lf_edge_detect.v, fpga/lp20khz_1MSa_iir_filter.v, fpga/min_max_tracker.v: New file. fpga/lo_edge_detect.v, fpga/fpga_lf.v: Modify accordingly. armsrc/apps.h (FPGA_CMD_SET_USER_BYTE1, FPGA_CMD_SET_EDGE_DETECT_THRESHOLD): New FPGA command. fpga/fpga_lf.v: Modify accordingly/Add a 8bit user register. fpga/fpga_lf.bit: Update accordingly. fpga/tests: New directory for testbenches fpga/tests/Makefile: New file. It compiles the testbenches and runs all the tests by default (comparing with the golden output) fpga/tests/tb_lp20khz_1MSa_iir_filter.v, fpga/tests/tb_min_max_tracker.v, fpga/tests/tb_lf_edge_detect.v: New testbenches fpga/tests/plot_edgedetect.py: New script to plot the results from the edge detection tests. fpga/tests/tb_data: New directory for data and golden outputs	2014-06-27 14:27:03 +02:00
Martin Holst Swende	42f57e0294	Merged with master	2014-06-27 13:16:31 +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	62638f87db	armsrc/fpgaloader.c: forgot the copyright notice	2014-06-20 12:29:58 +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
Martin Holst Swende	fa541aca96	Minor changes, it may actually work now, need to test with a credentialed reader	2014-06-07 22:16:57 +02:00
Martin Holst Swende	94ad01bfba	Merged with head	2014-06-07 22:04:27 +02:00
Martin Holst Swende	81012e670b	debug in progress	2014-06-07 22:00:31 +02:00
Martin Holst Swende	e3dc1e4cf5	Minor changes in iclass.c	2014-06-07 21:49:56 +02:00
Martin Holst Swende	83fd67ba0b	Added mode for 424k modulation (iso 15693)	2014-06-07 21:40:47 +02:00
Martin Holst Swende	fdcd43eb15	Fixed (?) http://www.proxmark.org/forum/viewtopic.php?id=1967, two bytes are discarded when adding crc and sending raw iso14443a commands	2014-04-26 16:15:16 +02:00
Martin Holst Swende	f83cc12613	More work on iclass	2014-04-24 15:48:00 +02:00
Martin Holst Swende	17cba2693d	Implemented client side changes for iclass hack, attempted to fix issues with trace. The trace functionality from iso14443 has been rewritten, unfortunately iclass used that also, which made iclass 'list' stop functioning, both for simulation and snooping	2014-04-24 14:13:33 +02:00
Martin Holst Swende	ff7bb4ef17	Experimenting with hacking iclass	2014-04-17 09:53:54 +02:00
penturalabs	c3963755b7	Implement replay command.	2014-04-15 11:47:01 +01:00
Martin Holst Swende	cba867f202	Final (?) fixes to git versioning https://github.com/Proxmark/proxmark3/issues/10	2014-04-04 20:14:58 +02:00
ikarus	9c6837165b	Updated nameing (svn -> git) & fixed whitespaces.	2014-04-02 21:46:25 +02:00
Martin Holst Swende	07976a256d	Refactoring low frequency operations, now 'lf hid fskdemod' is more stable. Also did changes to handling ioprox tags, this is yet untested, so until it's been tested it should be kept off 'stable' branch	2014-03-31 17:57:14 +02:00
Martin Holst Swende	69d88ec463	Major refactoring of lfops, removed a lot of duplicate code	2014-03-30 15:59:54 +02:00
pwpiwi	d714d3effc	Improvements/Fixes to 14443 sniffing/snooping ... - fixed a circular buffer rollover bug in iso14443a.c - fixed 7 Byte UID handling in hf mf sniff - fixed "cannot append" error in hf mf sniff d - fixed hint on mfkey32 in hf mf sim x - fixed hf mf sniff sometimes showing rogue data from previous calloc - improve snooping/sniffing by syncing modulation detector window with reader signal (hi_iso14443a.v) - code cleanup of hi_iso14443a.v	2014-03-25 21:38:24 +01:00
penturalabs	a1f3bb120f	Added Kantech ioProx Support	2014-03-18 20:52:48 +00:00
micki.held@gmx.de	d7aa3739a9	More robust iso14443a sniffing/simulation functions by ... - iso14443a.c: less strict Miller/Manchester decoders - FPGA hi_iso14443a.v: syncing on external readers' clock when simulating and sniffing.	2014-02-23 15:46:19 +00:00
micki.held@gmx.de	7bc95e2e43	- fixed iso1443a ManchesterDecoder in order to fix broken Snoop/Sniff ... - enhanced tracing: hf 14a list now shows meaningful timing information. With new option f it also shows the frame delay times (fdt) - small fix for hf 14b list - it used to run into the trace trailer - hf 14a sim now obeys iso14443 timing (fdt of 1172 or 1234 resp.) Note: you need to flash FPGA as well. More details in http://www.proxmark.org/forum/viewtopic.php?pid=9721#p9721	2014-02-19 20:35:04 +00:00
martin.holst@gmail.com	3be2a5ae0b	reverted a non-intended commit with crappy debug printouts	2014-02-05 18:53:55 +00:00
martin.holst@gmail.com	273b57a7b0	Fixed error with ar/nr-collection	2014-02-05 08:07:27 +00:00
martin.holst@gmail.com	f87941bd22	Minor typo	2014-01-31 21:24:18 +00:00
martin.holst@gmail.com	d2f487af9c	Various improvements on the Mifare1kSimulation. Fixed issue with tracebuffer not being cleared, fixed issue with 'static' errors, added modes for doing reader-only attack, added interactive mode, added possibility to set UID from cmdline, either 7-byte or 4-byte. See http://www.proxmark.org/forum/viewtopic.php?id=1529 and http://www.proxmark.org/forum/viewtopic.php?id=1649&p=3 for some more background and discussion	2014-01-31 21:17:34 +00:00
martin.holst@gmail.com	af1caf6e4a	Fixed (?) issue with mifare simulation auth failed. See http://www.proxmark.org/forum/viewtopic.php?pid=9192#p9192	2014-01-22 08:49:28 +00:00
micki.held@gmx.de	e691fc45bc	- improved reader sensitivity for 14443a cards (FPGA change!) ... - implemented ISO 14443A anticollision loop See http://www.proxmark.org/forum/viewtopic.php?id=1797 further details	2013-11-19 18:52:40 +00:00
roel@libnfc.org	981bd4292e	integrated MIFARE ultralight features, contributed by 'midnitesnake'	2013-10-11 08:43:23 +00:00
jonor@live.it	4f269f63da	Added more informations at command hw version. Now we can get some informations of microcontroller. ... Maybe is useful when someone got a bigger AT91 Example: #db# Prox/RFID mark3 RFID instrument #db# bootrom: svn 756-unclean 2013-09-14 15:04:07 #db# os: svn 796-unclean 2013-10-04 18:50:44 #db# FPGA image built on 2013/ 9/26 at 9:17:32 uC: AT91SAM7S256 Rev B Embedded Processor: ARM7TDMI Nonvolatile Program Memory Size: 256K bytes Second Nonvolatile Program Memory Size: None Internal SRAM Size: 64K bytes Architecture Identifier: AT91SAM7Sxx Series Nonvolatile Program Memory Type: Embedded Flash Memory	2013-10-04 18:54:10 +00:00
roel@libnfc.org	ce02f6f992	fixed iso14443a-4 similation, got rid of many ugly memory allocation issues	2013-10-03 14:22:43 +00:00
jonor@live.it	0318894e52	Correct issue of blew circular buffer in hf 14b snoop with gcc 4.7.4 the issue is solved	2013-09-30 19:08:29 +00:00
douniwan5788@gmail.com	b19bd5d689	Add support in 'hf mf mifare' for some unlicensed/compatible mifare card which always answer NACK. ... Change the 'nttmp' start from nt distance 500 to 100 in mifarecmd.c to compatible some unlicensed/compatible mifare card.	2013-09-29 11:44:07 +00:00
martin.holst@gmail.com	5f6d6c9003	Raw 14a in commandline, patch by jonor, see http://proxmark.org/forum/viewtopic.php?id=1751 for more info	2013-09-28 19:28:55 +00:00
henryk@ploetzli.ch	bf7163bdb3	* Add an option to lf read command to use an arbitrary divisor, enabling reading at frequencies other than 125 and 134 kHz.	2013-09-27 13:48:20 +00:00
micki.held@gmx.de	9492e0b098	Major rework of hf mf nested: ... - PM: used GetCountMifare in MifareNested() for improved timing accuracy and to deliver better quality nonces - PM: MifareNested now delivers exactly two different nonces to avoid time consuming multiple lfsr_recovery32() on client side - Client: replaced quicksort by bucketsort in crapto1.c which is faster - Client: use multithreading (two parallel calls to lfsr_recovery32()) - Client: fixed a small bug in mfnested() (always showed trgkey=0) - Client: introduced a mutex for PrintAndLog() to avoid interlaced printing Minor rework of hf mf chk: - Avoid time consuming off/on cycles. Send a "halt" instead.	2013-09-15 09:33:17 +00:00
martin.holst@gmail.com	7cf3ef203c	Patch by jonor for raw ISO 1444B commands. See http://www.proxmark.org/forum/viewtopic.php?id=1729 for more info	2013-09-01 18:41:05 +00:00
micki.held@gmx.de	1c611bbd26		2013-07-08 17:56:05 +00:00
martin.holst@gmail.com	e772353f72	Major changes to hf mf mifare	2013-06-26 21:13:02 +00:00
dn337t@gmail.com	79c3611cf3	fixed Mifare nested by activating commented SpinDelay()s	2013-05-30 14:48:27 +00:00
apresence@gmail.com	e67b06b706	Support for cloning to T55x7 at different clock rates & 134KHz ... * Modified commands (lf em4x): em410xwatch ['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134) em410xwrite <UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate * Better option checking for em410xwrite & fix for uninitialized vars * Increased samples from 2000 to 4000 in em410xwatch (2000 is OK for clock=64, but too few for clock=32)	2013-05-12 08:11:00 +00:00
martin.holst@gmail.com	9836a77f97	Fixed a third issue where a buffer was filled with 0x44, affecting chinese cards-commands.(csetblk)	2013-05-11 12:23:31 +00:00
martin.holst@gmail.com	354d3a33fd	Fixed another issue where a buffer was filled with 0x44, affecting chinese cards-commands. see http://www.proxmark.org/forum/viewtopic.php?id=1467&p=6	2013-05-11 12:22:11 +00:00
martin.holst@gmail.com	ea73261dc6	Fixed buffer corruption in iso1443a_select_card, affecting several operations, e.g. hf mf mifare and probably a few more	2013-05-11 12:13:17 +00:00
roel@libnfc.org	ed258538da	retrieve uid correctly, patched by 'gregy'	2013-05-03 06:58:24 +00:00
dn337t@gmail.com	0beed8fc67	fixed hf mf rdbl response data (broken since r634)	2013-04-24 10:59:47 +00:00
dn337t@gmail.com	3803d5295d	fixed possibly uninitialized variables	2013-04-24 10:58:12 +00:00
roel@libnfc.org	ce55f5a291	moved RAMFUNC definition	2013-04-08 09:18:39 +00:00
roel@libnfc.org	dfc3c5053c	removed another redundant function to compose reader short frame	2013-04-03 11:18:01 +00:00
roel@libnfc.org	195af47289	removed redundant function to compose reader short frame	2013-04-03 08:45:04 +00:00
roel@libnfc.org	28afbd2bee	added initial test to emulate memory of mf ul tag	2013-03-28 14:02:00 +00:00
roel@libnfc.org	5191b3d10b	fixed sending of RATS during iso-14443-4 select	2013-03-27 12:23:59 +00:00
roel@libnfc.org	43751d2a65	removed failed hitag2 authentication attempts from the list	2013-03-18 15:32:19 +00:00
roel@libnfc.org	47e18126ec	added hitag bit count output in log	2013-03-11 15:07:23 +00:00
roel@libnfc.org	17331e14ee	tweaked sim command, added mfkey32	2013-03-07 12:22:12 +00:00
roel@libnfc.org	54a942b05d	merged all patches into CDC repository	2013-02-28 17:04:23 +00:00
roel@libnfc.org	28fdb04fd8	Finally, rewrote bootrom and flasher program, much faster now	2013-02-28 15:11:52 +00:00
roel@libnfc.org	79a73ab2d1	fixed USB GPIO bug reported by gregy, and fixed 'hf 14a reader' command	2013-02-27 13:23:38 +00:00
roel@libnfc.org	ab6bf11f3f	minor fix when reading blocks	2012-12-17 13:21:53 +00:00
roel@libnfc.org	fc8c5cdd12	fixed hitag2 dump if one or more blocks are locked	2012-12-10 15:12:32 +00:00
roel@libnfc.org	ab4da50d99	added automatically saving the hitag2 memory content to file	2012-12-09 21:25:29 +00:00
roel@libnfc.org	9440213d6b	fixed 64-bit cmd/arg for windows	2012-12-09 13:00:19 +00:00
roel@libnfc.org	81ee3409f9	added so-called 'driver' for windows	2012-12-05 20:45:42 +00:00
roel@libnfc.org	6e82300dda	removed all old usb calls	2012-12-05 16:14:10 +00:00
roel@libnfc.org	5bcc76c427	added missing files	2012-12-04 23:41:54 +00:00
roel@libnfc.org	902cb3c00b	major USB update	2012-12-04 23:39:18 +00:00
Merlokbr@gmail.com	5a9506ac45	10 ms was too fast(. 50 is ok	2012-11-08 10:05:10 +00:00
Merlokbr@gmail.com	bfaecce6eb	there was bug in hf mf mifare. and speed up this command.	2012-11-08 09:48:02 +00:00
thijsbreman@gmail.com	219a334de5	added: readed blocks (password mode) into tag.sectors[]. 'lf hitag sim' simulates the readed blocks.	2012-10-18 10:01:13 +00:00
roel@libnfc.org	bde10a5057	added hitag2 reading in crypto mode functionality	2012-10-16 15:18:13 +00:00
roel@libnfc.org	ed7bd3a380	Added Hitag2 reading tag memory in password mode	2012-09-19 10:23:19 +00:00
roel@libnfc.org	d19929cbe8	MAJOR update, added hitag2 reader, emulation and eavesdropping, lots of new code, including FPGA tweaks, part 2	2012-09-18 13:53:17 +00:00
frederikmoellers@aol.de	e5ad43c07e	Power down the field before sending the USB ACK ... This fixes the bug that the USB communication breaks when collecting PACE nonces with no delay. The delay functionality has not been removed (it doesn't hurt to keep it), but using a delay of 0 is now possible without a high risk of getting too many errors.	2012-09-01 23:54:38 +00:00
frederikmoellers@aol.de	5acd09bdfb	Basic support for EAC documents (e.g. German Identification Card) ... -new files armsrc/epa.[ch] for ePA (electronic "Personalausweis") related functions -Offers elementary functions (EPA_PACE_MSE_Set_AT etc.) -Also offers one new USB command: EPA_PACE_Collect_Nonce -created new command subtree in client: client/hfepa.[ch] ("hf epa") -offers "hf epa cnonces" (collect encrypted PACE nonces) -more to come	2012-08-28 21:39:50 +00:00
frederikmoellers@aol.de	b0127e65f1	-Fixed a bug in iso14_apdu ... -According to ISO14443-4, the block number (bit 0) in the PCB needs to be flipped every once in a while. Not doing so leads to the card not responding to commands anymore. The flipping is done according to the standard now. -Declare iso14_apdu in iso14443a.h to enable usage from other .c files -iso14_apdu now returns 0 if ReaderReceive returned 0 (to distinguish between the case that ReaderReceive returns -1 and the case that it returns 0) -Added a new function to change the timeout (to enable changing it from other .c files without the need for a global variable)	2012-08-24 21:00:03 +00:00
Merlokbr@gmail.com	71d90e54cd	hf mf sniff transfered parity from arm to decoding procedure	2012-07-17 15:19:15 +00:00
Merlokbr@gmail.com	55acbb2a39	improved command hf mf sniff. Now it cant decode nested authentication and cant write emulator files	2012-07-16 14:49:51 +00:00
Merlokbr@gmail.com	39864b0bd4	"hf mf sniff" low level logics works.	2012-07-11 15:52:33 +00:00
Merlokbr@gmail.com	5cd9ec01e0	hf 14a snoop optimized and added parameters. hf 14a sniff - not work.	2012-07-07 15:29:51 +00:00
Merlokbr@gmail.com	b62a5a8444	small improvements, added new command hf mf sniff (there will be cool sniffer). But now... here is optimized hf 14a snoop. As I see it works the same as th old version.	2012-07-06 16:19:05 +00:00
douniwan5788	423efaccad	fixed the mifare bug	2012-07-06 07:06:43 +00:00
Merlokbr@gmail.com	545a1f385c	another "magic card" backdoor - command "read block". Added several commands to manipulate card data.	2012-07-05 14:05:01 +00:00
Merlokbr@gmail.com	208a0166b9	magic Chinese card fully supported. Added commands:csetuid-set card uid and wipe it, csetblk-set 16 byte block, cload-load dump from emulator memory or emulator file	2012-07-05 10:59:15 +00:00
Merlokbr@gmail.com	0675f200e6	Added work with "magic Chinese" card (card from: ouyangweidaxian@live.cn) with wipe support). Change UID and wipe only.	2012-07-05 07:31:56 +00:00
cex123@gmail.com	2414f97889	Added Indala cloning. Fixed HID cloning bug	2012-07-02 08:37:50 +00:00
roel@libnfc.org	7862f4ad5b	fixed output	2012-06-29 12:25:31 +00:00
roel@libnfc.org	9fc6a16779	removed output that slowed down the process, this is to avoid missing frames	2012-06-29 12:21:17 +00:00
roel@libnfc.org	254b70a4af	cleaned up some code	2012-06-29 12:09:24 +00:00
roel@libnfc.org	4ab4336a97	added better tracing capabilities, fixed some reader issues	2012-06-29 10:47:07 +00:00
roel@libnfc.org	81cd0474cb	fixed a lot of simulation issues	2012-06-29 10:24:05 +00:00
dekoninggans@gmail.com	912a3e94e4	iClass support is tweaked so it works with HID readers... waiting for further improvement	2012-06-28 15:41:28 +00:00
dekoninggans@gmail.com	1e26214152	Extended iClass support with Card and Reader emulation!	2012-06-28 13:38:40 +00:00
adrian@atrox.at	e6304bca2d	reduces (but does not eliminate) a coil/fpga setup glitch before every iso15693 command (confuses some cards), also: little cleanup	2012-06-20 17:20:21 +00:00
GooglePlus@YoungJules.net	9f69393035	Commented out unused, set but never read variables (cause build to fail if warnings treated as errors)	2012-06-12 12:21:26 +00:00
douniwan5788	aea4d76687	Enhanced hf mf chk , add default key,support dic file and so on. ... modify hf mf mifare to automatically use an invalid key'nt try again. make some changes to support mifare classic 4k.	2012-05-30 03:45:55 +00:00
dn337t@gmail.com	13d8c68d86	removed redundant Dbprintfs from SnoopIso1443a (issue 25)	2012-05-29 14:16:09 +00:00
dn337t@gmail.com	7431536de7	optimized loop in MifareNested (issue 36)	2012-05-29 13:23:07 +00:00
dn337t@gmail.com	db389d52cc	fixed assignment vs. equals operator (issue 35)	2012-05-29 12:47:13 +00:00
marcin.mielczarczyk	2d4eae7617	Support for EM410x card mode in T5555/T55x7 tags.	2012-03-07 13:44:53 +00:00
roel@libnfc.org	7e67e42f7e	cleaned up some if-def routines	2011-12-16 11:00:51 +00:00
Merlokbr@gmail.com	23487cd23c	1. update SAK ... 2. ratte's fix. http://www.proxmark.org/forum/viewtopic.php?id=979	2011-11-04 12:35:00 +00:00
cex123@gmail.com	ec09b62d88		2011-10-15 15:15:49 +00:00
roel@libnfc.org	0f7f9edc14	fixed iso14443b snoop, plus compiling issue of redefined parameter, please take care about this next time before a commit	2011-09-06 10:28:22 +00:00
Merlokbr@gmail.com	0014cb46da	1. emulator works. tested on ARC1302, NXP pegoda, touchtag, my firm's readers. ... 2. added increment, decrement, restore, transfer commands 3. fixed several small bugs and small code cleaning 4. there is strange behavier in the emulator: for 7BUID is seems that there is must be a feature that cam make work card withouth 2nd anticollision loop. NXP reader authenticates, but cant read card contents. all the rest readers works, BUT.... my 7BUID mifare card dont work AT ALL .... I dont know what i should do )	2011-06-25 13:03:01 +00:00
Merlokbr@gmail.com	51969283ec	1. fixed (it seems) readline behavior. Now there is no proxmark3 prompts on the data. ... 2. emulator goes into beta stage. works: - work with 4BUID and 7BUID dumps - load/save/grab dumps - emulate select - emulate authentication (with nested) - emulate read/write blocks - emulate NACK-ACK ping-pong	2011-06-23 16:49:39 +00:00
Merlokbr@gmail.com	ab8b654efa	added functionality: dump card memory, save|load card memory. ... 50% fixed problem with readline lib	2011-06-22 01:25:16 +00:00
Merlokbr@gmail.com	8556b852ed	1. updated usb commands ... 2. added abilities to: clear, get, set, load from card, load from nested card emulator dump 3. tried to fix proxmark promt have seen everywhere (not so good) 4. reorganized arm code	2011-06-17 18:39:54 +00:00
Merlokbr@gmail.com	8f51ddb0bd	1. fixed send manchester ... 2. emulator commands select, authenticate, read block, write block works 3. nested authentication - not working (maybe next release) 4. small bugfixes 5. mifare1ksim - in alpha state!!! code not so clear!!!	2011-06-16 14:43:49 +00:00
Merlokbr@gmail.com	0a39986e01	alpha2 mifare emulator	2011-06-14 15:28:21 +00:00
Merlokbr@gmail.com	9ca155ba44	0. its alpha version!!! ... 1. commands changed from "hf 14a" to "hf mf" 2. some code cleaning and small bugfixes 3. alpha version hf mf sim 4. added internal function GetTickCount() for time measuring	2011-06-10 13:35:10 +00:00
Merlokbr@gmail.com	f397b5cc87	1. fixed hf 14a mifare. added functionality to ignore one Nt ... 2. completed hf 14a nested 3. added hf 14a chk to check keys 5. added check keys to hf 14a mifare and hf 14a nested 6. added debug level to mifare commands 7. small bugs and improvements	2011-06-07 12:35:52 +00:00
Merlokbr@gmail.com	50193c1e3e	1. small bugfix in hf 14a mifare ... 2. now in cmd hf 14a mifare - blinks LED_C 3. bugfix in readblock 2. bugfix in USB CommandReceived 3. small improvements	2011-06-01 14:12:11 +00:00
Merlokbr@gmail.com	f89c705002	improved version of "hf 14a mifare" command ... with merge with utility nonce2key	2011-05-31 11:31:20 +00:00
Merlokbr@gmail.com	4abe4f5867	nested authentication works ok (tested) ... and code cleaning	2011-05-26 15:20:03 +00:00
Merlokbr@gmail.com	20f9a2a1d5	1. Mifare read block command ... 2. Mifare read sector (via 1) 3. Mifare write block 4. fixed several bugs in iso 14443 select added Issue 23 Issue 26	2011-05-26 12:55:15 +00:00
dekoninggans@gmail.com	cee5a30d53	Added iClass eavesdrop support for Proxmark3	2011-05-18 12:33:32 +00:00
dekoninggans@gmail.com	593924e751	Bitsync fix 2. Gerhard	2011-02-04 19:43:48 +00:00
dekoninggans@gmail.com	2f2d9fc5ac	Fixed some small mistakes in the bit synchronization of Miller and Manchester decoding part. Gerhard	2011-02-04 16:25:31 +00:00
dekoninggans@gmail.com	d82c6ebb84	Fixed ISSUE 15 in iso14443a.c - Gerhard	2011-01-28 12:34:05 +00:00
adam@algroup.co.uk	9455b51c2a	Issue 20 patch (refactored code of the iso15693 implementation as well as several enhancements) [Adrian Dabrowski "atrox"]	2010-10-19 14:25:17 +00:00
henryk@ploetzli.ch	6c1e2d95f4	Add a ramfunc section in the data segment, which will be copied to ram on startup. ... Add a RAMFUNC function attribute to have functions copied to and run from ram. Fix "blew circular buffer" error in hf 14a snoop by executing SnoopIso14443a from ram (eats about 3.5k of ram)	2010-10-08 10:23:04 +00:00
henryk@ploetzli.ch	d3b1f4e406	Flash green LED during sample transmission ("data samples" and "data hexsamples" commands) to indicate activity (and that the device hasn't hung)	2010-08-23 07:49:44 +00:00
adam@algroup.co.uk	534983d735	iso14a reader patches [Hagen Fritsch]	2010-07-13 13:39:30 +00:00
adam@algroup.co.uk	7e758047e4	iso14a cleanup and implement RATS [Hagen Fritsch]	2010-06-26 08:24:21 +00:00
adam@algroup.co.uk	bd84638614	create target for binary file archive (linux version)	2010-05-09 12:17:42 +00:00
adam@algroup.co.uk	3612a8a8e2	legic write/simulate [Anon]	2010-05-06 11:24:01 +00:00
d18c7db	72934aa313	Streamline some code, tidy up redundant functions, no change in functionality.	2010-03-05 04:14:04 +00:00
d18c7db	0aa4cfc2f1	Fix up small error in main osc startup delay and replace more custom defines with standard Atmel defines	2010-03-04 08:15:59 +00:00
izsh@fail0verflow.com	ed82636b49	There is no proof this fix anything. This could just be out of randomness or subtle compiler optimization differences due to the change.	2010-03-04 00:30:54 +00:00
marcansoft	928727a45b	Use sane optimization for armsrc	2010-03-03 13:19:29 +00:00
d18c7db	bad6eab230	Fix possible type casting issue. Add another JTAG config file :)	2010-03-03 02:27:14 +00:00
marcansoft	9af4835863	Add KEEP() to version information section ... Prevents it from being garbage collected	2010-02-26 23:29:22 +00:00
marcansoft	9b87d273b5	Fix minor consistency issue in armsrc/ldscript ... BSS should be AT>ram (though it really doesn't matter because load size is 0)	2010-02-26 21:40:14 +00:00
marcansoft	cc7580be7a	Minor fix to armsrc ldscript	2010-02-26 15:14:27 +00:00
marcansoft	98bf65a640	Fix up armsrc/ldscript (create proper PHDRs, cleanup) ... Now explicitly creates PHDRs (to avoid including e.g. ELF headers inside the first PHDR)	2010-02-26 14:03:21 +00:00
marcansoft	98540684df	Link using gcc and get rid of the LIBGCC stuff ... GCC knows how to find libgcc, and the proper way to link C code is to use gcc, not ld.	2010-02-26 14:03:03 +00:00
marcansoft	e949e6a63e	Add license header to armsrc/ldscript	2010-02-26 14:01:31 +00:00
izsh@fail0verflow.com	9e13f87517	Fix a couple of warnings	2010-02-24 20:34:13 +00:00
marcansoft	c1bd1140c4	Some random cleanup	2010-02-21 00:13:08 +00:00
marcansoft	bd20f8f478	Add license headers to armsrc/bootrom/common stuff ... I have kept whatever copyright notices exist. Please add your own copyright notice if you have made any nontrivial changes or additions to the code. There are several files without any attribution, currently.	2010-02-21 00:12:52 +00:00
marcansoft	9ab7a6c755	Split str* and mem* into string.[ch]	2010-02-21 00:10:28 +00:00
marcansoft	f7e3ed8287	Clean up data types, some header cleanup, etc.	2010-02-20 22:51:00 +00:00
marcansoft	e30c654b19	More en masse cleanup (whitespace/newlines/headers/etc)	2010-02-20 21:57:20 +00:00
marcansoft	15c4dc5ace	Clean up line endings, switch everything to LF instead of CRLF ... Doing this for bootrom and armsrc for now. If you're using Windows, please configure your editor for LF line endings.	2010-02-20 21:24:25 +00:00
marcansoft	72c4af087f	Add obj/.dummy for clients that don't track empty dirs	2010-02-20 21:20:47 +00:00
izsh@fail0verflow.com	5e174a511b	marcan's patch until he gets commit access. Remove C library's includes from the firmware side since it's not available anyway and not used	2010-02-20 03:07:55 +00:00
adam@algroup.co.uk	4c8db262c0	usability hint	2010-02-06 15:50:20 +00:00
adam@algroup.co.uk	b279e3efc1	more helpful error message (from Sourcerer)	2010-02-06 09:54:38 +00:00
adam@algroup.co.uk	a2b1414f43	Andreas fix for LEGIC MIM1024	2010-02-06 09:43:33 +00:00
adam@algroup.co.uk	8e220a9126	put legic back in the system and add rumpletux's fast legic / prng code from forum	2010-02-05 08:18:02 +00:00
adam@algroup.co.uk	502def6d63	oops. in the spirit of cleaner code, don't do stuff twice!	2010-02-04 23:31:23 +00:00
adam@algroup.co.uk	bdd1de1b02	make LF sampling ACK to fix USB timing issue in em410xwatch	2010-02-04 23:15:53 +00:00
henryk@ploetzli.ch	92e592ce71	Limit DbpString size to the buffer size, patch by Andreas from proxmark forums	2010-02-04 02:49:21 +00:00
izsh.f0f	7fe9b0b742	Client cleanup and restructuring. Stage 1... ... Next Step is refactoring some of the giant functions which are just copy/paste of some other ones with just a few line changes, removing unnecessary 'goto' etc. The MS Windows version is broken with this commit but will be fixed soon. Everything can't be done all at once :P The commands are now hierarchical, for example: "hf 14a read" vs. "hf 14b read". You can also request help: "hf help", "data help", "hf 15 help" etc. Indents are now space-based, not tab-based anymore. Hopefully no one will be trolling about it, considering the suicide-prone work being done here ;) client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h, client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h, client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c, client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h, client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h, client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h, client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h, client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h, client/cmdhflegic.c, client/cmdhflegic.c: New files. client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c, client/proxmark3.h, client/Makefile: Update accordingly. client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes. client/translate.h, client/command.c, client/gui.c, client/usb.c, client/prox.h: Remove. include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd. common/crc16.h: New file. common/crc16.c: Modify accordingly. common/iso14443crc.h: New file. common/iso14443_crc.c: Rename to common/iso14443crc.c: and modify accordingly. armsrc/lfops.c, armsrc/iso14443.c, armsrc/iso14443a.c: include .h files from the common directory instead of including the c files. common/Makefile.common, armsrc/Makefile: Modify accordingly.	2010-02-04 01:27:07 +00:00
adam@algroup.co.uk	6982ac2612	fix USB send data timing issue in CMD_DOWNLOADED_SIM_SAMPLES_125K	2010-01-29 09:28:47 +00:00
adam@algroup.co.uk	13a79da4e9	add 'losimman' command - simulate arbitrary Manchester encoded LF tags	2010-01-28 11:49:05 +00:00
d18c7db	815f3f2559	Decreased BigBuff mem, some elf flasher fixes (needs more work) but flashing correctly currently.	2010-01-10 03:57:41 +00:00
daniel.boteanu	8caef54055	Increased buffer sizes for hi14snoop. Added blinking LED for feedback	2010-01-09 15:30:47 +00:00
daniel.boteanu	d724614963	Trim long debug string message in hitune	2010-01-09 15:13:49 +00:00
daniel.boteanu	1eb7596aad	Added hitune command for continuously measuring HF antenna tuning	2010-01-09 14:59:42 +00:00
d18c7db	1e1b303093	Fixed some compile warnings in client, minor tidy up with some dbprintf statements	2010-01-04 03:08:45 +00:00
bushing	850427c8a9	switch away entirely from using DbpInteger to Dbprintf	2010-01-02 00:34:43 +00:00
bushing	a9bc033bdd	create Dbprintf convenience function	2010-01-01 23:36:17 +00:00
bushing	0d974852ce	ARM code cleanup (lfops)	2009-12-30 02:52:33 +00:00
bushing	6f5cb60c46	Add printf, and start transitioning away from DbpInteger	2009-12-30 02:18:25 +00:00
roel@libnfc.org	32cfae439e	mifare firmware update	2009-12-30 00:11:50 +00:00
henryk@ploetzli.ch	2561caa24c	Implement card reading with a few simple fixed obfuscation strings	2009-12-28 18:19:00 +00:00
henryk@ploetzli.ch	1d99b0df4a	Remove LEGIC RF tag emulation code since it's useless without keystream generator	2009-12-28 18:18:25 +00:00
roel@libnfc.org	84c02e97e0	iso14443a cleanup, cascade2 level working again	2009-12-28 17:21:50 +00:00
roel@libnfc.org	d24438f85c	cleaning up endless copy-paste of trace functionality	2009-12-28 00:16:05 +00:00
bushing	d5be6f7cd4	fix OS detection, libgcc detection	2009-12-22 12:50:34 +00:00
bushing	1dea88f976	fix some ARM build fail	2009-12-22 12:48:33 +00:00
henryk@ploetzli.ch	8d40aba58b	Add capability to correlate against subcarriers of 212kHz (argument FPGA_HF_READER_RX_XCORR_QUARTER_FREQ | FPGA_HF_READER_RX_XCORR_848_KHZ) and 106kHz (argument FPGA_HF_READER_RX_XCORR_QUARTER_FREQ)	2009-12-09 02:31:01 +00:00
henryk@ploetzli.ch	68d9d60a4d	Add generic CRC calculation code	2009-11-25 20:41:41 +00:00
edouard@lafargue.name	c86cc30801	Added the new SRIX4K reading routine, thanks to jonor. Regression tested against SRI512 tags, ... but I do not have SRIX4K tags to test this with.	2009-11-23 09:34:57 +00:00
d18c7db	e70140224f	Fix define typo	2009-11-12 08:04:40 +00:00
d18c7db	c0d04e9540	Also defines to carve out LF related code	2009-11-12 07:23:12 +00:00
henryk@ploetzli.ch	b1083ec9f7	#ifdef out the calls to the ISO15693/14443/14443a functions so that the -D on the make command line actually can be used to reduce code size	2009-11-10 05:10:01 +00:00
henryk@ploetzli.ch	dcc10e5e31	Add basic communication shell for Legic RF in reader mode. Needs the new receive function of hi_read_tx.	2009-11-06 15:37:53 +00:00
henryk@ploetzli.ch	add16a6287	Refactor things around to make it easier to add a reader mode with code reuse	2009-11-05 11:13:46 +00:00
henryk@ploetzli.ch	4014b814fb	Make canned responsed const	2009-10-25 09:58:23 +00:00
henryk@ploetzli.ch	ccedd6ae6b	Simplify data types, now that I believe that 'frames' will always be rather short	2009-10-23 21:40:17 +00:00
henryk@ploetzli.ch	aac23b2434	Fix and generify legic response code	2009-10-16 22:07:00 +00:00
henryk@ploetzli.ch	a7247d858b	Add basic LEGIC RF communication in tag simulation mode	2009-10-12 11:47:39 +00:00
henryk@ploetzli.ch	ecf53cb215	Add HF simulator modulation mode for 212kHz subcarrier	2009-10-12 07:46:03 +00:00
henryk@ploetzli.ch	5fc8250f7f	Add command to manually set ADC mux source	2009-10-09 15:57:07 +00:00
d18c7db	6949aca9fa	Pushed standard AT91 defines into main code	2009-09-29 12:13:41 +00:00
d18c7db	d3ae0de746	Small changes to some armsrc makefile to allow conditional compilation of various protocols via defines, change winsrc makefile to allow override of compiler location via external defines, finally change fpgaloader to actually check that the image upload succeeded instead of just blindly sending it and hoping for the best.	2009-09-22 09:57:03 +00:00
henryk@ploetzli.ch	1b2c893632	Fix data segement. You may now use stuff like int foo = 1; in global context (as opposed to both int foo = 0; which is bss and const int foo = 1; which is rodata) without having the sky come ... crashing down	2009-09-08 15:40:22 +00:00
d18c7db	715d74c5be	Fixed up last gcc 4.1 and 4.4 warnings, added OpenOCD wiggler config	2009-09-08 10:08:43 +00:00
henryk@ploetzli.ch	45dcfac2cc	Hopefully correct code for C's strict aliasing rules	2009-09-08 02:36:50 +00:00
henryk@ploetzli.ch	9dbe0941fd	Change section_start pointer to char** to prevent aliasing warnings on old toolchain	2009-09-08 00:37:13 +00:00
d18c7db	57fcd2d7d1	added eh_frame needed for gcc 4.4.1 or higher	2009-09-07 09:53:45 +00:00
henryk@ploetzli.ch	d4086fe2b7	Re-enable -Wall	2009-09-06 19:19:38 +00:00
henryk@ploetzli.ch	bb03181744	Fix FPGA load code for the generic case where a new style bitstream is not DWORD aligned ... Completely switch to byte-wise load, shouldn't make much of a difference since this is not timing-critical	2009-09-06 19:08:56 +00:00
henryk@ploetzli.ch	83288efc7d	Remove unused code from hitag2.c ... Mark intermittently used code in iso15693.c as attribute unused Change CFLAGS to -Werror to enforce warning free code	2009-09-05 22:17:18 +00:00
henryk@ploetzli.ch	8fcbf652da	New bootrom ... + Add common area at end of RAM to communicate between main os and bootrom + Lower stack end to make room for common area + Implement CMD_DEVICE_INFO in both OS and bootrom to give information about the current state and supported features + Allow hands-free firmware update: When CMD_START_FLASH is received over USB in OS mode, the device will reset and enter the bootrom Pressing the button in hands-free update mode takes precedence: releasing the button will immediately abort firmware update and perform a reset. Do not press the button. + Require each flash sequence to be preceded by a CMD_START_FLASH to set up the boundaries for the following flash sequence Not compatible with linux flasher before SVN revision 200 Currently no compatible flasher for Windows. WINDOWS USERS: DO NOT UPDATE YOUR BOOTROM YET + Protect bootrom flash area unless magic unlock sequence is given in CMD_START_FLASH	2009-09-01 14:44:38 +00:00
henryk@ploetzli.ch	e3ae025783	Eradicate all occurences of hardcoded memory addresses from all sources files, except for the FPGA bitstream fallback	2009-08-31 14:52:59 +00:00
henryk@ploetzli.ch	3742d90563	Add forgotten file	2009-08-31 00:47:12 +00:00
henryk@ploetzli.ch	2e68bd4065	Add forgotten file	2009-08-31 00:37:29 +00:00
henryk@ploetzli.ch	4271e82d56	Only re-compile version.c as often as necessary ... Make bootrom version information pointer a proper symbol (with hacky ld strangeness workaround)	2009-08-29 06:14:28 +00:00
henryk@ploetzli.ch	0fa9ca5b53	Add command and code for bidirectional LF emulation of Hitag2. Should be extended for other types of tags	2009-08-28 21:56:43 +00:00
henryk@ploetzli.ch	8a6aec16d8	Implement version information storage and retrieval for the bootrom and the osimage. ... Use perl to create the version information (thereby re-creating the perl dependency and adding an svn dependency) but fall back in case of missing perl or svn	2009-08-28 06:40:44 +00:00
henryk@ploetzli.ch	ba8a80b30c	Add version command	2009-08-28 00:37:28 +00:00
henryk@ploetzli.ch	e73e717239	Add Makefile for fpga directory (Windows codepath is untested, in any case, go.bat is still there) ... Retire rbt2c.pl, instead use objcopy to directly convert the .bit file into an .o that can be linked with the flash image Rename armsrc/fpga.c to armsrc/fpgaloader.c (since there is now a new fpga.o, created from fpga.bit) Remove fpgaimg.c from subversion, add fpga.bit Instead of creating fpgaimage.elf and osimage.elf separately, now create a joined fullimage.elf first (obsoleting ldscript-full), then extract only the fpga and os sections with objcopy (This creates unspecific warnings about an empty segment, need to investigate) Implement a rudimentary .bit parser in the firmware, use that to locate the bitstream in the new fpgaimage (which is just a plain copy of the fpga.bit file) and send it to the FPGA The code will check the format that's in flash and fall back to the legacy format	2009-08-27 23:29:49 +00:00
henryk@ploetzli.ch	391a974f53	(Our Windows ARM toolchain really likes its glue sections)	2009-08-27 16:12:00 +00:00
henryk@ploetzli.ch	2bfed17db2	Add a common linker script with the memory map for the complete project ... Use the correct physical addresses in the memory map, and instead translate the addresses during postprocessing with objcopy	2009-08-27 16:07:35 +00:00
henryk@ploetzli.ch	8652988d62	Merge linker scripts in bootrom to have a single linker script for the bootloader proper (previously known as bootrom-merged.s19) ... Remove the now unnecessary files (merge-srec.pl, ldscript-ram-jtag) Note that this drops the dependency on perl for bootrom build, so end-users who don't touch the FPGA bitstream will not need perl anymore	2009-08-27 04:25:34 +00:00
henryk@ploetzli.ch	0fc0fca583	Move most rules to Makefile.common ... Add automatic dependency generation Compile ISO14443 files in ARM mode, as was the case with the Linux Makefile before	2009-08-26 17:34:19 +00:00
henryk@ploetzli.ch	7e931bbd32	Consolidate Linux/Windows Makefiles into one, see http://www.proxmark.org/forum/topic/312/consolidating-makefile/ ... + Needs GNU make for Windows, a new release of the Windows development environment will follow + Is based on the Windows Makefile, so will build everything in Thumb mode, doesn't have flash commands (yet)	2009-08-26 11:17:05 +00:00
adam@algroup.co.uk	5435eb0ca2	switch off reader field after hi14areader command	2009-08-24 12:20:54 +00:00
adam@algroup.co.uk	093cbaf63e	fix Mifare AUTH for hi14areader command	2009-08-24 12:09:43 +00:00
henryk@ploetzli.ch	bea2a8660e	Add pretty field strength lights for ListenReaderField() also in LF mode.	2009-08-19 23:35:35 +00:00
skamkar	50722269b6	detect usb or no usb for standalone mode [ryan]	2009-08-08 07:42:51 +00:00
d18c7db	7381e8f2f2	Added tiread command to demod TI tags on the PM3	2009-08-06 12:53:06 +00:00
adam@algroup.co.uk	890bf4be90	[henryk] memory map for linux build	2009-07-29 16:03:16 +00:00
d18c7db	0422e2a471	Reduced the size of BigBuf to make more room for stack/vars	2009-07-29 13:37:09 +00:00
d18c7db	9bea179a71	added tiwrite command, split LF code from appmain into lfops.c	2009-07-25 11:47:43 +00:00
d18c7db	0c2ed92d87	Further additions to tidemod to differentiate between ro and rw tags and check crc validity.	2009-07-22 11:39:39 +00:00
adam@algroup.co.uk	ebd7aaf9e7	[rleroy] add signal strength meter to 'detectreader' command (HF only)	2009-07-21 11:15:32 +00:00
d18c7db	8e7a6ce409	This version code now reads a TI tag properly.	2009-07-20 10:36:33 +00:00
d18c7db	67853904cc	Some new commands (threshold and fskdemod) that act on the graph window	2009-07-19 11:00:24 +00:00
d18c7db	c701d2c2fa	Initial attempt at TI tag reading.	2009-07-19 04:37:07 +00:00
d18c7db	17465c9edd	New mode define for FPGA	2009-07-19 03:58:02 +00:00
d18c7db	72acba7884	Added FPGA passthrough mode for TI tags	2009-07-19 03:51:06 +00:00
d18c7db	5e6a0b2369	Tidy up of SpinDelay	2009-07-19 03:47:01 +00:00
d18c7db	f7c64b570c	minor changes to iso15693.c to get rid off all the compile warnings	2009-07-19 00:25:19 +00:00
adam@algroup.co.uk	693f7cf770	make button detection more reliable in standalone mode and add exit command	2009-07-13 12:14:50 +00:00
d18c7db	e7aee94e6a	Merged sweeplf into tune command	2009-07-13 11:20:29 +00:00
skamkar	1dff8c42f5	fix debug printing function, add readmem function	2009-07-13 08:22:24 +00:00
skamkar	955fc5e2f8	Added stand-alone mode (no PC) with HID reading and cloning, moved helper functions to util.c	2009-07-13 04:54:37 +00:00
adam@algroup.co.uk	1dd2335295	compile clean and flasher targets	2009-07-12 10:02:57 +00:00
adam@algroup.co.uk	6bd86cb24a	confirm function has exited on button press	2009-07-10 15:40:24 +00:00
adam@algroup.co.uk	38b65694d6	'sweeplf' tells us antenna's resonant frequency	2009-07-08 02:15:22 +00:00
adam@algroup.co.uk	7f3480429b	add 'detectreader' command - listen for external reader fields	2009-07-07 17:19:42 +00:00
adam@algroup.co.uk	846225d575	#defines for ADC channels so we can see what's what	2009-07-06 16:40:03 +00:00
adam@algroup.co.uk	959baa89f7	send LF commands to TAG (locomread)	2009-07-04 16:45:17 +00:00
adam@algroup.co.uk	f23e056d95	added 'buffclear' - when you absolutely positivley must clear every bit in the room	2009-07-03 10:17:52 +00:00
skamkar	e6b13a5718	Don't depend on local path/lib settings for easier compilation	2009-07-02 01:29:48 +00:00
adam@algroup.co.uk	16e590fd2b	fix loader memory mapping	2009-06-29 13:26:35 +00:00
adam@algroup.co.uk	bb06be43b7	update arm toolchain installer for linux and make it a little more user friendly ... use ARMLIB environment variable so you don't need to edit Makefile.linux after updates	2009-06-28 21:31:35 +00:00
edouard@lafargue.name	d722c4ce78	- Restored the 'reset' command ... - Linux client: detects offline mode and blocks commands which need a connected Proxmark3 (still do to on Windows)	2009-04-27 19:56:43 +00:00
edouard@lafargue.name	0e25ae1102	Rationalized LED usage in 14443-B: LED D shows RF Field OK, ... and LED A, B and C respectively show: - Receiving from reader - Transmitting to tag/reader - Receiving from tag Also, updated the snoop function to make full use of the DMA buffer, which removes (in my case) all the 'blew DMA buffer' issues. Last, moved the compilation of iso1443.c to ARM mode (not thumb) to make it faster on my Linux gcc 4.3 version, otherwise the 'blew DMA buffer' issue was systematic. Also: restored the "indalademod" command which had mysteriously disappeared from the prox.exe (proxmark3) client!	2009-04-26 14:26:06 +00:00
edouard@lafargue.name	aa4d9d9b73	- Added new Makefile.linux in bootrom directory ... - Cleaned up Makefile.linux in armsrc directory - Added Linux toolchain build script in tools directory - Made LCD support optional (disabled by default) in armsrc - Small formatting changes	2009-04-25 21:19:59 +00:00
edouard@lafargue.name	b1d0de0a08	Added a gnu make compatible Makefile to armsrc for compiling on Linux	2009-04-21 17:24:42 +00:00
d18c7db	1c38843b3f	Updated logic in lo_read.v so it's much tidier now, better timing. ... Commented source and recompiled FPGA to new fpgaimg.c	2009-04-16 23:09:21 +00:00
edouard@lafargue.name	1a093c19b5	Added UID reading to SRI512, and reordered the output to reflect the ... MSB-LSB alignment of the data. Routine should now be OK (including CRC...)	2009-04-16 09:30:11 +00:00
edouard@lafargue.name	fb25b48308	Added a new function to read ISO14443-B ST Microelectronics SRI512 memory tags. ... I have a problem with CRC though: sometimes it works, sometimes not, I have no clue why, I must be doing something wrong with the CRC calculation routine...	2009-04-16 08:37:24 +00:00
edouard@lafargue.name	30f2a7d38f	Added LF frequency adjustments from d18c7db, cleaned up code, ... typo fixes in iso14443a code, added the missing "tools" directory, added initial elements for online/offline detection for commands.	2009-04-15 08:09:06 +00:00
edouard@lafargue.name	6658905f18	Initial commit for the firmware. Used the 20090306_ela version as baseline. ... It is identical to the popular 20081211, with the doob addition (20090301), a linux client, and two additional commands for LF analysis. Let me know if you find issues here!	2009-04-09 06:43:20 +00:00