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

1611 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pwpiwi 8c0ccdef35 fix: ukbhit() for OS X 
- don't use CMIN and CTIME
- corrected comments
 2017-03-22 22:15:24 +01:00
pwpiwi 7ac59a82ab Merge pull request #235 from marshmellow42/lfdemod_refactors 
lfdemod refactor
 2017-03-21 15:38:17 +01:00
marshmellow42 86b8ecb56e adjust ManchesterEncode 
removed dead size check
added a max size of 2k input bits (4k out)
this shouldn't overload the array memory passed to it typically...
 2017-03-21 09:53:14 -04: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 ec187c2f9f line break 2017-03-15 11:07:52 -04:00
marshmellow42 6f36848f9e refactor pskdemod - remove nrz.._ext 2017-03-15 10:53:32 -04:00
marshmellow42 56de46b466 further refactor 2017-03-14 17:08:58 -04:00
marshmellow42 d87bf1567a move new functions to utilities area 2017-03-14 16:24:14 -04:00
marshmellow42 c83d6dc6fa continue refactor detectST 
detectST should be done now...
 2017-03-14 16:20:15 -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
marshmellow42 549daaf778 fixed bug in new refactored detectST 
forgot to return i...
 2017-03-13 13:27:38 -04:00
marshmellow42 d5051b9817 meant to put clock detection before demods 
... fixing that.
no code changed here...
 2017-03-12 23:11:52 -04:00
marshmellow42 bf74114d50 refactor detectST a little... 
+ a little more shuffling
 2017-03-12 22:57:01 -04:00
marshmellow42 4d3c179669 re-organize lfdemod.c 
sorry but it was ugly  (still is... but i can get to things easier)
 2017-03-12 22:47:50 -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
Iceman a3bd24b5dc Merge pull request #230 from zhovner/master 
Adding homebrew tap method for macOS
 2017-03-08 12:20:47 +01:00
Pavel Zhovner 45095b0178 Adding homebrew tap method for macOS 2017-03-08 14:16:33 +03:00
Iceman 6143f8ccf1 Merge pull request #229 from marshmellow42/master 
add iceman1001 s lf visa2000 commands
 2017-03-08 06:42:08 +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
Iceman 7ea23ef5b3 Merge pull request #226 from pwpiwi/fix_defines 
Fix some #defines
 2017-03-06 20:46:09 +01:00
Iceman 571324a5c4 Merge pull request #225 from pwpiwi/armsrc_header_fixes 
Remove local armsrc/stdint.h and fix some other #includes
 2017-03-06 20:45:58 +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
pwpiwi b8e461ff61 Remove local armsrc/stdint.h and fix some other #includes 2017-03-06 19:22:35 +01:00
Iceman 8a8e7c6914 Merge pull request #223 from 4m4rOk/master 
Typo fix for CmdPing
 2017-03-04 13:54:44 +01:00
Luca 6ef3f9f219 Typo fix for CmdPing 
Ping successfull -> Ping successful
 2017-03-04 13:38:57 +01:00
pwpiwi 23bd68f944 Merge pull request #221 from jamchamb/clean-mfu-dump 
Clean mfu dump output
 2017-03-04 12:48:37 +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 ebd95febb8 update changelog 2017-02-28 17:44:19 -05: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
marshmellow42 f9f0e83b7c Add 2 pre-setable markers for the graph 2017-02-28 15:53:33 -05:00
marshmellow42 b1ee7eed65 fix em410x XL bug 
and make it rule out more false positives.
 2017-02-28 13:32:23 -05:00
marshmellow42 62a38cc883 adjust em4x05/em4x69 command timings to... 
better conform to datasheet.
 2017-02-28 13:18:52 -05:00
marshmellow42 dda5a928f0 fix STT bug for strong waves (or cleaned ones) 2017-02-28 11:53:55 -05:00
marshmellow42 40c6a02bc9 Add a retry loop to hf mf dump 
helps get the data dumped even if positioning isn't 100% perfect.

also switched em4x05 commands to WaitUS instead of SpinDelayUs, per
@pwpiwi 's suggestion.
 2017-02-28 11:09:42 -05:00
Iceman 38231ce012 Merge pull request #219 from marshmellow42/master 
em cleanup and fix bug in lf config [threshold] option making it not work...
 2017-02-28 08:00:00 +01:00