Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-09-24 22:15:57 +08:00
Code Issues Projects Releases Packages Wiki Activity
1289 commits 3 branches 11 tags 34 MiB
Commit graph

728 commits

Author SHA1 Message Date
Craig Young
d976c9ddb2 Merging changes from main repo 2015-07-25 14:38:57 -04:00
marshmellow42
a40680f3ac Merge remote-tracking branch 'upstream/master' 2015-07-20 17:29:52 -04:00
Martin Holst Swende
23931c11d5 Minor fix with previous cache-removal 2015-07-20 23:22:33 +02:00
Martin Holst Swende
db2dc28d34 Reverted previous change to , I made it no longer cache previous results 2015-07-20 23:17:55 +02:00
Martin Holst Swende
40c5f34265 Clear command buffer 2015-07-17 21:49:27 +02:00
Martin Holst Swende
976627d5ba Fixed (?) issues from PR #129 2015-07-16 23:50:41 +02:00
Martin Holst Swende
37824afe63 Changed indentation to tabs 2015-07-16 22:47:14 +02:00
marshmellow42
d5810937bd Merge remote-tracking branch 'upstream/master' 
Conflicts:
	armsrc/iso14443b.c
 2015-07-15 22:25:11 -04:00
Craig Young
bcffcca25f Adding usage information to 'lf awid' commands 2015-07-13 18:14:12 -04:00
Craig Young
d6b455ed4e Adding 'lf awid' context to cmdlf.c 2015-07-13 16:47:11 -04:00
Craig Young
c0c35f9bb6 Adding CMD_AWID_DEMOD_FSK to commands.lua 2015-07-13 16:18:59 -04:00
Craig Young
dbf6e824f9 Adding support for AWID26 realtime demodulation as well as cloning and simulation from facility code and card number 2015-07-13 15:45:28 -04:00
Martin Holst Swende
40c514454d Fixed issue #94, so lua-script 'mifare_autopwn' reacts correctly to card that are not vulnerable to darkside-attacks 2015-07-12 23:38:52 +02:00
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
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
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
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
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
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
ff4fdb321f add 14b info command 
add 14b to hf search
update change log
 2015-06-23 17:41:24 -04: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
b8d34d0598 Merge pull request #118 from marshmellow42/master 
fix t55xx write timing
 2015-06-23 22:18:50 +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
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
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
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
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