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

1287 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Holst Swende e2012d1bd3 Implemented 'hw status' and 'hw ping', put back client-side cacheing of 'hw version' 2015-07-21 23:18:51 +02:00
Martin Holst Swende 85f011a550 Merge pull request #133 from marshmellow42/master 
14b additions + some bug fixes
 2015-07-21 00:27:09 +02:00
Martin Holst Swende 86a83668b5 Minor changes in iso1443-standalone mode 2015-07-21 00:13:06 +02:00
marshmellow42 a40680f3ac Merge remote-tracking branch 'upstream/master' 2015-07-20 17:29:52 -04:00
Martin Holst Swende 865279ba89 Merge pull request #130 from VERTCraig/StandAlone14a 
ISO14443a Stand-Alone Mode
 2015-07-20 23:23:44 +02:00
Martin Holst Swende 1adb2023ce Merge pull request #131 from holiman/master 
Fixes to PR #129
 2015-07-20 23:22:53 +02:00
Martin Holst Swende 23931c11d5 Minor fix with previous cache-removal 2015-07-20 23:22:33 +02:00
Martin Holst Swende d2deaf7bcf Fixed some indentation 2015-07-20 23:18:46 +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 83f3f8ac40 Potential fix for 0-length usb packets seen on OSX 2015-07-17 00:01:58 +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
Martin Holst Swende b067125f98 Merge pull request #129 from VERTCraig/master 
AWID26 Extended Support
 2015-07-16 22:41:22 +02:00
marshmellow42 d5810937bd Merge remote-tracking branch 'upstream/master' 
Conflicts:
	armsrc/iso14443b.c
 2015-07-15 22:25:11 -04:00
Craig Young e46fe04430 Introducing a stand-alone mode for working with NFC (ISO14443a) tag UIDs. 2015-07-13 18:46:42 -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 769791d440 Updated CHANGELOG.md 2015-07-13 16:41:50 -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 a83d091885 Merge pull request #127 from frederikmoellers/master 
ISO 14443 type B support for (German) electronic ID cards
 2015-07-13 12:22:10 +02:00
Frederik Möllers 2c3c08bd2f Mention EPA Type A/B support in CHANGELOG.md 2015-07-13 11:37:28 +02:00
Frederik Möllers a704cbe89d Merge upstream/master 
A new release has been pushed in the meantime and the changelog reflects
this. Things to be added to the changelog should thus go into the new
unreleased block.
 2015-07-13 11:29:33 +02:00
Martin Holst Swende 5ebdce44c0 New release with FPGA compression 2015-07-12 23:44:34 +02:00
Martin Holst Swende 60034782f9 Some info in the changelog 2015-07-12 23:39:27 +02: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 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
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 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