]> git.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
9 years ago@marshmellows last LF changes.
iceman1001 [Fri, 20 Nov 2015 15:56:43 +0000 (16:56 +0100)]
@marshmellows last LF changes.
- wipe a t55x7 tag
- stable demods
-

9 years agoFIX: some fixes to indalademod and viking from @marshmellow42
iceman1001 [Tue, 10 Nov 2015 17:56:43 +0000 (18:56 +0100)]
FIX:  some fixes to indalademod and viking from @marshmellow42

9 years agoFIX: an error that I introduced to the csetblock command with wrong length of crc...
iceman1001 [Tue, 10 Nov 2015 10:45:45 +0000 (11:45 +0100)]
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.

9 years agoadded @marshmellows new viking demod.
iceman1001 [Tue, 10 Nov 2015 10:42:59 +0000 (11:42 +0100)]
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.

9 years agofix: forgot to remove this when merging piwi's fixes.
iceman1001 [Mon, 9 Nov 2015 21:06:48 +0000 (22:06 +0100)]
fix:  forgot to remove this when merging piwi's fixes.

9 years agoCHG: minor code clean up, removed commented old code.
iceman1001 [Mon, 9 Nov 2015 20:51:34 +0000 (21:51 +0100)]
CHG: minor code clean up,  removed commented old code.
ADD: usb_poll_validate_length  to some deviceside loops.
ADD: @marshmellow42 's fixes to LF

9 years agoADD: @marshmellow fix for em41x clock.
iceman1001 [Mon, 9 Nov 2015 20:49:02 +0000 (21:49 +0100)]
ADD: @marshmellow fix for em41x clock.
CHG: swap the int to a uint8_t to skip a compiler error

9 years agoADD: @piwi's fixes to "hf snoop" where it empties the bigbuffer before snooping.
iceman1001 [Mon, 9 Nov 2015 20:48:09 +0000 (21:48 +0100)]
ADD: @piwi's fixes to "hf snoop" where it empties the bigbuffer before snooping.

9 years agoADD: @piwi's changes to .gitignore.
iceman1001 [Mon, 9 Nov 2015 20:47:26 +0000 (21:47 +0100)]
ADD:  @piwi's changes to .gitignore.

9 years agoADD: @piwi's fixes to .history
iceman1001 [Mon, 9 Nov 2015 20:46:57 +0000 (21:46 +0100)]
ADD:  @piwi's fixes to .history

9 years agoCHG: a major remake of the "hf mf c*" commands. Ie chinese magic tags. Tried to...
iceman1001 [Mon, 9 Nov 2015 20:46:15 +0000 (21:46 +0100)]
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..

9 years agoADD: @bm2gii some kind of andriod fix for the lua.
iceman1001 [Mon, 2 Nov 2015 19:47:15 +0000 (20:47 +0100)]
ADD:  @bm2gii some kind of andriod fix for the lua.

9 years agoADD: @marshmellow42 's fixex and resetread t55x7
iceman1001 [Mon, 2 Nov 2015 19:46:17 +0000 (20:46 +0100)]
ADD: @marshmellow42 's fixex and resetread t55x7

9 years agoCHG: @ematrix / @piwi fixes for 'hf snoop'
iceman1001 [Mon, 2 Nov 2015 10:41:25 +0000 (11:41 +0100)]
CHG: @ematrix / @piwi fixes for 'hf snoop'

9 years agoCHG: some magic generation1 tags is not following protocol and answers to the "halt...
iceman1001 [Sun, 1 Nov 2015 21:16:16 +0000 (22:16 +0100)]
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.

9 years agoADD: help text for 'hf snoop' / 'hf search' / 'hf list'
iceman1001 [Sun, 1 Nov 2015 18:49:08 +0000 (19:49 +0100)]
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

9 years agoCHG: the updated fpga image for the "hf snoop"
iceman1001 [Fri, 30 Oct 2015 08:10:09 +0000 (09:10 +0100)]
CHG:  the updated fpga image for the "hf snoop"

9 years agoCHG: some desfire changes from @bforbort fork. *untested*
iceman1001 [Fri, 30 Oct 2015 08:09:35 +0000 (09:09 +0100)]
CHG:  some desfire changes from @bforbort fork.  *untested*

9 years agoADD: a minor xor script
iceman1001 [Fri, 30 Oct 2015 08:07:04 +0000 (09:07 +0100)]
ADD:  a minor xor script

9 years agoADD: @gm4tr1x found some new known mifare keys.
iceman1001 [Fri, 30 Oct 2015 08:05:22 +0000 (09:05 +0100)]
ADD: @gm4tr1x found some new known mifare keys.

9 years agoADD: added the "hf snoop" patch original from @Enio, rearranged by @Etmatrix.
iceman1001 [Tue, 27 Oct 2015 20:47:21 +0000 (21:47 +0100)]
ADD:  added the "hf snoop"  patch original from @Enio,  rearranged by @Etmatrix.
ADD:  added the "t55x7" refactoring by @marshmellow42

9 years agoADD: 'LF T55X7 WAKEUP' command. For tags with AOR bit set, send this command...
iceman1001 [Wed, 21 Oct 2015 07:12:33 +0000 (09:12 +0200)]
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.

9 years agoCHG: move some methods, its easier to read now. Cosmetic change.
iceman1001 [Wed, 21 Oct 2015 07:07:36 +0000 (09:07 +0200)]
CHG: move some methods, its easier to read now.   Cosmetic change.

9 years agoCHG: some cleanup of pcf7931.c
iceman1001 [Tue, 20 Oct 2015 17:02:03 +0000 (19:02 +0200)]
CHG:  some cleanup of pcf7931.c

9 years agoADD: @marshmellows42 's fixes for "lf cmdread" and CHANGELOG.md
iceman1001 [Tue, 20 Oct 2015 17:00:02 +0000 (19:00 +0200)]
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.

9 years agoADD: some more keys found on a pastebin
iceman1001 [Mon, 19 Oct 2015 20:41:53 +0000 (22:41 +0200)]
ADD: some more keys found on a pastebin

9 years agoFIX: tnp3sim, now can insert keys if the dumpfile is blank. Like the ,,,lander dumps...
iceman1001 [Mon, 19 Oct 2015 20:39:08 +0000 (22:39 +0200)]
FIX: tnp3sim, now can insert keys if the dumpfile is blank. Like the ,,,lander dumps...

9 years agoFIX: "abort trap 6" error when runing the tnp3sim.lua script was because the CMD_MIF...
iceman1001 [Sat, 17 Oct 2015 12:35:04 +0000 (14:35 +0200)]
FIX:  "abort trap 6" error when runing the tnp3sim.lua script was because the CMD_MIFARE_EML_MEMSET needs to sent the bytewitdh now with recent changes in code to deal with different sizes in emulatormemory.   the third argument should be 16 instead of 0.

9 years agoFIX: @tony pointed out that there was a method name lost... its been reinstated :)
iceman1001 [Sat, 17 Oct 2015 12:16:42 +0000 (14:16 +0200)]
FIX: @tony pointed out that there was a method name lost...  its been reinstated :)

9 years agoFIX: thanks @tony, for pointing out a "end" statement inside tnp3sim.lua
iceman1001 [Fri, 16 Oct 2015 21:16:46 +0000 (23:16 +0200)]
FIX: thanks @tony, for pointing out a "end" statement inside tnp3sim.lua
ADD: @marshmello42 fixs for t55x7

9 years agotest
iceman1001 [Thu, 15 Oct 2015 17:30:11 +0000 (19:30 +0200)]
test

9 years agoFIX: a suggested fix for #136 where the "lf t55x7 read" command when called with...
iceman1001 [Thu, 15 Oct 2015 17:17:20 +0000 (19:17 +0200)]
FIX:  a suggested fix for #136 where the "lf t55x7 read" command when called with a password. The call will now try loading the config block,  decode it and see if PWD is set.
If PWD Bit is set,  the call will be allowed to execute.
If PWD Bit is NOT set,  the call will print a message and excute the call but without sending the password.
If config block is not being able to read or decode,   the call with print a warning message and exit the call.

9 years agoCHG: code clean up. Have some questions regarding the CopyVikingTo method. The...
iceman1001 [Thu, 15 Oct 2015 09:30:37 +0000 (11:30 +0200)]
CHG:  code clean up.  Have some questions regarding the CopyVikingTo method. The configblock looks wrong..

9 years agoCHG: minor updates in the T55x7 methods. added the LED_A_ON / LED_A_OFF to indicate...
iceman1001 [Thu, 15 Oct 2015 09:00:07 +0000 (11:00 +0200)]
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.

9 years agoADD: @marshmellows fixes for t55x7 reading signal.
iceman1001 [Thu, 15 Oct 2015 08:23:15 +0000 (10:23 +0200)]
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.

9 years agoFIX: The T55x7ReadBlock method, should not have the startgap since it indicats...
iceman1001 [Wed, 14 Oct 2015 09:39:51 +0000 (11:39 +0200)]
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.

9 years agoFIX: fixed the "lf pcf7931 write" input validation. *untested*
iceman1001 [Wed, 14 Oct 2015 09:16:43 +0000 (11:16 +0200)]
FIX:  fixed the "lf pcf7931 write" input validation.  *untested*

9 years agoFIX: Removed a arrat from the struct configPcf in "LF PCF7931"
iceman1001 [Mon, 12 Oct 2015 19:49:11 +0000 (21:49 +0200)]
FIX: Removed a arrat from the struct configPcf in "LF PCF7931"

9 years agoFIX: I did a clean up of the "LF PCF7931" code. The write command is not quite done.
iceman1001 [Mon, 12 Oct 2015 19:30:54 +0000 (21:30 +0200)]
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..

9 years agoADD: There were lot of calls to enable tracing, but very few to turn it of afterwar...
iceman1001 [Sun, 11 Oct 2015 17:14:17 +0000 (19:14 +0200)]
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.

9 years agoADD: @marshmellow42's decrypt crypto-1 method,
iceman1001 [Sun, 11 Oct 2015 07:07:29 +0000 (09:07 +0200)]
ADD:  @marshmellow42's decrypt crypto-1 method,
ADD:  @piwi's latest commit to PM3 Master, aiming at the WDR in "hf mf mifare".

9 years agoI just merged @marshmellow's branch "iclass" and that was a lot of new functionality...
iceman1001 [Wed, 7 Oct 2015 21:00:46 +0000 (23:00 +0200)]
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..

9 years agoADD: fixed some spelling misstakes in luascript.
iceman1001 [Mon, 5 Oct 2015 19:25:00 +0000 (21:25 +0200)]
ADD: fixed some spelling misstakes in luascript.
ADD: fixed some spelling misstakes in "hf mfu eload" help

9 years agoA lot of changes...
iceman1001 [Sun, 4 Oct 2015 16:01:33 +0000 (18:01 +0200)]
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..

9 years agoMINOR CHG: help text change for the "lf t55xx config" command. change NZ into NRZ
iceman1001 [Wed, 12 Aug 2015 19:39:29 +0000 (21:39 +0200)]
MINOR CHG:   help text change for the "lf t55xx config" command.  change  NZ into NRZ

9 years agoMerge pull request #4 from gcohen55/ubuntu_makefile
Iceman [Tue, 4 Aug 2015 07:34:24 +0000 (09:34 +0200)]
Merge pull request #4 from gcohen55/ubuntu_makefile

updated makefile, readme

9 years agoupdated makefile, readme
Gil Cohen [Tue, 4 Aug 2015 04:07:57 +0000 (23:07 -0500)]
updated makefile, readme

9 years agoFIX: A old bug regarding: CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K command, where it...
iceman1001 [Fri, 31 Jul 2015 16:48:58 +0000 (18:48 +0200)]
FIX:  A old bug regarding: CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K command,  where it causes the USB_COMMAND_BUFFER to overfill is corrected. The message: "WARNING: Command buffer about to overwrite command! This needs to be fixed!"  was showing when it happens.
The solution is not to add the CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K  to the storeCommand function.

9 years agoadded @piwi 's usb speed test.
iceman1001 [Fri, 31 Jul 2015 08:37:24 +0000 (10:37 +0200)]
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.

9 years agoMerge some PM3 master commits. Had to re-make the StandAloneMode to work with flags...
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

9 years agoMerge branch 'master' of https://github.com/iceman1001/proxmark3
iceman1001 [Tue, 28 Jul 2015 19:35:15 +0000 (21:35 +0200)]
Merge branch 'master' of https://github.com/iceman1001/proxmark3

9 years agoMOD:: reverse back changes to 14443b.c
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.

9 years agoMerge pull request #3 from gcohen55/gitigupdate
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

9 years agogitignore updated because of new bin
Gil Cohen [Tue, 28 Jul 2015 18:05:42 +0000 (14:05 -0400)]
gitignore updated because of new bin

9 years agoREM: Remove a double pasted section of local variables.
iceman1001 [Fri, 24 Jul 2015 18:34:31 +0000 (20:34 +0200)]
REM:  Remove a double pasted section of local variables.

9 years agoREM: removed a comment
iceman1001 [Fri, 24 Jul 2015 14:45:52 +0000 (16:45 +0200)]
REM: removed a comment
ADD: added the ISO14443b command to commands.lua

9 years agoADD: using @holiman's "ubs_poll_validate_length() function in some device-side...
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.

9 years agoREM: Removed a debugstatment
iceman1001 [Wed, 22 Jul 2015 21:36:28 +0000 (23:36 +0200)]
REM:  Removed a debugstatment

9 years agoMERGED: @holimans changes
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.

9 years agoADD: started with adding a "LS" command that lists the commands without the help...
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.

9 years agoFIX: "hf list 7816", the s-blocks is now also printed.
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.

9 years agoADD: @holiman's clearCommandBuffer in cmdlft55xx.c
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.

9 years agoADD: ISO7816-4 annotation in "hf list".
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"

9 years agoTEST: Moebius two noce mfkey32...
iceman1001 [Mon, 13 Jul 2015 21:06:49 +0000 (23:06 +0200)]
TEST:   Moebius two noce mfkey32...

9 years ago@frederikmoellers EPA changes, with APDU for ISO14443b support
iceman1001 [Sun, 12 Jul 2015 22:04:16 +0000 (00:04 +0200)]
@frederikmoellers EPA changes,  with APDU for ISO14443b support

9 years ago@PM3 master merges, Piwi fix for mfnested
iceman1001 [Sun, 12 Jul 2015 20:58:16 +0000 (22:58 +0200)]
@PM3 master merges, Piwi fix for mfnested
@Marshmellow42 's fix for FDB

9 years agoCHG: some minor changes in the ouput from hf 14b raw.
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.

9 years agoADD: @pwpivi 's latest fixes for bigbuff
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.

9 years agoFIX: @pwpiwi 's fixes for darkside / nested attack about the NACK/PRNG bugs.
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.

9 years agoADD: forgot the zlib and some new fpga compress file.s
iceman1001 [Thu, 25 Jun 2015 10:29:41 +0000 (12:29 +0200)]
ADD:  forgot the zlib and some new fpga compress file.s

9 years agoADD: @marshmellow42 's 14b fixes.
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...

9 years agoADD: pwpiwi 's FPGA compress
iceman1001 [Thu, 25 Jun 2015 10:22:34 +0000 (12:22 +0200)]
ADD: pwpiwi 's FPGA compress

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
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

9 years agoCHG: modified the CHANGELOG.md
iceman1001 [Tue, 23 Jun 2015 20:51:15 +0000 (22:51 +0200)]
CHG: modified the CHANGELOG.md

9 years agoADD: PACE functionality ref: https://github.com/Proxmark/proxmark3/pull/121
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.

9 years agoChangelog
Martin Holst Swende [Tue, 23 Jun 2015 20:24:55 +0000 (22:24 +0200)]
Changelog

9 years agoMerge pull request #121 from frederikmoellers/master
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

9 years agoMerge branch 'master' of github.com:Proxmark/proxmark3
Martin Holst Swende [Tue, 23 Jun 2015 20:19:15 +0000 (22:19 +0200)]
Merge branch 'master' of github.com:Proxmark/proxmark3

9 years agoMerge pull request #118 from marshmellow42/master
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

9 years agoUpdated changelog v2.1.0
Martin Holst Swende [Tue, 23 Jun 2015 20:12:03 +0000 (22:12 +0200)]
Updated changelog

9 years agoFIX: ref https://github.com/marshmellow42/proxmark3/commit/2ec87733142000646c7ce86c7...
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.

9 years agofix bug in pskdemod return value if no samples... 118/head
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.

9 years agoMerge pull request #114 from pwpiwi/iso14443b_fix
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

9 years agofixing iso14443b (issue #103): 114/head
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

9 years agoAdd PACE replay functionality 121/head
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.

9 years agoFIX: fastread dont do multiplication by zero, thanks @marshmellow42
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.

9 years agoCHG: "hf 14 sim t 7" ie NTAG simulation, now reads the emulator memory for read...
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..

9 years agoADD: @pwpivi latest fixes.
iceman1001 [Sun, 21 Jun 2015 19:56:44 +0000 (21:56 +0200)]
ADD: @pwpivi latest fixes.
ADD: @marshmellows fixes.

9 years agofixing iso14443b (issue #103):
pwpiwi [Sun, 21 Jun 2015 16:00:42 +0000 (18:00 +0200)]
fixing iso14443b (issue #103):
- fix hf 14b snoop
- fix hf 14b sim

9 years agoFIX: "hf 14a sim" fixes to CRC calc.
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

9 years agoADD: @marshmellow42 fudan detection in hf mfu
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

9 years agocomment fudan check possibilities
marshmellow42 [Sun, 21 Jun 2015 01:33:42 +0000 (21:33 -0400)]
comment fudan check possibilities

9 years agoadd ultralight compatible test
marshmellow42 [Thu, 18 Jun 2015 21:19:43 +0000 (17:19 -0400)]
add ultralight compatible test

9 years agofixing iso14443b (issue #103):
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.

9 years agoADD: @pwpiwi 's fix https://github.com/Proxmark/proxmark3/commit/50365fedcbaf91ce530c...
iceman1001 [Thu, 18 Jun 2015 11:51:00 +0000 (13:51 +0200)]
ADD: @pwpiwi 's fix https://github.com/Proxmark/proxmark3/commit/50365fedcbaf91ce530ca8507d2f377dc76ffd59

9 years agoMerge pull request #120 from pwpiwi/fix_compile_errors
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

9 years agofix issue #116: remove includes of stdio.h in armsrc 120/head
pwpiwi [Thu, 18 Jun 2015 09:33:53 +0000 (11:33 +0200)]
fix issue #116: remove includes of stdio.h in armsrc

9 years agoadd: @pwpipi 's fixes to 14B
iceman1001 [Thu, 18 Jun 2015 07:52:53 +0000 (09:52 +0200)]
add: @pwpipi 's fixes to 14B

9 years agoADD: @marshmellow42 's help text changes to the reveng
iceman1001 [Thu, 18 Jun 2015 07:52:25 +0000 (09:52 +0200)]
ADD: @marshmellow42 's help text changes to the reveng

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
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

Impressum, Datenschutz