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

979 commits

Author SHA1 Message Date
marshmellow42 488d309804 fix indentation warning 
thanks to piwi for finding.
 2017-03-26 17:35:16 -04:00
marshmellow42 8169040a0a Merge pull request #253 from marshmellow42/master 
fix missing header
 2017-03-26 13:35:32 -04:00
marshmellow42 3e8c61a522 fix missing header 
http://www.proxmark.org/forum/viewtopic.php?pid=26786#p26786
 2017-03-26 13:34:38 -04:00
Iceman 79375850fd Merge pull request #252 from marshmellow42/master 
adjust lf menu descriptions
 2017-03-26 15:24:07 +02:00
marshmellow42 9b99a6dbdb adjust lf menu descriptions 
RFIDs for tag formats that can be emulated by many chips
CHIPs for chip specific commands
 2017-03-26 08:46:45 -04:00
Iceman d95878f802 Merge pull request #251 from marshmellow42/master 
split fdx-b demod to its own file
 2017-03-26 14:35:42 +02:00
marshmellow42 4db6f3bbb9 split fdx-b demod to its own file 
added @iceman1001 s read/sim/clone commands for fdx--b
check changelog.md for cli changes!
 2017-03-26 08:09:40 -04:00
Iceman 1ee7925609 Merge pull request #249 from pwpiwi/parity 
Refactor parity functions
 2017-03-26 08:28:43 +02:00
Iceman fecfd86d3d Merge pull request #248 from marshmellow42/master 
Split data askgproxiidemod to own file
 2017-03-26 08:26:30 +02:00
pwpiwi 1f065e1dad Refactor parity functions 
- get rid of __asm function in crapto1.h, use gcc builtin function instead
- make parity functions available in common directory
 2017-03-25 22:03:17 +01:00
marshmellow42 946a84c35b Split data askgproxiidemod to own file 
added lf gproxii read (from antenna)
fixed a few copy paste issues in the comments of some lf files
 2017-03-25 15:51:31 -04:00
Iceman edf751bb62 Merge pull request #245 from marshmellow42/master 
split lf indala[cmd] to lf indala [cmd]
 2017-03-25 07:28:53 +01:00
marshmellow42 0fb65a262b split lf indala[cmd] to lf indala [cmd] 
see changelog.md for cli changes!
 2017-03-24 19:18:33 -04:00
Iceman f513388ee0 Merge pull request #243 from pwpiwi/cleanup 
Deduplicate mfkey32 and mfkey64
 2017-03-24 08:19:23 +01:00
Iceman 41f4bcabc6 Merge pull request #244 from marshmellow42/master 
fix lf file includes to include own .h
 2017-03-24 07:46:34 +01:00
marshmellow42 2b4898ec71 fix lf file includes to include own .h 
thanks @iceman1001 for noticing.
 2017-03-23 22:32:38 -04:00
pwpiwi 4cb4b588c2 Deduplicate mfkey32 and mfkey64 
- rename client/nonce2key.[ch] to mfkey.[ch]
- leave only main() wrapper in tools/mfkey
- add mfkey32 and mfkey64 to .gitignore
 2017-03-23 18:38:17 +01:00
pwpiwi 275111f6ff Merge pull request #242 from marshmellow42/master 
move viking demod to respective file
 2017-03-23 06:38:22 +01:00
marshmellow42 f2fc0a9c4d move viking demod to respective file 
see changelog.md for cli changes!
 2017-03-22 22:59:55 -04:00
Iceman 9b952b29eb Merge pull request #241 from pwpiwi/ukbhit_fix 
fix: ukbhit() for OS X
 2017-03-22 22:39:28 +01:00
marshmellow42 cf4640b973 split io demod/pyramid demod to respective files 
out of cmddata.c / data cmds
see changelog.md for cli changes as options have changed!
 2017-03-22 17:16:43 -04:00
pwpiwi 8c0ccdef35 fix: ukbhit() for OS X 
- don't use CMIN and CTIME
- corrected comments
 2017-03-22 22:15:24 +01:00
marshmellow42 ecbf82fe20 fix headers 2017-03-22 15:54:32 -04:00
marshmellow42 6cd2eef44b split hid demod/awid demod to respective files 
NOTE: see changelog.md for cli changes
 2017-03-22 15:49:01 -04:00
marshmellow42 35aa230ee4 move em410x demod functions to cmdlfem4x.c 
from cmddata.c
NOTE: see changelog.md for command line changes!
 2017-03-21 18:42:11 -04:00
pwpiwi 7ac59a82ab Merge pull request #235 from marshmellow42/lfdemod_refactors 
lfdemod refactor
 2017-03-21 15:38:17 +01:00
Iceman bea6e7b0b6 Merge pull request #234 from pwpiwi/nonce2key 
Code cleanup: Refactoring nonce2key
 2017-03-21 08:49:27 +01:00
marshmellow42 2d42ea1e4d add bitswap option for lf em 4x05write (#236) 
default read mode of this chip outputs in reverse order...  so offer the
option to program in reverse order
 2017-03-21 08:26:26 +01:00
pwpiwi 7779d73c71 Code cleanup: Refactoring nonce2key 
- include nonce2key() in mifarehost.c
- remove tools/nonce2key
- simplify mifare_autopwn.lua
 2017-03-20 21:16:57 +01:00
pwpiwi de867f502f fix: crapto3.3 sometimes crashing with hf mf mifare on Fudan clones (no par, all NACK) (#233) 
added readme.txt again in tools/nonce2key
 2017-03-20 21:05:26 +01:00
marshmellow42 6f36848f9e refactor pskdemod - remove nrz.._ext 2017-03-15 10:53:32 -04:00
marshmellow42 cb86f8d69f wasn't ready for these yet... 2017-03-14 13:18:20 -04:00
marshmellow42 127f149075 add first attempt at lf miller decoding 
don't have any tags capable to test and not yet hooked up to data
rawdemod...
 2017-03-14 13:16:30 -04:00
pwpiwi 02069dbbdb fix: add missing #includes 2017-03-12 18:39:47 +01:00
pwpiwi 0691975406 fix: add missing #includes 2017-03-12 18:36:24 +01:00
pwpiwi acf0582d53 Provide msclock() as Milliseconds timer for performance measures (#231) 
- don't use clock(). It has different functionalities in Windows and Linux
- move sleep functions to util.h
 2017-03-12 15:06:27 +01:00
pwpiwi 0ca9bc0e99 Upgrade crapto1 library to v3.3 (#232) 
- fix standalone tools mfkey32, mfkey64 and nonce2key to use common crapto1 library
- fix compiler warnings in tools/mfkey/mfkey64.c and tools/nonce2key/nonce2key.c
- allow crapto1.c to compile on ARM hosts
- add @iceman1001's readme.txt to tools/mfkey
 2017-03-12 15:05:54 +01:00
marshmellow42 669959bc5c started to enable demod graphing 
first step: find graph start position from each rawdemod -now complete.
todo: apply to each individual demod
todo: graph it
 2017-03-11 19:21:53 -05:00
pwpiwi 62fab50902 Create directory client/obj/crapto1 (missing in commit 33443e7) 2017-03-11 08:50:32 +01:00
pwpiwi 33443e7caa Code cleanup: deduplicate crapto1 library (#228) 
- merge the existing 4 crapto1 sources into common/crapto1
 2017-03-09 11:12:50 +01:00
marshmellow42 8b6abef506 add iceman1001 s lf visa2000 commands 
-reset my fork due to corruption - now add back in the lf visa
commands...
also adjusts lfdemod all detect clock functions to always return a
starting point of the clock detected ( for graphing purposes)
 2017-03-07 08:48:16 -05:00
pwpiwi 300bb58ac1 Merge pull request #227 from pwpiwi/client_fixes 
Client code cleanup:
 2017-03-06 22:19:15 +01:00
pwpiwi 7cb8516cb5 Client code cleanup: 
- cleanup some header files and respective #includes
- rearrange functions (definition before first use)
- use SCNxxx instead of PRIxxx macros in scanf()
- use stdbool true/false instead of self defined TRUE/FALSE
 2017-03-06 21:03:13 +01:00
pwpiwi c44c2f04d9 Fix some #defines 
- Use -D_ISOC99_SOURCE instead of -D__USE_MINGW_ANSI_STDIO=1
- WIN32 is deprecated. Use _WIN32 instead
 2017-03-06 19:55:23 +01:00
Luca 6ef3f9f219 Typo fix for CmdPing 
Ping successfull -> Ping successful
 2017-03-04 13:38:57 +01:00
James Chambers d172c17ca4 make clean_ascii a util function 2017-03-03 18:04:58 -05:00
James Chambers 4bbf5ad17d clean up unprintable characters in MFU dump output 2017-03-03 17:38:51 -05:00
pwpiwi f76d6fae10 Merge pull request #220 from marshmellow42/master 
small patches and small added features listed below:
 2017-03-01 07:08:50 +01:00
marshmellow42 f75b313b00 fix stt mark location bug 
add `data mtrim` to do a middle trim of the graph.
 2017-02-28 17:28:51 -05:00
marshmellow42 ab812dfae5 implement marking the second STT when detected 
on the graph window
 2017-02-28 16:35:01 -05:00