Commit graph

748 commits

Author SHA1 Message Date
marshmellow42
d10e08ae6e Clean up pcf7931
@iceman1001 s cleanup of pcf7931 commands on client side
and split out pcf7931 from lfops.c as it is getting large
2015-10-14 16:17:56 -04:00
Martin Holst Swende
be6250d31b Merge pull request #140 from marshmellow42/iclass
iClass major updates
2015-10-13 09:39:04 +02:00
pwpiwi
8c6b22980c hf mf mifare: (finally) fix watchdog reset
- minor changes to sync
- try alternative strategies when debugging
2015-10-10 15:04:17 +02:00
marshmellow42
c54dff4f4a Merge remote-tracking branch 'Proxmark/master' into iclass
Conflicts:
	CHANGELOG.md
2015-10-07 09:34:47 -04:00
marshmellow42
4ff341efff fix help typo 2015-10-07 09:32:50 -04:00
marshmellow42
1a5a73abae Add mifare crypto trace decryption utility
allows manual decryption of hf 14a snoop traces of a mf card.
someday we should fix hf mf sniff...
2015-10-07 00:24:55 -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
940d53098c corrective values 2015-08-26 15:57:41 +02:00
Dake
dc4300bafb add : writing on PCF7931 tags 2015-08-26 15:53:49 +02:00
Martin Holst Swende
5d01f50ae1 Minor corrections 2015-07-31 23:30:48 +02:00
Martin Holst Swende
f68211671c Implemented data hex2bin and data bin2hex as per suggestion in http://www.proxmark.org/forum/viewtopic.php?pid=17504 2015-07-31 23:28:32 +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
marshmellow42
e1c6e9e8f1 iclass Write doMAC_N - rename variables to correct descriptions. 2015-07-28 15:20:19 -04:00
marshmellow42
bbd19beced update books to app_areas. clearer. 2015-07-25 23:24:53 -04:00
marshmellow42
b82d809852 update iClass chip identification 2015-07-25 23:09:07 -04:00
marshmellow42
3ac22ee1cf use read instead of readcheck except to auth 2015-07-23 01:12:02 -04:00
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
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
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
marshmellow42
aa53efc340 iclass additions
multiple contributors - thanks!
2015-07-20 13:41:40 -04: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