Commit graph

1287 commits

Author SHA1 Message Date
pwpiwi
377d692be1 fix compile error (issue #116): remove #include <time.h> in ARM sources 2015-06-25 16:58:54 +02:00
pwpiwi
dc8ba239fb (implementing suggestion #94)
hf mf mifare: gracefully exit if tag isn't vulnerable to this attack
hf mf nested: dito
2015-06-25 08:32:29 +02:00
pwpiwi
7b242c1ca2 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
2015-06-25 08:16:48 +02:00
marshmellow42
9152bda817 Merge remote-tracking branch 'upstream/master' 2015-06-24 19:56:15 -04:00
Martin Holst Swende
a94349fc47 Merge pull request #123 from frederikmoellers/master
Fix comparison error in fpga_compress
2015-06-24 18:31:44 +02:00
Frederik Möllers
61611f5b85 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.
2015-06-24 14:57:08 +02:00
pwpiwi
2da2e92837 Merge pull request #109 from pwpiwi/image_shrink
Compress FPGA configs and initialized data
2015-06-24 07:47:45 +02:00
marshmellow42
b7eddc14db update change log for adjusted 14b write cmd 2015-06-23 17:45:48 -04:00
marshmellow42
ff4fdb321f add 14b info command
add 14b to hf search
update change log
2015-06-23 17:41:24 -04:00
Martin Holst Swende
dd3d1b7012 Changelog 2015-06-23 22:24:55 +02:00
Martin Holst Swende
1e1de234ac Merge pull request #121 from frederikmoellers/master
Add PACE replay functionality
2015-06-23 22:23:08 +02:00
Martin Holst Swende
623e9da448 Merge branch 'master' of github.com:Proxmark/proxmark3 2015-06-23 22:19:15 +02:00
Martin Holst Swende
b8d34d0598 Merge pull request #118 from marshmellow42/master
fix t55xx write timing
2015-06-23 22:18:50 +02:00
Martin Holst Swende
475aefa595 Updated changelog 2015-06-23 22:12:03 +02:00
marshmellow42
2ec8773314 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.
2015-06-23 12:16:23 -04:00
pwpiwi
01b7a6a898 Merge pull request #114 from pwpiwi/iso14443b_fix
fixing iso14443b (issue #103): fix bug introduced during Bigbuf rework
2015-06-23 07:14:52 +02:00
pwpiwi
705bfa1058 fixing iso14443b (issue #103):
- increased DMA_BUFFER_SIZE to avoid occasional circular buffer overflows.
- minor code cleanups
2015-06-22 22:03:43 +02:00
Frederik Möllers
3bb07d96c8 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.
2015-06-22 14:20:13 +02:00
pwpiwi
467340996e fixing iso14443b (issue #103):
- fix hf 14b snoop
- fix hf 14b sim
2015-06-21 18:04:24 +02:00
marshmellow42
7c8b5e6811 comment fudan check possibilities 2015-06-20 21:33:42 -04:00
marshmellow42
f4217d58b6 add ultralight compatible test 2015-06-18 17:19:43 -04:00
pwpiwi
da586b1702 fixing iso14443b (issue #103):
- revert removal of FPGA_HF_READER_RX_XCORR_848_KHZ. Need to be able to switch to 424kHz for ISO15693.
2015-06-18 15:41:30 +02:00
pwpiwi
9f9b6b7469 Merge pull request #120 from pwpiwi/fix_compile_errors
fix issue #116: remove includes of stdio.h in armsrc
2015-06-18 11:38:58 +02:00
pwpiwi
50365fedcb fix issue #116: remove includes of stdio.h in armsrc 2015-06-18 11:33:53 +02:00
pwpiwi
132a02179c fixing iso 14443b (issue #103):
- fix: treat empty commands as error
- deleting dead code
- rename USB-Commands (ISO14443 -> iso14443B)
2015-06-18 09:49:22 +02:00
pwpiwi
d5875804a3 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
2015-06-18 07:56:08 +02:00
pwpiwi
51d4f6f114 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
2015-06-17 20:27:36 +02:00
marshmellow42
6ac4cb270a minor fixes
see @icemant1001 -
0ad1a1d492
for more details
2015-06-15 00:44:57 -04:00
marshmellow42
ddcb2bb5ca Merge pull request #6 from marshmellow42/master
fix biphase
2015-06-14 18:12:16 -04:00
Martin Holst Swende
26fbe1fbd9 Merge pull request #117 from marshmellow42/master
askbiphase bug fix
2015-06-14 19:32:36 +02:00
marshmellow42
fd227f4e7d add comment 2015-06-14 11:11:00 -04:00
marshmellow42
c7d6721290 bug fix. askdemod edits invert pointer, cannot be 0 2015-06-14 10:54:55 -04:00
Martin Holst Swende
0f5b97d92c Merge pull request #115 from marshmellow42/master
add-ons and bug fixes
2015-06-14 09:02:13 +02:00
marshmellow42
4a3f1a3793 revert t55xx start gap and write timing changes
also noted specs in comments
2015-06-11 23:52:40 -04:00
marshmellow42
8e2e6c8eb0 add clock to ask rawdemod outputs
fix biphase invert bug (correctly)
2015-06-07 00:42:57 -04:00
marshmellow42
07b5a3c3ba Modified kermit crc to use existing crc calc code 2015-06-05 22:39:56 -04:00
marshmellow42
c2c7f6c271 fdx-b clean up 2015-06-04 13:10:33 -04:00
marshmellow42
6eaa8da9dc Add CCITT Kermit CRC check for FDX-B demod 2015-06-04 12:53:19 -04:00
marshmellow42
cf4d3e21b0 add fdx-b to cmddata.h 2015-06-04 00:05:37 -04:00
marshmellow42
ecfcb34cc5 add fdx-b to lf search 2015-06-04 00:04:49 -04:00
marshmellow42
b2c330b367 bug fix - biphase invert + fdx-b adjustments 2015-06-03 23:59:22 -04:00
marshmellow42
fd1d30cb76 addition animal tags demod info 2015-06-03 18:28:56 -04:00
marshmellow42
04bb05670d Testing animal tags 2015-06-03 16:52:20 -04:00
pwpiwi
09c66f1f09 fixing iso14443b (issue #103): fix timing issue (speeding up
the decoders)
2015-06-03 13:28:28 +02:00
pwpiwi
5b95953d42 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).
2015-06-02 22:50:16 +02:00
pwpiwi
67ac4bf75c fix issue #103: revert type change. Samples from FPGA are signed.
Renamed iso14443.c to iso14443b.c
2015-06-02 07:28:47 +02:00
pwpiwi
01d5b635cf Merge pull request #113 from pwpiwi/iso14443b_fix
Fix issue #103 (hopefully). Quite an old bug which was previously
2015-06-01 20:02:40 +02:00
Martin Holst Swende
6a2e5adffd Merge pull request #108 from p-l-/fix-hf-mf-csave
Ported hf mf esave trick for unreadable UIDs to hf mf csave
2015-06-01 19:57:57 +02:00
Martin Holst Swende
daf8b85cda Merge pull request #111 from zhovner/master
Compiling manual for MAC OS X
2015-06-01 19:56:50 +02:00
pwpiwi
0d9a86c724 Fix issue #103 (hopefully). Quite an old bug which was previously
masked by a big DMA_BUFFER_SIZE.
2015-06-01 19:47:21 +02:00