github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-12 08:16:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
1620 commits 3 branches 11 tags 34 MiB
Commit graph

961 commits

Author SHA1 Message Date
marshmellow42
0fb65a262b split lf indala[cmd] to lf indala [cmd] 
see changelog.md for cli changes!
 2017-03-24 19:18:33 -04:00
marshmellow42
2b4898ec71 fix lf file includes to include own .h 
thanks @iceman1001 for noticing.
 2017-03-23 22:32:38 -04:00
marshmellow42
f2fc0a9c4d move viking demod to respective file 
see changelog.md for cli changes!
 2017-03-22 22:59:55 -04: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
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
marshmellow42
f9f0e83b7c Add 2 pre-setable markers for the graph 2017-02-28 15:53:33 -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
marshmellow42
fac69c3d76 Adjust global variable name 2017-02-27 23:03:55 -05:00
pwpiwi
a9d08ed0d5 fix for Kali Linux users (Issue #218) 2017-02-27 19:09:09 +01:00
marshmellow42
2b11c7c750 adjust timeouts on lf read/lf search to no timeout if threshold was set. 
NOTE: lf snoop already doesn't have a timeout...
also adjusted PRIx64 to SCNx64 in em410xwrite
 2017-02-26 21:44:40 -05:00
pwpiwi
5a6a7affc5 Fix issues with commit 4197a3f on some linux distributions and old mingw environments (issue #217) 2017-02-24 16:19:35 +01:00
marshmellow42
c85189135e the timeout on lf read makes the threshold ... 
option not work as expected..  need to find a more robust option...

+ added iceman's lf_em410x_sim help text..
 2017-02-24 01:02:25 -05:00
Jeff Morsch
e88c04f924 Merge remote-tracking branch 'upstream/master' 2017-02-24 00:45:57 -05:00
marshmellow42
4913be92ac Merge remote-tracking branch 'upstream/master' 
Merge Head
 2017-02-23 14:08:41 -05:00
marshmellow42
e88096ba25 cleanup 
combine preamble searches (thanks @iceman1001)
simplify Em410xDecode
fix bug in removeParity (I made recently)
move Unique TAG ID printout to avoid confusion
 2017-02-23 13:53:40 -05:00
pwpiwi
4197a3f6ff Make LUA scripting work even if proxmark3 is called from arbitrary working directory 
- add @gpakosz whereami library (https://github.com/gpakosz/whereami) in order to ...
- determine and set absolute paths for LUA scripts and LUA libraries
 2017-02-23 18:37:34 +01:00
pwpiwi
4c16ae80f0 Code cleanup: 
- correctly using stdtypes.h printf and scanf format string macros (PRIx64 et al)
- coverity fixes to client/cmdhfmf.c
- fix linker warning re missing entry point when linking fullimage.elf
 2017-02-23 18:29:03 +01:00
pwpiwi
43534cbad2 Code cleanup: 
- correctly use inttypes.h scanf and printf macros (PRIx64 et al)
- fix indendation warnings
 2017-02-22 22:45:00 +01:00
pwpiwi
2d0717853d Merge pull request #216 from marshmellow42/master 
EM4x05/EM4x69 command rewrite and improvements
 2017-02-22 17:38:56 +01:00
marshmellow42
33a1fe9636 small text adjustments plus... 
small improvement to fsk clock detect + fixed a bug where it would
default to rf/16 when it couldn't find a valid one...
 2017-02-22 10:41:40 -05:00
marshmellow42
34ff898553 fix false positive psk demod with fsk wave 
also break out new find start of modulation routine.
 2017-02-21 23:00:43 -05:00
marshmellow42
73a2a84f75 simplified lf em command structure 
WARNING changes command calling!
 2017-02-21 12:00:09 -05:00