Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-11-11 09:59:45 +08:00
Code Issues Projects Releases Packages Wiki Activity
1299 commits 3 branches 11 tags 34 MiB
Commit graph

1299 commits

This branch
This branch
All branches
Author SHA1 Message Date
marshmellow42
463871be6e Merge remote-tracking branch 'upstream/master' 2015-06-29 22:30:18 -04:00
marshmellow42
1c7d367e24 update comments and changelog 2015-06-29 21:41:48 -04:00
marshmellow42
b8edab0f83 add -s to hf 14b raw to select a std 14b tag first 2015-06-29 21:33:10 -04:00
marshmellow42
c3ebcce424 fixed output bug in sri4k info output. 
too many parameters line 299
 2015-06-29 16:34:41 -04:00
marshmellow42
8e00825a34 fixed improper printBits usage. 2015-06-29 14:33:44 -04:00
pwpiwi
09ffd16ee2 - 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)
 2015-06-29 09:08:52 +02:00
pwpiwi
a88c28271c Merge pull request #125 from pwpiwi/hf_mifare_fix 
(implementing suggestion #94)
 2015-06-29 07:50:52 +02:00
marshmellow42
cc34cc7b56 add SRx tag lock bit to hf 14b info 2015-06-28 23:47:30 -04:00
marshmellow42
8a258b5880 re-order 14b reader/info functions to avoid warnings 2015-06-27 23:10:00 -04:00
marshmellow42
3e553c0817 Merge remote-tracking branch 'upstream/master' 2015-06-27 22:54:55 -04:00
marshmellow42
b29d55f24b 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
 2015-06-27 22:49:26 -04:00
Martin Holst Swende
86ed606758 Merge pull request #122 from marshmellow42/master 
add hf 14b info command +
 2015-06-27 21:51:23 +02:00
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