]>
cvs.zerfleddert.de Git - proxmark3-svn/log
Frederik Möllers [Wed, 24 Jun 2015 12:57:08 +0000 (14:57 +0200)]
Fix comparison error in fpga_compress
The comparison would check for greater-than-or-equal the maximum amount
of bytes to read/write when it should check for greater-than only.
pwpiwi [Wed, 24 Jun 2015 05:47:45 +0000 (07:47 +0200)]
Merge pull request #109 from pwpiwi/image_shrink
Compress FPGA configs and initialized data
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
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.
pwpiwi [Sun, 21 Jun 2015 16:00:42 +0000 (18:00 +0200)]
fixing iso14443b (issue #103):
- fix hf 14b snoop
- fix hf 14b sim
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.
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
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
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
Martin Holst Swende [Sun, 14 Jun 2015 17:32:36 +0000 (19:32 +0200)]
Merge pull request #117 from marshmellow42/master
askbiphase bug fix
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
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
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
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
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
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).
pwpiwi [Tue, 2 Jun 2015 05:22:23 +0000 (07:22 +0200)]
fix issue #103: revert type change. Samples from FPGA are signed.
Renamed iso14443.c to iso14443b.c
pwpiwi [Mon, 1 Jun 2015 18:02:40 +0000 (20:02 +0200)]
Merge pull request #113 from pwpiwi/iso14443b_fix
Fix issue #103 (hopefully). Quite an old bug which was previously
Martin Holst Swende [Mon, 1 Jun 2015 17:57:57 +0000 (19:57 +0200)]
Merge pull request #108 from p-l-/fix-hf-mf-csave
Ported hf mf esave trick for unreadable UIDs to hf mf csave
Martin Holst Swende [Mon, 1 Jun 2015 17:56:50 +0000 (19:56 +0200)]
Merge pull request #111 from zhovner/master
Compiling manual for MAC OS X
pwpiwi [Mon, 1 Jun 2015 17:42:50 +0000 (19:42 +0200)]
Fix issue #103 (hopefully). Quite an old bug which was previously
masked by a big DMA_BUFFER_SIZE.
marshmellow42 [Mon, 1 Jun 2015 04:18:03 +0000 (00:18 -0400)]
add my_d move lean identification.
marshmellow42 [Sun, 31 May 2015 20:08:58 +0000 (16:08 -0400)]
new lua script from @iceman1001 + bug fix in hf mfu
pwpiwi [Sun, 31 May 2015 17:51:44 +0000 (19:51 +0200)]
fix format strings for nit picking compilers
Martin Holst Swende [Sun, 31 May 2015 11:08:36 +0000 (13:08 +0200)]
Merge pull request #112 from marshmellow42/master
combine mfu read/write commands + various bug/typo fixes
marshmellow42 [Sun, 31 May 2015 01:51:15 +0000 (21:51 -0400)]
add @Iceman1001 s sha1 scripting changes.
pwpiwi [Fri, 29 May 2015 16:14:36 +0000 (18:14 +0200)]
Fix linking under linux. liblua requires libld on linux.
marshmellow42 [Fri, 29 May 2015 03:14:06 +0000 (23:14 -0400)]
fixed further typo in lf t5 wr help
also fixed offset option char to uint8_t warning in the new offset
option in data printdemodbuffer
marshmellow42 [Fri, 29 May 2015 02:52:41 +0000 (22:52 -0400)]
fix help typo
marshmellow42 [Thu, 28 May 2015 17:23:31 +0000 (13:23 -0400)]
add offset option to data printdemodbuffer
easily see demod buffer's hex values at different bit offsets by using:
data printdemodbuffer x o <offset>
pwpiwi [Thu, 28 May 2015 00:55:57 +0000 (02:55 +0200)]
delete (yet) unnecessary file client/cmdhftopaz.c
marshmellow42 [Wed, 27 May 2015 21:21:42 +0000 (17:21 -0400)]
MFU code cleanup - final ?
fixed bug in debug print in MF 1k sim.
marshmellow42 [Wed, 27 May 2015 16:24:13 +0000 (12:24 -0400)]
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.
Pavel Zhovner [Wed, 27 May 2015 08:30:50 +0000 (11:30 +0300)]
Compiling manual for MAC OS X
marshmellow42 [Wed, 27 May 2015 04:32:01 +0000 (00:32 -0400)]
update changelog
marshmellow42 [Wed, 27 May 2015 00:31:07 +0000 (20:31 -0400)]
@iceman1001 s lua script fix
pwpiwi [Tue, 26 May 2015 05:37:50 +0000 (07:37 +0200)]
also delete *.bin and fpga_compressor when "make clean".
Add target to make fpga_compressor when client is not yet compiled.
Get version information and cache it when client starts (avoids clearing
BigBuf when calling hw version).
Add some comments and remove debugging printouts.
Add version info and ChangeLog in modified zlib.
marshmellow42 [Tue, 26 May 2015 14:40:23 +0000 (10:40 -0400)]
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...)
pwpiwi [Mon, 18 May 2015 06:49:38 +0000 (08:49 +0200)]
Add option -d (decompress) to fpga_compress. Allows testing.
Improve zlib deflate (note: no change required to inflate).
pwpiwi [Fri, 8 May 2015 06:17:40 +0000 (08:17 +0200)]
Compress the .data section as well (saves another 4KBytes and comes for free)
zlib tuning: prevent fpga_compress from generating fixed code blocks
armsrc/Makefile: replace osimage with fullimage
pwpiwi [Thu, 30 Apr 2015 15:57:26 +0000 (17:57 +0200)]
Tailor zlib to our needs:
- disable support for fixed code blocks. Saves 2KByte code tables in ARM Flash memory
pwpiwi [Wed, 29 Apr 2015 15:59:33 +0000 (17:59 +0200)]
fpga_compress: interleave (combine) fpga_lf.bit and fpga_hf.bit before compression.
fpga_loader.c: change to unweave fpga_lf and fpga_hf accordingly
prepare fpga_compress, fpga_loader and Makefile to handle more than two FPGA config files
revert removal of fullimage Makefile target. Remove osimage instead.
pwpiwi [Sun, 26 Apr 2015 08:49:03 +0000 (10:49 +0200)]
replaced gzip with an own compressor tool (fpga_compress.c, based on zlib)
This allows to remove the gzip header support and the z_crc32.[ch] files
(which saves more than 2KBytes of the ARM's flash memory)
pwpiwi [Tue, 21 Apr 2015 19:34:33 +0000 (21:34 +0200)]
Finish support for compressed FPGA images in fpgaloader.c
- move zlib source files to separate directory zlib
- rename zlib/crc32.[ch] to zlib/z_crc32.[ch]
pwpiwi [Wed, 15 Apr 2015 17:16:00 +0000 (19:16 +0200)]
add: compress fpga images during compile, uncompress at run time
pwpiwi [Sun, 5 Apr 2015 17:15:02 +0000 (19:15 +0200)]
add: hw ver: show FPGA versions for both HF and LF FPGA configs
add: hw ver: show used and free flash memory
chg: prepare fpgaloader for compressed FPGA configs
Pierre LALET [Mon, 25 May 2015 09:47:27 +0000 (11:47 +0200)]
Ported hf mf esave trick for unreadable UIDs to hf mf csave
Thanks: iceman1001
marshmellow42 [Mon, 25 May 2015 02:31:13 +0000 (22:31 -0400)]
Merge remote-tracking branch 'upstream/master'
marshmellow42 [Mon, 25 May 2015 02:28:21 +0000 (22:28 -0400)]
updated mfu rdbl and wrbl commands
@iceman1001 s rdbl and wrbl cmd updates.
dump screen output adjusted
Martin Holst Swende [Sun, 24 May 2015 21:10:21 +0000 (23:10 +0200)]
Merge pull request #107 from p-l-/fix-hfmf
Fix filenames for hf mf cload / csave
Pierre LALET [Sun, 24 May 2015 20:43:08 +0000 (22:43 +0200)]
Fix filenames for hf mf cload / csave
Martin Holst Swende [Sun, 24 May 2015 19:32:11 +0000 (21:32 +0200)]
Merge pull request #106 from p-l-/fix-hfmfeload
Fix filenames for hf mf esave / eload
Pierre LALET [Sun, 24 May 2015 18:14:22 +0000 (20:14 +0200)]
Fix filenames for hf mf esave / eload
Martin Holst Swende [Sun, 24 May 2015 05:22:09 +0000 (07:22 +0200)]
Merge pull request #102 from marshmellow42/master
fix mfu dump getbigbuffer bug
marshmellow42 [Sun, 24 May 2015 02:35:50 +0000 (22:35 -0400)]
fix mfu dump getbigbuffer bug
Thanks @iceman1001 for catching my oops, and fixing it :)
Martin Holst Swende [Fri, 22 May 2015 19:55:34 +0000 (21:55 +0200)]
Merge pull request #101 from marshmellow42/master
hf mfu updates + hf search + bug fixes
marshmellow42 [Fri, 22 May 2015 17:17:51 +0000 (13:17 -0400)]
hf mfu minor output adjustments
dump key placed properly for EV1 and NTAGs
config pages for ntags corrected in printout
note on config that PWD and PACK cannot
actually be read from memory (probably could just delete them (other
than it shows what memory block they are stored in for changing...)
marshmellow42 [Fri, 22 May 2015 11:29:18 +0000 (07:29 -0400)]
mfu info authkeyptr fix
didn't follow @iceman1001 s l parameter changes fully... fixed now..
:)
marshmellow42 [Fri, 22 May 2015 04:15:57 +0000 (00:15 -0400)]
fix to dump cmd print keys.
add l option to info cmd.
add ascii print to dump (screen only)
other minor clean up
marshmellow42 [Thu, 21 May 2015 15:17:01 +0000 (11:17 -0400)]
hf mfu bug fixes, and help text fixes
marshmellow42 [Wed, 20 May 2015 20:47:40 +0000 (16:47 -0400)]
further mfu info updates
needed to auth select when a command failed for locked tags.
some output cleanups from @iceman1001
marshmellow42 [Wed, 20 May 2015 19:42:58 +0000 (15:42 -0400)]
finish NTAG i2c +...
thanks iceman
marshmellow42 [Wed, 20 May 2015 19:41:48 +0000 (15:41 -0400)]
finish NTAG i2c +...
thanks @iceman1001
marshmellow42 [Wed, 20 May 2015 18:22:26 +0000 (14:22 -0400)]
ULEV1_48 had the wrong max block
marshmellow42 [Wed, 20 May 2015 18:17:43 +0000 (14:17 -0400)]
minor adjustments to hf mfu
marshmellow42 [Wed, 20 May 2015 18:06:46 +0000 (14:06 -0400)]
Add NTAG i2c and bug fix
also streamlined select tag code
marshmellow42 [Wed, 20 May 2015 15:27:44 +0000 (11:27 -0400)]
Add ntag 210, 212, 203 and bug fix
marshmellow42 [Tue, 19 May 2015 19:03:35 +0000 (15:03 -0400)]
missed file in previous commit...
duh...
marshmellow42 [Tue, 19 May 2015 15:30:50 +0000 (11:30 -0400)]
hf mfu dump - bigbuf allocation fix
some larger nfc tags can get large so set the allocation to the 4k
CARD_MEMORY_SIZE buffersize.
marshmellow42 [Tue, 19 May 2015 02:07:11 +0000 (22:07 -0400)]
@iceman1001 s comments/updates mfu cmds
marshmellow42 [Mon, 18 May 2015 17:11:00 +0000 (13:11 -0400)]
MF ultralight code cleanup
marshmellow42 [Mon, 18 May 2015 00:49:25 +0000 (20:49 -0400)]
Iceman1001 s MFU clean up
cleaned up MF UL_C auth code device side.
marshmellow42 [Sat, 16 May 2015 05:00:31 +0000 (01:00 -0400)]
mfu info / dump attempt at missing auths
NOT TESTED. will test soon. probably has bugs!
marshmellow42 [Fri, 15 May 2015 05:19:58 +0000 (01:19 -0400)]
mfu dump - beginning of additions
marshmellow42 [Fri, 15 May 2015 04:57:51 +0000 (00:57 -0400)]
hf mfu dump testing
marshmellow42 [Fri, 15 May 2015 02:55:18 +0000 (22:55 -0400)]
@iceman1001 s default keys
marshmellow42 [Thu, 14 May 2015 01:36:20 +0000 (21:36 -0400)]
@iceman1001 's updated lualibs
marshmellow42 [Thu, 14 May 2015 01:20:23 +0000 (21:20 -0400)]
@iceman1001 updated scripts