github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-16 02:03:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
1589 commits 3 branches 11 tags 34 MiB
Commit graph

1589 commits

This branch
This branch
All branches
Author SHA1 Message Date
marshmellow42
b362de6262 initialize global variables. 2015-07-11 00:35:27 -04:00
pwpiwi
5330f5329f - 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
 2015-07-07 09:02:00 +02:00
marshmellow42
dd57061c11 fix white spaces 2015-07-06 15:47:03 -04:00
Frederik Möllers
4be2708381 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.
 2015-07-06 18:01:34 +02:00
Frederik Möllers
bee99bbf90 Small spacing-related cleanups 2015-07-06 17:59:23 +02:00
marshmellow42
29b6cacc6f more verification on FDX-B tag demod - reduce... 
... false positives
 2015-07-05 23:35:00 -04:00
marshmellow42
7ce6e2c0b5 add -ss to hf 14b raw for select of SRx chips 2015-07-03 23:15:08 -04:00
marshmellow42
146600578c fix my understanding of REQB vs WUPB 2015-07-03 22:35:03 -04:00
marshmellow42
f3b83bee83 small fixes to 14b info, added 14b sim cmds 2015-07-02 15:04:09 -04:00
pwpiwi
db2b81ba11 Merge branch 'master' into topaz 
Conflicts:
	client/Makefile
	client/cmdhf.c
	client/cmdhf14a.c
 2015-07-01 08:17:00 +02:00
pwpiwi
6e6f1099c8 hf topaz reader: add support for dynamic lock areas 2015-07-01 07:12:10 +02:00
marshmellow42
5f605b8fc8 re-add piwi's trace memory fixes 2015-06-30 13:00:51 -04:00
marshmellow42
9d84e68964 fix 14b raw -s option, + get rid of... 
<empty trace - possible error>
 2015-06-30 09:46:37 -04:00
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
bf7ebb7b20 Merge remote-tracking branch 'upstream/master' into pm3+reveng 
Conflicts:
	client/Makefile
 2015-06-29 00:06:59 -04: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