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

474 commits

Author SHA1 Message Date
marshmellow42 c54dff4f4a Merge remote-tracking branch 'Proxmark/master' into iclass 
Conflicts:
	CHANGELOG.md
 2015-10-07 09:34:47 -04:00
pwpiwi dfb387bf0f hf mf mifare: 
- gracefully exit on unsuccessful syncs instead of hard watchdog reset
 2015-09-30 20:59:50 +02:00
Dake 29c90533eb remove debug 2015-08-27 08:58:15 +02:00
Dake fff58476af syntax corrective 2015-08-26 16:01:08 +02:00
Dake dc4300bafb add : writing on PCF7931 tags 2015-08-26 15:53:49 +02:00
pwpiwi 67b7d6fa31 fix: avoid USB Speed Test timeout in case of slow transfer speeds 
fix: don't add CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K commands into command buffer
 2015-07-31 20:11:37 +02:00
pwpiwi bfb01844fb add: USB Speed Test to hw status 
fix: choose Real Time Clock divider based on actual slow clock frequency
 2015-07-29 18:52:43 +02:00
Craig Young d976c9ddb2 Merging changes from main repo 2015-07-25 14:38:57 -04:00
Craig Young c89274cc60 Stand Alone Mode changes for NFC (part 2) 2015-07-25 14:35:14 -04:00
marshmellow42 3ac22ee1cf use read instead of readcheck except to auth 2015-07-23 01:12:02 -04:00
marshmellow42 4d68ec02b2 iclass refactor/cleanup 2015-07-21 14:26:46 -04:00
marshmellow42 6b659d2406 Merge remote-tracking branch 'upstream/master' into iclass 2015-07-20 21:26:35 -04: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
marshmellow42 aa53efc340 iclass additions 
multiple contributors - thanks!
 2015-07-20 13:41:40 -04: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
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 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
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
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 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
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 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
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
pwpiwi 2da2e92837 Merge pull request #109 from pwpiwi/image_shrink 
Compress FPGA configs and initialized data
 2015-06-24 07:47:45 +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 b8d34d0598 Merge pull request #118 from marshmellow42/master 
fix t55xx write timing
 2015-06-23 22:18:50 +02: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
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 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