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
1363 commits 3 branches 11 tags 34 MiB
Commit graph

1363 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Holst Swende 9983a92943 Merge pull request #143 from marshmellow42/master 
lfops cleanup, t55xx additions/fixes, PCF7931 input cleanup
 2015-11-15 13:22:26 +01:00
Martin Holst Swende fa0503b03f Merge pull request #144 from dnet/makefile-paren-fix 
fixed target "help" in Makefile
 2015-11-15 13:20:51 +01:00
Martin Holst Swende 88715fe122 Merge pull request #146 from dnet/patch-1 
Fixed copypasted hex output to match input
 2015-11-15 13:20:25 +01:00
marshmellow42 14331320c4 Fix viking demod bug - clean my indala demod code 
NOTE lf indalademod is still available as it uses a different technique
to demodulating, which sometimes works better (and sometimes worse).
 2015-11-10 11:59:41 -05:00
marshmellow42 3ea7254a57 add checksum to viking demod 2015-11-09 23:48:39 -05:00
marshmellow42 415274a7c3 Add Viking demod, 
fix compiler warning for int vs uint8_t for em410x sim clock variable
 2015-11-09 23:09:26 -05:00
András Veres-Szentkirályi 7cdf6236cb Fixed copypasted hex output to match input 
The value `x0` was obviously copypasted but not edited to reflect the real values used in `case` matching.
 2015-11-09 21:06:58 +01:00
András Veres-Szentkirályi 16f54ead2a fixed target "help" in Makefile 
Without this commit, running `make help` produced the below output.

    $ make help
    Multi-OS Makefile, you are running on Linux
    Possible targets:
    + all - Make bootrom, armsrc and the OS-specific host directory
    + client - Make only the OS-specific host directory
    + flash-bootrom - Make bootrom and flash it
    /bin/sh: 1: Syntax error: "(" unexpected
    Makefile:20: recipe for target 'help' failed
    make: *** [help] Error 2

This issue was introduced in e335ca2846
six months ago, the above output was produced on Debian GNU/Linux, where
`/bin/sh` is usually a symbolic link to `/bin/dash`.
 2015-11-09 19:40:27 +01:00
marshmellow42 daa4fbaeec fix em410xsim help - add clock input to em410xsim 2015-11-07 21:02:30 -05:00
pwpiwi 2487dfeb07 fix: .history was never written 2015-11-06 11:34:43 +01:00
pwpiwi 5d0e190169 fixing hf snoop: 
- add: clear the trace buffer before snooping
- fix: allow trigger on odd samples as well
- fix: don't use Dbprintf() in timing tight loops
 2015-11-06 09:02:05 +01:00
marshmellow42 8949e04584 Merge remote-tracking branch 'upstream/master' 2015-11-03 20:19:46 -05:00
marshmellow42 76346455d2 minor lf updates/cleanup 2015-11-03 20:18:16 -05:00
pwpiwi b2fe0e77c5 Merge branch 'topaz' 
Conflicts:
	CHANGELOG.md
	client/cmdhf.c
 2015-11-03 21:06:59 +01:00
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
marshmellow42 9f669cb26f minor cleanups 2015-10-31 23:12:42 -04:00
marshmellow42 78711df115 update changelog 2015-10-30 23:30:12 -04:00
marshmellow42 66837a0302 Add lf t55xx resetread cmd + fix clone cmds 
resetread cmd to determine start of streaming bits of ata5577 or
compatible chips...
fixed lf clone bugs introduced while refactoring recently...
 2015-10-30 23:23:27 -04:00
pwpiwi d9cc4e1ae2 Merge branch 'master' into topaz. Update Changelog. 2015-10-27 20:57:16 +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
marshmellow42 3606ac0a2b refactor lfops t55xx functions 
share t55xx configuration register definitions with client for later use
(warning - compiled but not fully tested yet)
 2015-10-24 09:54:04 -04:00
marshmellow42 88f475cf6b update changelog 2015-10-23 13:13:29 -04:00
marshmellow42 0c8200f11c text cleanup t55xx cmds 2015-10-23 13:05:40 -04: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
marshmellow42 be2d41b73a updates to lf t55xx commands 
fix wakeup cmd per @iceman1001
fix dump and read cmds
clean up write command
allow page 1 read/write (block 3 is writable)(ata5577 only)
remove duplicate code
 2015-10-22 16:19:23 -04:00
marshmellow42 8e99ec25ed add wake option to t55xx read command 2015-10-17 15:01:26 -04:00
marshmellow42 21a615cb3b begin update lf commands with help text and 
cmd structure.
update changelog for recent changes
 2015-10-17 10:48:54 -04:00
marshmellow42 f1b74c3089 add lf t5 read w/pwd warning and checks 
ideas from @iceman1001 for issue #136
 2015-10-15 21:26:23 -04:00
marshmellow42 7cfc777b0e lf t55xx code cleanup + 
@iceman1001 s cleanup of some t55xx read code, plus some timing tests to
improve lf t5 detect/read...
small typo in pcf 16 address bytes instead of 4...
add option for verbose or not on bigbuf clear cmd.
 2015-10-15 14:53:49 -04:00
marshmellow42 59b5b7e14c PCF-fix bytepos range from 0-3 to 0-15 2015-10-15 01:31:52 -04:00
marshmellow42 f4eadf8a50 adjust lf t55xx read commands 
seems to make them a lot more accurate for me
 2015-10-15 01:09:49 -04:00
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 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
pwpiwi 7624e8b21b hf topaz reader implementation: 
- read and display dynamic memory as well
- display "locked" status per byte instead per block
 2015-09-28 08:26:00 +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
pwpiwi 8e21541e77 Merge branch 'master' into topaz 2015-08-25 07:53:00 +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