iceman1001 [Tue, 28 Jul 2015 23:10:06 +0000 (01:10 +0200)]
Merge some PM3 master commits. Had to re-make the StandAloneMode to work with flags in SimulateIso14443aTag
iceman1001 [Tue, 28 Jul 2015 19:35:15 +0000 (21:35 +0200)]
Merge branch 'master' of https://github.com/iceman1001/proxmark3
iceman1001 [Tue, 28 Jul 2015 19:33:09 +0000 (21:33 +0200)]
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.
Iceman [Tue, 28 Jul 2015 19:30:16 +0000 (21:30 +0200)]
Merge pull request #3 from gcohen55/gitigupdate
gitignore updated because of new bin
Gil Cohen [Tue, 28 Jul 2015 18:05:42 +0000 (14:05 -0400)]
gitignore updated because of new bin
iceman1001 [Fri, 24 Jul 2015 18:34:31 +0000 (20:34 +0200)]
REM: Remove a double pasted section of local variables.
iceman1001 [Fri, 24 Jul 2015 14:45:52 +0000 (16:45 +0200)]
REM: removed a comment
ADD: added the ISO14443b command to commands.lua
iceman1001 [Wed, 22 Jul 2015 21:45:41 +0000 (23:45 +0200)]
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.
iceman1001 [Wed, 22 Jul 2015 21:36:28 +0000 (23:36 +0200)]
REM: Removed a debugstatment
iceman1001 [Wed, 22 Jul 2015 21:00:52 +0000 (23:00 +0200)]
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.
iceman1001 [Wed, 22 Jul 2015 09:19:15 +0000 (11:19 +0200)]
ADD: started with adding a "LS" command that lists the commands without the help text printed. To give easy clean list.
iceman1001 [Sun, 19 Jul 2015 21:24:19 +0000 (23:24 +0200)]
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.
iceman1001 [Sat, 18 Jul 2015 18:43:14 +0000 (20:43 +0200)]
ADD: @holiman's clearCommandBuffer in cmdlft55xx.c
ADD: @VERTCraig's AVID commands.
TEST: testing some changes to iso14443 demod.
iceman1001 [Fri, 17 Jul 2015 19:56:00 +0000 (21:56 +0200)]
ADD: ISO7816-4 annotation in "hf list".
Only basic 7816 command apdu supported. USAGE::"hf list 7816"
iceman1001 [Mon, 13 Jul 2015 21:06:49 +0000 (23:06 +0200)]
TEST: Moebius two noce mfkey32...
iceman1001 [Sun, 12 Jul 2015 22:04:16 +0000 (00:04 +0200)]
@frederikmoellers EPA changes, with APDU for ISO14443b support
iceman1001 [Sun, 12 Jul 2015 20:58:16 +0000 (22:58 +0200)]
@PM3 master merges, Piwi fix for mfnested
@Marshmellow42 's fix for FDB
iceman1001 [Mon, 29 Jun 2015 20:37:55 +0000 (22:37 +0200)]
CHG: some minor changes in the ouput from hf 14b raw.
ADD: @marshmello42 's textual change in LF.
iceman1001 [Mon, 29 Jun 2015 20:36:55 +0000 (22:36 +0200)]
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.
iceman1001 [Thu, 25 Jun 2015 10:41:39 +0000 (12:41 +0200)]
FIX: @pwpiwi 's fixes for darkside / nested attack about the NACK/PRNG bugs.
iceman1001 [Thu, 25 Jun 2015 10:29:41 +0000 (12:29 +0200)]
ADD: forgot the zlib and some new fpga compress file.s
iceman1001 [Thu, 25 Jun 2015 10:25:44 +0000 (12:25 +0200)]
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...
iceman1001 [Thu, 25 Jun 2015 10:22:34 +0000 (12:22 +0200)]
ADD: pwpiwi 's FPGA compress
iceman1001 [Tue, 23 Jun 2015 21:02:29 +0000 (23:02 +0200)]
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
iceman1001 [Tue, 23 Jun 2015 20:51:15 +0000 (22:51 +0200)]
CHG: modified the CHANGELOG.md
iceman1001 [Tue, 23 Jun 2015 20:30:18 +0000 (22:30 +0200)]
ADD: PACE functionality ref: https://github.com/Proxmark/proxmark3/pull/121
FIX: some missing usb_commands for EPA.
Martin Holst Swende [Tue, 23 Jun 2015 20:24:55 +0000 (22:24 +0200)]
Changelog
Martin Holst Swende [Tue, 23 Jun 2015 20:23:08 +0000 (22:23 +0200)]
Merge pull request #121 from frederikmoellers/master
Add PACE replay functionality
Martin Holst Swende [Tue, 23 Jun 2015 20:19:15 +0000 (22:19 +0200)]
Merge branch 'master' of github.com:Proxmark/proxmark3
Martin Holst Swende [Tue, 23 Jun 2015 20:18:50 +0000 (22:18 +0200)]
Merge pull request #118 from marshmellow42/master
fix t55xx write timing
Martin Holst Swende [Tue, 23 Jun 2015 20:12:03 +0000 (22:12 +0200)]
Updated changelog
iceman1001 [Tue, 23 Jun 2015 17:22:40 +0000 (19:22 +0200)]
FIX: ref https://github.com/marshmellow42/proxmark3/commit/
2ec87733142000646c7ce86c74f61330f451b110
@marshmellow42 's fixes for pskdemod and mfu.
marshmellow42 [Tue, 23 Jun 2015 16:16:23 +0000 (12:16 -0400)]
fix bug in pskdemod return value if no samples...
... caused crash in data psknexwatchdemod if no samples were in the
graphbuffer.
also fixed hf mfu wrbl and rdbl to allow printing of help without a tag
being present.
pwpiwi [Tue, 23 Jun 2015 05:14:52 +0000 (07:14 +0200)]
Merge pull request #114 from pwpiwi/iso14443b_fix
fixing iso14443b (issue #103): fix bug introduced during Bigbuf rework
pwpiwi [Mon, 22 Jun 2015 19:45:28 +0000 (21:45 +0200)]
fixing iso14443b (issue #103):
- increased DMA_BUFFER_SIZE to avoid occasional circular buffer overflows.
- minor code cleanups
Frederik Möllers [Mon, 22 Jun 2015 12:20:13 +0000 (14:20 +0200)]
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.
iceman1001 [Mon, 22 Jun 2015 07:49:12 +0000 (09:49 +0200)]
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.
iceman1001 [Sun, 21 Jun 2015 19:57:52 +0000 (21:57 +0200)]
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..
iceman1001 [Sun, 21 Jun 2015 19:56:44 +0000 (21:56 +0200)]
ADD: @pwpivi latest fixes.
ADD: @marshmellows fixes.
pwpiwi [Sun, 21 Jun 2015 16:00:42 +0000 (18:00 +0200)]
fixing iso14443b (issue #103):
- fix hf 14b snoop
- fix hf 14b sim
iceman1001 [Sun, 21 Jun 2015 09:09:54 +0000 (11:09 +0200)]
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
iceman1001 [Sun, 21 Jun 2015 09:07:05 +0000 (11:07 +0200)]
ADD: @marshmellow42 fudan detection in hf mfu
ADD: @marshmellow42 14b reader changes.
ADD: @pwpiwi 14b fixes
marshmellow42 [Sun, 21 Jun 2015 01:33:42 +0000 (21:33 -0400)]
comment fudan check possibilities
marshmellow42 [Thu, 18 Jun 2015 21:19:43 +0000 (17:19 -0400)]
add ultralight compatible test
pwpiwi [Thu, 18 Jun 2015 13:30:56 +0000 (15:30 +0200)]
fixing iso14443b (issue #103):
- revert removal of FPGA_HF_READER_RX_XCORR_848_KHZ. Need to be able to switch to 424kHz for ISO15693.
iceman1001 [Thu, 18 Jun 2015 11:51:00 +0000 (13:51 +0200)]
ADD: @pwpiwi 's fix https://github.com/Proxmark/proxmark3/commit/
50365fedcbaf91ce530ca8507d2f377dc76ffd59
pwpiwi [Thu, 18 Jun 2015 09:38:58 +0000 (11:38 +0200)]
Merge pull request #120 from pwpiwi/fix_compile_errors
fix issue #116: remove includes of stdio.h in armsrc
pwpiwi [Thu, 18 Jun 2015 09:33:53 +0000 (11:33 +0200)]
fix issue #116: remove includes of stdio.h in armsrc
iceman1001 [Thu, 18 Jun 2015 07:52:53 +0000 (09:52 +0200)]
add: @pwpipi 's fixes to 14B
iceman1001 [Thu, 18 Jun 2015 07:52:25 +0000 (09:52 +0200)]
ADD: @marshmellow42 's help text changes to the reveng
iceman1001 [Thu, 18 Jun 2015 07:51:30 +0000 (09:51 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
armsrc/iso14443a.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
client/Makefile
client/cmddata.c
client/cmdhfmf.c
client/cmdhfmfu.c
client/lualibs/utils.lua
client/scripting.c
client/scripts/didump.lua
client/util.c
client/util.h
common/crc16.c
common/lfdemod.c
common/sha1.c
pwpiwi [Thu, 18 Jun 2015 07:49:22 +0000 (09:49 +0200)]
fixing iso 14443b (issue #103):
- fix: treat empty commands as error
- deleting dead code
- rename USB-Commands (ISO14443 -> iso14443B)
pwpiwi [Thu, 18 Jun 2015 05:56:08 +0000 (07:56 +0200)]
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
pwpiwi [Fri, 12 Jun 2015 05:43:00 +0000 (07:43 +0200)]
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
iceman1001 [Mon, 15 Jun 2015 19:02:17 +0000 (21:02 +0200)]
CHG: just made sure it uses a default file name now.
iceman1001 [Mon, 15 Jun 2015 18:59:01 +0000 (20:59 +0200)]
ADD: @marshmellow42 's 14b changes.
iceman1001 [Mon, 15 Jun 2015 12:01:34 +0000 (14:01 +0200)]
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, :)
iceman1001 [Mon, 15 Jun 2015 11:59:33 +0000 (13:59 +0200)]
FIX: removed width in cmdcrc.c , to get rid of the compiler warning.
marshmellow42 [Mon, 15 Jun 2015 04:44:57 +0000 (00:44 -0400)]
minor fixes
see @icemant1001 -
https://github.com/iceman1001/proxmark3/commit/
0ad1a1d492ab62eb42c1eb7b4ce6fff05d90e0a3
for more details
marshmellow42 [Sun, 14 Jun 2015 22:12:16 +0000 (18:12 -0400)]
Merge pull request #6 from marshmellow42/master
fix biphase
iceman1001 [Sun, 14 Jun 2015 21:32:20 +0000 (23:32 +0200)]
add: a .gitignore to be able to add the folder client/obj/reveng.
iceman1001 [Sun, 14 Jun 2015 21:31:52 +0000 (23:31 +0200)]
add: a .gitignore to be able to add the folder client/platforms.
iceman1001 [Sun, 14 Jun 2015 21:31:05 +0000 (23:31 +0200)]
fix; stupid fixes for some compiler warnings messages of unused variables..
iceman1001 [Sun, 14 Jun 2015 21:02:52 +0000 (23:02 +0200)]
FIX: minor variable fixes when compiling on linux.
cmddata.c: In function ‘Cmdmandecoderaw’:
cmddata.c:420:2: warning: format ‘%i’ expects argument of type ‘int *’, but argument 4 has type ‘size_t *’ [-Wformat=]
sscanf(Cmd, "%i %i", &invert, &maxErr);
^
cmdlfem4x.c: In function ‘CmdEM410xRead’:
cmdlfem4x.c:58:2: warning: format ‘%llx’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘uint64_t’ [-Wformat=]
sprintf(id, "%010llx",lo);
^
iceman1001 [Sun, 14 Jun 2015 20:40:18 +0000 (22:40 +0200)]
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"
Martin Holst Swende [Sun, 14 Jun 2015 17:32:36 +0000 (19:32 +0200)]
Merge pull request #117 from marshmellow42/master
askbiphase bug fix
iceman1001 [Sun, 14 Jun 2015 15:19:41 +0000 (17:19 +0200)]
chg: added some more outputs to the reveng-crc script e.lua ... now shows -b -B -l -L also in columns. You'll need to read the reveng -h helptext to understand.
iceman1001 [Sun, 14 Jun 2015 15:18:22 +0000 (17:18 +0200)]
FIX: old bug back, and now fixed again. @marshmellow42
marshmellow42 [Sun, 14 Jun 2015 15:11:00 +0000 (11:11 -0400)]
add comment
marshmellow42 [Sun, 14 Jun 2015 14:54:55 +0000 (10:54 -0400)]
bug fix. askdemod edits invert pointer, cannot be 0
iceman1001 [Sun, 14 Jun 2015 12:39:50 +0000 (14:39 +0200)]
ADD: @marshmellow42 's 14b reader changes.
FIX: @marshmellow42 's ASKbiphaseDemod fixes.
CHG: added a check in ASKbiphaseDemod to make a compiler warning message go away.
Martin Holst Swende [Sun, 14 Jun 2015 07:02:13 +0000 (09:02 +0200)]
Merge pull request #115 from marshmellow42/master
add-ons and bug fixes
iceman1001 [Sat, 13 Jun 2015 10:14:38 +0000 (12:14 +0200)]
minor textual changes from @marshmellow42
iceman1001 [Sat, 13 Jun 2015 10:13:21 +0000 (12:13 +0200)]
FIX: Reverting the t55x7 timings. (@marshmellow42 's fix)
marshmellow42 [Fri, 12 Jun 2015 03:52:40 +0000 (23:52 -0400)]
revert t55xx start gap and write timing changes
also noted specs in comments
iceman1001 [Wed, 10 Jun 2015 06:46:16 +0000 (08:46 +0200)]
ADD: @marshmellow42 's new "-g" search for crc in a hexstring *great*
ADD: fixes in the reveng calling methods
iceman1001 [Tue, 9 Jun 2015 19:46:22 +0000 (21:46 +0200)]
fix: nice output..
iceman1001 [Tue, 9 Jun 2015 19:32:22 +0000 (21:32 +0200)]
@marshmellows memory fixes for reveng1.30 in client..
iceman1001 [Tue, 9 Jun 2015 19:29:24 +0000 (21:29 +0200)]
@marshmellows memory fix
iceman1001 [Tue, 9 Jun 2015 19:28:06 +0000 (21:28 +0200)]
CHG: minor layout and call fixes to e.lua (the test script for hooking up reveng1.30)
iceman1001 [Tue, 9 Jun 2015 11:31:53 +0000 (13:31 +0200)]
CHG: all @marshmellow42 's changes to make the reveng work.
ADD: lua script test for using the reveng inside lua. *prove of concept*
it implements -h help
-d data in a hexstring
-w width of the crc family. (ie 16 gives all CRC-16 calculations.
it iterates thru all found crc presets in a crc family based on the width of crc. It calcs crc and the reverse crc.
iceman1001 [Sun, 7 Jun 2015 09:35:49 +0000 (11:35 +0200)]
ADD: iso11784/85 FDX-B
ADD: the source from RevEng 1.30, got into the PM3 client.
marshmellow42 [Sun, 7 Jun 2015 04:42:57 +0000 (00:42 -0400)]
add clock to ask rawdemod outputs
fix biphase invert bug (correctly)
marshmellow42 [Sat, 6 Jun 2015 02:39:56 +0000 (22:39 -0400)]
Modified kermit crc to use existing crc calc code
marshmellow42 [Thu, 4 Jun 2015 17:10:33 +0000 (13:10 -0400)]
fdx-b clean up
marshmellow42 [Thu, 4 Jun 2015 16:53:19 +0000 (12:53 -0400)]
Add CCITT Kermit CRC check for FDX-B demod
iceman1001 [Thu, 4 Jun 2015 08:33:55 +0000 (10:33 +0200)]
ADD: @marshmellow42 's fixed version of the ISO11784 FDX-B
ADD: crc16_ccitt_rev (reverse version of crc16_ccitt 0x0000)
marshmellow42 [Thu, 4 Jun 2015 04:05:37 +0000 (00:05 -0400)]
add fdx-b to cmddata.h
marshmellow42 [Thu, 4 Jun 2015 04:04:49 +0000 (00:04 -0400)]
add fdx-b to lf search
marshmellow42 [Thu, 4 Jun 2015 03:59:22 +0000 (23:59 -0400)]
bug fix - biphase invert + fdx-b adjustments
marshmellow42 [Wed, 3 Jun 2015 22:28:56 +0000 (18:28 -0400)]
addition animal tags demod info
marshmellow42 [Wed, 3 Jun 2015 20:52:20 +0000 (16:52 -0400)]
Testing animal tags
iceman1001 [Wed, 3 Jun 2015 20:38:59 +0000 (22:38 +0200)]
ADD: removed the paritythingy, I missunderstood its purpose.
iceman1001 [Wed, 3 Jun 2015 20:19:32 +0000 (22:19 +0200)]
CHG: trying to get the askdemod / biphasedeocde / finding startmarker / removeparity to work in ISO11784demod
iceman1001 [Wed, 3 Jun 2015 19:35:03 +0000 (21:35 +0200)]
ADD: next step ISO11784/85
iceman1001 [Wed, 3 Jun 2015 19:12:55 +0000 (21:12 +0200)]
ADD @pwpiwi 's fixes for "HF 14B" commands.
iceman1001 [Wed, 3 Jun 2015 19:12:24 +0000 (21:12 +0200)]
FIX: a minor bug fix from @marshmellow42 in "data raw" and ask/biphase.
ADD: started witha ISO11784/85 demod function.
pwpiwi [Wed, 3 Jun 2015 11:28:28 +0000 (13:28 +0200)]
fixing iso14443b (issue #103): fix timing issue (speeding up
the decoders)
pwpiwi [Tue, 2 Jun 2015 20:27:14 +0000 (22:27 +0200)]
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).
iceman1001 [Tue, 2 Jun 2015 10:23:06 +0000 (12:23 +0200)]
DEL: removed old iso14443.c since @pwpiwi renamed it..