]>
git.zerfleddert.de Git - proxmark3-svn/log
Martin Holst Swende [Tue, 21 Jul 2015 21:18:51 +0000 (23:18 +0200)]
Implemented 'hw status' and 'hw ping', put back client-side cacheing of 'hw version'
Martin Holst Swende [Mon, 20 Jul 2015 22:27:09 +0000 (00:27 +0200)]
Merge pull request #133 from marshmellow42/master
14b additions + some bug fixes
Martin Holst Swende [Mon, 20 Jul 2015 22:13:06 +0000 (00:13 +0200)]
Minor changes in iso1443-standalone mode
marshmellow42 [Mon, 20 Jul 2015 21:29:52 +0000 (17:29 -0400)]
Merge remote-tracking branch 'upstream/master'
Martin Holst Swende [Mon, 20 Jul 2015 21:23:44 +0000 (23:23 +0200)]
Merge pull request #130 from VERTCraig/StandAlone14a
ISO14443a Stand-Alone Mode
Martin Holst Swende [Mon, 20 Jul 2015 21:22:53 +0000 (23:22 +0200)]
Merge pull request #131 from holiman/master
Fixes to PR #129
Martin Holst Swende [Mon, 20 Jul 2015 21:22:33 +0000 (23:22 +0200)]
Minor fix with previous cache-removal
Martin Holst Swende [Mon, 20 Jul 2015 21:18:46 +0000 (23:18 +0200)]
Fixed some indentation
Martin Holst Swende [Mon, 20 Jul 2015 21:17:55 +0000 (23:17 +0200)]
Reverted previous change to , I made it no longer cache previous results
Martin Holst Swende [Fri, 17 Jul 2015 19:49:27 +0000 (21:49 +0200)]
Clear command buffer
Martin Holst Swende [Thu, 16 Jul 2015 22:01:58 +0000 (00:01 +0200)]
Potential fix for 0-length usb packets seen on OSX
Martin Holst Swende [Thu, 16 Jul 2015 21:50:41 +0000 (23:50 +0200)]
Fixed (?) issues from PR #129
Martin Holst Swende [Thu, 16 Jul 2015 20:47:14 +0000 (22:47 +0200)]
Changed indentation to tabs
Martin Holst Swende [Thu, 16 Jul 2015 20:41:22 +0000 (22:41 +0200)]
Merge pull request #129 from VERTCraig/master
AWID26 Extended Support
marshmellow42 [Thu, 16 Jul 2015 02:25:11 +0000 (22:25 -0400)]
Merge remote-tracking branch 'upstream/master'
Conflicts:
armsrc/iso14443b.c
Craig Young [Mon, 13 Jul 2015 22:46:42 +0000 (18:46 -0400)]
Introducing a stand-alone mode for working with NFC (ISO14443a) tag UIDs.
Craig Young [Mon, 13 Jul 2015 22:14:12 +0000 (18:14 -0400)]
Adding usage information to 'lf awid' commands
Craig Young [Mon, 13 Jul 2015 20:47:11 +0000 (16:47 -0400)]
Adding 'lf awid' context to cmdlf.c
Craig Young [Mon, 13 Jul 2015 20:41:50 +0000 (16:41 -0400)]
Updated CHANGELOG.md
Craig Young [Mon, 13 Jul 2015 20:18:59 +0000 (16:18 -0400)]
Adding CMD_AWID_DEMOD_FSK to commands.lua
Craig Young [Mon, 13 Jul 2015 19:45:28 +0000 (15:45 -0400)]
Adding support for AWID26 realtime demodulation as well as cloning and simulation from facility code and card number
Martin Holst Swende [Mon, 13 Jul 2015 10:22:10 +0000 (12:22 +0200)]
Merge pull request #127 from frederikmoellers/master
ISO 14443 type B support for (German) electronic ID cards
Frederik Möllers [Mon, 13 Jul 2015 09:37:28 +0000 (11:37 +0200)]
Mention EPA Type A/B support in CHANGELOG.md
Frederik Möllers [Mon, 13 Jul 2015 09:29:33 +0000 (11:29 +0200)]
Merge upstream/master
A new release has been pushed in the meantime and the changelog reflects
this. Things to be added to the changelog should thus go into the new
unreleased block.
Martin Holst Swende [Sun, 12 Jul 2015 21:44:34 +0000 (23:44 +0200)]
New release with FPGA compression
Martin Holst Swende [Sun, 12 Jul 2015 21:39:27 +0000 (23:39 +0200)]
Some info in the changelog
Martin Holst Swende [Sun, 12 Jul 2015 21:38:52 +0000 (23:38 +0200)]
Fixed issue #94, so lua-script 'mifare_autopwn' reacts correctly to card that are not vulnerable to darkside-attacks
marshmellow42 [Sat, 11 Jul 2015 04:35:27 +0000 (00:35 -0400)]
initialize global variables.
pwpiwi [Thu, 2 Jul 2015 06:49:34 +0000 (08:49 +0200)]
- fix: trace of hf mf mifare had always been cleared by mfCheckKeys() in nonce2key()
- fix: parity was not checked for reader commands in hf list 14a
- add: enable tracing for hf mf nested
marshmellow42 [Mon, 6 Jul 2015 19:47:03 +0000 (15:47 -0400)]
fix white spaces
Frederik Möllers [Mon, 6 Jul 2015 16:01:34 +0000 (18:01 +0200)]
ISO 14443 type B support for EPA functionality
Added iso14443b_setup and iso14443b_apdu for general setup and
communication with ISO 14443 type B tags.
Updated EPA (German electronic ID card) functionality to support both
card types.
Frederik Möllers [Mon, 6 Jul 2015 15:59:23 +0000 (17:59 +0200)]
Small spacing-related cleanups
marshmellow42 [Mon, 6 Jul 2015 03:35:00 +0000 (23:35 -0400)]
more verification on FDX-B tag demod - reduce...
... false positives
marshmellow42 [Sat, 4 Jul 2015 03:15:08 +0000 (23:15 -0400)]
add -ss to hf 14b raw for select of SRx chips
marshmellow42 [Sat, 4 Jul 2015 02:35:03 +0000 (22:35 -0400)]
fix my understanding of REQB vs WUPB
marshmellow42 [Thu, 2 Jul 2015 19:04:09 +0000 (15:04 -0400)]
small fixes to 14b info, added 14b sim cmds
marshmellow42 [Tue, 30 Jun 2015 17:00:51 +0000 (13:00 -0400)]
re-add piwi's trace memory fixes
marshmellow42 [Tue, 30 Jun 2015 13:46:37 +0000 (09:46 -0400)]
fix 14b raw -s option, + get rid of...
<empty trace - possible error>
marshmellow42 [Tue, 30 Jun 2015 02:30:18 +0000 (22:30 -0400)]
Merge remote-tracking branch 'upstream/master'
marshmellow42 [Tue, 30 Jun 2015 01:41:48 +0000 (21:41 -0400)]
update comments and changelog
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
marshmellow42 [Mon, 29 Jun 2015 20:34:41 +0000 (16:34 -0400)]
fixed output bug in sri4k info output.
too many parameters line 299
marshmellow42 [Mon, 29 Jun 2015 18:33:44 +0000 (14:33 -0400)]
fixed improper printBits usage.
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)
pwpiwi [Mon, 29 Jun 2015 05:50:52 +0000 (07:50 +0200)]
Merge pull request #125 from pwpiwi/hf_mifare_fix
(implementing suggestion #94)
marshmellow42 [Mon, 29 Jun 2015 03:47:30 +0000 (23:47 -0400)]
add SRx tag lock bit to hf 14b info
marshmellow42 [Sun, 28 Jun 2015 03:10:00 +0000 (23:10 -0400)]
re-order 14b reader/info functions to avoid warnings
marshmellow42 [Sun, 28 Jun 2015 02:54:55 +0000 (22:54 -0400)]
Merge remote-tracking branch 'upstream/master'
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
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 +
pwpiwi [Thu, 25 Jun 2015 14:58:54 +0000 (16:58 +0200)]
fix compile error (issue #116): remove #include <time.h> in ARM sources
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
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
marshmellow42 [Wed, 24 Jun 2015 23:56:15 +0000 (19:56 -0400)]
Merge remote-tracking branch 'upstream/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
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
marshmellow42 [Tue, 23 Jun 2015 21:45:48 +0000 (17:45 -0400)]
update change log for adjusted 14b write cmd
marshmellow42 [Tue, 23 Jun 2015 21:41:24 +0000 (17:41 -0400)]
add 14b info command
add 14b to hf search
update change log
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.