]> git.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
9 years agofix 14b raw -s option, + get rid of...
marshmellow42 [Tue, 30 Jun 2015 13:46:37 +0000 (09:46 -0400)]
fix 14b raw -s option, + get rid of...

<empty trace - possible error>

9 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Tue, 30 Jun 2015 02:30:18 +0000 (22:30 -0400)]
Merge remote-tracking branch 'upstream/master'

9 years agoupdate comments and changelog
marshmellow42 [Tue, 30 Jun 2015 01:41:48 +0000 (21:41 -0400)]
update comments and changelog

9 years agoadd -s to hf 14b raw to select a std 14b tag first
marshmellow42 [Tue, 30 Jun 2015 01:33:10 +0000 (21:33 -0400)]
add -s to hf 14b raw to select a std 14b tag first

9 years agofixed output bug in sri4k info output.
marshmellow42 [Mon, 29 Jun 2015 20:34:41 +0000 (16:34 -0400)]
fixed output bug in sri4k info output.

too many parameters line 299

9 years agofixed improper printBits usage.
marshmellow42 [Mon, 29 Jun 2015 18:33:44 +0000 (14:33 -0400)]
fixed improper printBits usage.

9 years ago- fix: ensure that FpgaDownloadAndGo() is always called before requesting
pwpiwi [Mon, 29 Jun 2015 07:07:54 +0000 (09:07 +0200)]
- fix: ensure that FpgaDownloadAndGo() is always called before requesting
  any memory from BigBuf[]. This is required because FpgaDownloadAndGo() might
  allocate, use, and free most of BigBuf[] when decompressing FPGA configs.
- cleanup: remove rests of deprecated "end of trace markers" (0x44)

9 years agoMerge pull request #125 from pwpiwi/hf_mifare_fix
pwpiwi [Mon, 29 Jun 2015 05:50:52 +0000 (07:50 +0200)]
Merge pull request #125 from pwpiwi/hf_mifare_fix

(implementing suggestion #94)

9 years agoMerge remote-tracking branch 'upstream/master' into pm3+reveng
marshmellow42 [Mon, 29 Jun 2015 04:06:59 +0000 (00:06 -0400)]
Merge remote-tracking branch 'upstream/master' into pm3+reveng

Conflicts:
client/Makefile

9 years agoadd SRx tag lock bit to hf 14b info
marshmellow42 [Mon, 29 Jun 2015 03:47:30 +0000 (23:47 -0400)]
add SRx tag lock bit to hf 14b info

9 years agore-order 14b reader/info functions to avoid warnings
marshmellow42 [Sun, 28 Jun 2015 03:10:00 +0000 (23:10 -0400)]
re-order 14b reader/info functions to avoid warnings

9 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Sun, 28 Jun 2015 02:54:55 +0000 (22:54 -0400)]
Merge remote-tracking branch 'upstream/master'

9 years agochange lf config threshold, hf 14b reader,
marshmellow42 [Sun, 28 Jun 2015 02:49:26 +0000 (22:49 -0400)]
change lf config threshold, hf 14b reader,

adjust lf config threshold to coincide with graph values and trigger on
highs over the threshold or lows under the threshold * -1

split general hf 14b reader from full info printing

9 years agoMerge pull request #122 from marshmellow42/master
Martin Holst Swende [Sat, 27 Jun 2015 19:51:23 +0000 (21:51 +0200)]
Merge pull request #122 from marshmellow42/master

add hf 14b info command +

9 years agofix compile error (issue #116): remove #include <time.h> in ARM sources
pwpiwi [Thu, 25 Jun 2015 14:58:54 +0000 (16:58 +0200)]
fix compile error (issue #116): remove #include <time.h> in ARM sources

9 years ago(implementing suggestion #94) 125/head
pwpiwi [Wed, 24 Jun 2015 05:48:36 +0000 (07:48 +0200)]
(implementing suggestion #94)
hf mf mifare: gracefully exit if tag isn't vulnerable to this attack
hf mf nested: dito

9 years agofix: fpga_compressor file size check
pwpiwi [Wed, 24 Jun 2015 06:29:59 +0000 (08:29 +0200)]
fix: fpga_compressor file size check
- commit 61611f5 fixed the check in case of correct filesizes but fails
  in case of files which are too big to fit in fpga_config[]
- fix exit codes and Makefile to handle errors correctly during make

9 years agoMerge remote-tracking branch 'upstream/master' 122/head
marshmellow42 [Wed, 24 Jun 2015 23:56:15 +0000 (19:56 -0400)]
Merge remote-tracking branch 'upstream/master'

9 years agoMerge pull request #123 from frederikmoellers/master
Martin Holst Swende [Wed, 24 Jun 2015 16:31:44 +0000 (18:31 +0200)]
Merge pull request #123 from frederikmoellers/master

Fix comparison error in fpga_compress

9 years agoFix comparison error in fpga_compress 123/head
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.

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

9 years agoupdate change log for adjusted 14b write cmd
marshmellow42 [Tue, 23 Jun 2015 21:45:48 +0000 (17:45 -0400)]
update change log for adjusted 14b write cmd

9 years agoadd 14b info command
marshmellow42 [Tue, 23 Jun 2015 21:41:24 +0000 (17:41 -0400)]
add 14b info command

add 14b to hf search
update change log

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 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 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 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 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 agofixing iso 14443b (issue #103):
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)

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

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

9 years agoreveng - add some common use examples to -h help
marshmellow42 [Wed, 17 Jun 2015 03:10:54 +0000 (23:10 -0400)]
reveng - add some common use examples to -h help

9 years agoremove unused "width"
marshmellow42 [Tue, 16 Jun 2015 02:40:30 +0000 (22:40 -0400)]
remove unused "width"

9 years agominor fixes
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

9 years agoadded iceman1001 s latest reveng script version
marshmellow42 [Mon, 15 Jun 2015 04:23:58 +0000 (00:23 -0400)]
added iceman1001 s latest reveng script version

9 years ago@iceman1001 s compiler warning adjustment
marshmellow42 [Mon, 15 Jun 2015 04:22:49 +0000 (00:22 -0400)]
@iceman1001 s compiler warning adjustment

9 years agoadd reveng compile directory
marshmellow42 [Mon, 15 Jun 2015 04:09:28 +0000 (00:09 -0400)]
add reveng compile directory

9 years agoremove commented out code from testing
marshmellow42 [Mon, 15 Jun 2015 04:03:16 +0000 (00:03 -0400)]
remove commented out code from testing

also put back CMD_BUFFER_SIZE as I didn't need to change it in the first
place..

9 years agoMerge pull request #6 from marshmellow42/master
marshmellow42 [Sun, 14 Jun 2015 22:12:16 +0000 (18:12 -0400)]
Merge pull request #6 from marshmellow42/master

fix biphase

9 years agocomment change in config.h
marshmellow42 [Sun, 14 Jun 2015 21:48:06 +0000 (17:48 -0400)]
comment change in config.h

this line indicates potential platform compatibility issues

9 years agoMerge pull request #117 from marshmellow42/master
Martin Holst Swende [Sun, 14 Jun 2015 17:32:36 +0000 (19:32 +0200)]
Merge pull request #117 from marshmellow42/master

askbiphase bug fix

9 years agoadd comment 117/head
marshmellow42 [Sun, 14 Jun 2015 15:11:00 +0000 (11:11 -0400)]
add comment

9 years agobug fix. askdemod edits invert pointer, cannot be 0
marshmellow42 [Sun, 14 Jun 2015 14:54:55 +0000 (10:54 -0400)]
bug fix.  askdemod edits invert pointer, cannot be 0

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

9 years agorevert t55xx start gap and write timing changes
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

9 years agoundo ARC rename, bug was fixed in scripting.c earlier
marshmellow42 [Fri, 12 Jun 2015 03:09:15 +0000 (23:09 -0400)]
undo ARC rename, bug was fixed in scripting.c earlier

9 years agofix reveng CRC-16 bug
marshmellow42 [Wed, 10 Jun 2015 15:01:01 +0000 (11:01 -0400)]
fix reveng CRC-16 bug

9 years agoreveng -g (model search given just hexstr with crc)
marshmellow42 [Wed, 10 Jun 2015 05:33:37 +0000 (01:33 -0400)]
reveng -g (model search given just hexstr with crc)

9 years agoreveng- iceman1001 s scripting updates
marshmellow42 [Wed, 10 Jun 2015 01:21:51 +0000 (21:21 -0400)]
reveng- iceman1001 s scripting updates

9 years agofix reveng memory bug + @iceman1001 s scripting
marshmellow42 [Tue, 9 Jun 2015 17:40:01 +0000 (13:40 -0400)]
fix reveng memory bug + @iceman1001 s scripting

9 years agoreveng RunModel - add endian switches
marshmellow42 [Tue, 9 Jun 2015 03:14:11 +0000 (23:14 -0400)]
reveng RunModel - add endian switches

9 years agoreveng add api RunModel
marshmellow42 [Tue, 9 Jun 2015 01:22:18 +0000 (21:22 -0400)]
reveng add api RunModel

9 years agofixed bug in util getpraram8 + reveng adjustments
marshmellow42 [Mon, 8 Jun 2015 17:37:22 +0000 (13:37 -0400)]
fixed bug in util getpraram8 + reveng adjustments

reveng:
fixed error handling some.
added -s option to GetModels()

9 years agobegin reveng add-ons for lua
marshmellow42 [Mon, 8 Jun 2015 16:25:50 +0000 (12:25 -0400)]
begin reveng add-ons for lua

9 years agoadd clock to ask rawdemod outputs 115/head
marshmellow42 [Sun, 7 Jun 2015 04:42:57 +0000 (00:42 -0400)]
add clock to ask rawdemod outputs

fix biphase invert bug (correctly)

9 years agoFix reveng
marshmellow42 [Sun, 7 Jun 2015 04:10:54 +0000 (00:10 -0400)]
Fix reveng

9 years agoadd reveng-1.30
marshmellow42 [Sat, 6 Jun 2015 05:09:54 +0000 (01:09 -0400)]
add reveng-1.30

new command menu:
crc help
crc calc
crc calc -h for help on command set

9 years agoModified kermit crc to use existing crc calc code
marshmellow42 [Sat, 6 Jun 2015 02:39:56 +0000 (22:39 -0400)]
Modified kermit crc to use existing crc calc code

9 years agofdx-b clean up
marshmellow42 [Thu, 4 Jun 2015 17:10:33 +0000 (13:10 -0400)]
fdx-b clean up

9 years agoAdd CCITT Kermit CRC check for FDX-B demod
marshmellow42 [Thu, 4 Jun 2015 16:53:19 +0000 (12:53 -0400)]
Add CCITT Kermit CRC check for FDX-B demod

9 years agoadd fdx-b to cmddata.h
marshmellow42 [Thu, 4 Jun 2015 04:05:37 +0000 (00:05 -0400)]
add fdx-b to cmddata.h

9 years agoadd fdx-b to lf search
marshmellow42 [Thu, 4 Jun 2015 04:04:49 +0000 (00:04 -0400)]
add fdx-b to lf search

9 years agobug fix - biphase invert + fdx-b adjustments
marshmellow42 [Thu, 4 Jun 2015 03:59:22 +0000 (23:59 -0400)]
bug fix - biphase invert + fdx-b adjustments

9 years agoaddition animal tags demod info
marshmellow42 [Wed, 3 Jun 2015 22:28:56 +0000 (18:28 -0400)]
addition animal tags demod info

9 years agoTesting animal tags
marshmellow42 [Wed, 3 Jun 2015 20:52:20 +0000 (16:52 -0400)]
Testing animal tags

9 years agofixing iso14443b (issue #103): fix timing issue (speeding up
pwpiwi [Wed, 3 Jun 2015 11:28:28 +0000 (13:28 +0200)]
fixing iso14443b (issue #103): fix timing issue (speeding up
the decoders)

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

9 years agofix issue #103: revert type change. Samples from FPGA are signed.
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

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

9 years agoMerge pull request #108 from p-l-/fix-hf-mf-csave
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

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

9 years agoFix issue #103 (hopefully). Quite an old bug which was previously 113/head
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.

9 years agoadd my_d move lean identification.
marshmellow42 [Mon, 1 Jun 2015 04:18:03 +0000 (00:18 -0400)]
add my_d move lean identification.

9 years agonew lua script from @iceman1001 + bug fix in hf mfu
marshmellow42 [Sun, 31 May 2015 20:08:58 +0000 (16:08 -0400)]
new lua script from @iceman1001 + bug fix in hf mfu

9 years agofix format strings for nit picking compilers 109/head
pwpiwi [Sun, 31 May 2015 17:51:44 +0000 (19:51 +0200)]
fix format strings for nit picking compilers

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

9 years agoadd @Iceman1001 s sha1 scripting changes. 112/head
marshmellow42 [Sun, 31 May 2015 01:51:15 +0000 (21:51 -0400)]
add @Iceman1001 s sha1 scripting changes.

9 years agoFix linking under linux. liblua requires libld on linux.
pwpiwi [Fri, 29 May 2015 16:14:36 +0000 (18:14 +0200)]
Fix linking under linux. liblua requires libld on linux.

9 years agofixed further typo in lf t5 wr help
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

9 years agofix help typo
marshmellow42 [Fri, 29 May 2015 02:52:41 +0000 (22:52 -0400)]
fix help typo

9 years agoadd offset option to data printdemodbuffer
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>

9 years agodelete (yet) unnecessary file client/cmdhftopaz.c
pwpiwi [Thu, 28 May 2015 00:55:57 +0000 (02:55 +0200)]
delete (yet) unnecessary file client/cmdhftopaz.c

9 years agoMFU code cleanup - final ?
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.

9 years agoclean up mfu device side code
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.

9 years agoCompiling manual for MAC OS X 111/head
Pavel Zhovner [Wed, 27 May 2015 08:30:50 +0000 (11:30 +0300)]
Compiling manual for MAC OS X

9 years agoupdate changelog
marshmellow42 [Wed, 27 May 2015 04:32:01 +0000 (00:32 -0400)]
update changelog

9 years ago@iceman1001 s lua script fix
marshmellow42 [Wed, 27 May 2015 00:31:07 +0000 (20:31 -0400)]
@iceman1001 s lua script fix

9 years agoalso delete *.bin and fpga_compressor when "make clean".
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.

9 years agoAdd clearCommandBuffer before SendCommand
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...)

9 years agoAdd option -d (decompress) to fpga_compress. Allows testing.
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).

Impressum, Datenschutz