Commit graph

1322 commits

Author SHA1 Message Date
pwpiwi
6e2f85c44c Merge pull request #141 from etmatrix/tosubmit
HF snoop ported by enio's repository
2015-11-03 07:44:01 +01:00
etmatrix
edc9ce00b3 - Little change to description in client
- Added description to CHANGELOG.md
2015-11-03 07:15:56 +01:00
etmatrix
82d589348c - Correct little distraction on fpga/Makefile
- New patch from pwpiwi works very well for hi_sniffer.v
- Restored previous fpga_lf.bit
2015-11-02 09:08:21 +01:00
etmatrix
031311c7ae LED D is on while snoop, when user button is pressed snoop is stopped 2015-10-25 08:10:17 +01:00
etmatrix
0472d76de4 The great work of Enio hf snoop is now ported into latest version in git
you can find original work here https://github.com/EnioArda/proxmark3
2015-10-23 15:40:35 +02: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
f1f1aceaba fix changelog conflict 2015-10-07 09:38:07 -04: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
Martin Holst Swende
9dd0ac57ed Merge pull request #138 from Dake01/master
Add : writing on PCF7931 tags
2015-09-08 21:04:24 +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
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
Martin Holst Swende
da721c6b30 Merge pull request #134 from VERTCraig/master
Updating StandAloneMode14a
2015-07-28 19:00:19 +02:00
Craig Young
73d336ae1d Adding STL files for 3D printed coil forms 2015-07-26 11:55:50 -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
85f581c79f fix typo 2015-07-25 22:22:19 -04:00
marshmellow42
7a8344d0c9 document iclass additions 2015-07-25 22:11:54 -04: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
Martin Holst Swende
987dfb66e2 changelog docs 2015-07-21 23:21:16 +02: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
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
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
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