Commit graph

1256 commits

Author SHA1 Message Date
marshmellow42 bf7ebb7b20 Merge remote-tracking branch 'upstream/master' into pm3+reveng
Conflicts:
	client/Makefile
2015-06-29 00:06:59 -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 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 c3dca45114 reveng - add some common use examples to -h help 2015-06-16 23:10:54 -04:00
marshmellow42 eb17726afa remove unused "width" 2015-06-15 22:40:30 -04:00
marshmellow42 6ac4cb270a minor fixes
see @icemant1001 -
0ad1a1d492
for more details
2015-06-15 00:44:57 -04:00
marshmellow42 954767dd95 added iceman1001 s latest reveng script version 2015-06-15 00:23:58 -04:00
marshmellow42 d679c29a4f @iceman1001 s compiler warning adjustment 2015-06-15 00:22:49 -04:00
marshmellow42 b43607e995 add reveng compile directory 2015-06-15 00:09:28 -04:00
marshmellow42 cf9aa77db0 remove commented out code from testing
also put back CMD_BUFFER_SIZE as I didn't need to change it in the first
place..
2015-06-15 00:03:16 -04:00
marshmellow42 ddcb2bb5ca Merge pull request #6 from marshmellow42/master
fix biphase
2015-06-14 18:12:16 -04:00
marshmellow42 9c823c1c87 comment change in config.h
this line indicates potential platform compatibility issues
2015-06-14 17:48:06 -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 330f65fbaf undo ARC rename, bug was fixed in scripting.c earlier 2015-06-11 23:09:15 -04:00
marshmellow42 5afe9838eb fix reveng CRC-16 bug 2015-06-10 11:01:01 -04:00
marshmellow42 d2219cae51 reveng -g (model search given just hexstr with crc) 2015-06-10 01:33:37 -04:00
marshmellow42 53ee28cb3a reveng- iceman1001 s scripting updates 2015-06-09 21:21:51 -04:00
marshmellow42 2e16354693 fix reveng memory bug + @iceman1001 s scripting 2015-06-09 13:40:01 -04:00
marshmellow42 7a23fca13a reveng RunModel - add endian switches 2015-06-08 23:14:11 -04:00
marshmellow42 37f4270a24 reveng add api RunModel 2015-06-08 21:22:18 -04:00
marshmellow42 2d3c535ec9 fixed bug in util getpraram8 + reveng adjustments
reveng:
fixed error handling some.
added -s option to GetModels()
2015-06-08 13:37:22 -04:00