dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,559 Commits 7 Branches 1 Tag
f445df401eef592968a87247137930b3c3bf52fa
Commit Graph

557 Commits

Author SHA1 Message Date
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