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

1108 commits

Author SHA1 Message Date
marshmellow42 bb4e6dbd62 align clock grid with demods on graph (#276) 
* align clock grid with demods on graph

* proper initialized values
 2017-04-12 05:48:49 +02:00
marshmellow42 3fe7103959 proper initialized values 2017-04-11 21:51:31 -04:00
pwpiwi 31a29271b9 fix clang compiler warnings (including fixing a bug revealed in cmdhftopaz.c) 2017-04-11 18:55:33 +02:00
marshmellow42 0f321d631a align clock grid with demods on graph 2017-04-11 10:34:43 -04:00
pwpiwi 8aee1b8418 avoid vast number of warnings with clang compiler 2017-04-11 07:05:22 +02:00
pwpiwi 3472ebe528 Compatibility fixes for Qt5 (#271) 
* Compatibility fixes for Qt5
- make Qt detection in client/Makefile independent of OS
- added -std=c++11 and -fPIC as compiler options (required by some Qt versions, breaks compiling with old ProxSpace environment)
 2017-04-11 06:58:20 +02:00
pwpiwi 68541dddc2 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2017-04-10 19:37:05 +02:00
pwpiwi 4a6bc37e70 fix missing terminating 0 in my_executable_directory (thanks @iceman1001). 
fix warning about const used twice in get_my_executable_path() and get_my_executable_directory().
 2017-04-10 18:44:27 +02:00
marshmellow42 90e9da2566 fix length test 
thanks @pwpiwi for catching what i missed.
 2017-04-10 11:38:11 -04:00
marshmellow42 e8647c5764 fix silent option for getSamples 2017-04-07 18:10:01 -04:00
marshmellow42 f1004b345e fix buffer length bugs 
adjust lf search a little as to when the chiptype check happens
 2017-04-07 18:00:55 -04:00
marshmellow42 b9957414a5 lf read adjustments 
add parameter for # bits to read
auto get samples after lf read/snoop (don't need to do a `data samples`
anymore)
add safe function to get DemodBuffer
add some lf demod comments and apply new lf_read function instead of
read then get samples.
fixed output bug in lf t55xx config print
fixed small bug in lf t55xx detect during ST check
 2017-04-07 17:28:12 -04:00
marshmellow42 605524b131 fix command help 
add comments in changelog
 2017-04-04 17:34:15 -04:00
marshmellow42 bf85d22f96 fix bug in st detect + 
adjust nrz t55xx detection to reduce false positives on weak antennas
adjust t55xx read wait to get past initial startup wave.
 2017-04-04 17:22:21 -04:00
marshmellow42 b97311b1bd lf improvements 
fix noralsy demod bug (st should be true)
fix sprint_bin_break bug (didn't print last bit)
add a function to save/restore demodbuffer
remove redundant countFC call in PSKDemod
clean up pskclockdetect functions
fix indala26decode bug (end of data sometimes not correct)
improve PSK detection / demodulation
improve NRZ detection
improve t55xx commands & fix a few bugs
add t55xx page1 detection - added it to lf search
added experimental t55xx testmode write
 2017-04-04 11:52:10 -04:00
marshmellow42 6a772a1273 add verification data was entered-lf em 4x05 write 2017-03-31 12:52:30 -04:00
marshmellow42 51b614aa75 fix return value for error. 2017-03-31 12:22:30 -04:00
marshmellow42 5249ff940f Merge remote-tracking branch 'upstream/master' 2017-03-31 12:18:50 -04:00
marshmellow42 4ab135c0cd a few more tools for em4x05 writing. 
ready to begin coding cloning cmds to em4x05.
 2017-03-31 12:14:28 -04:00
pwpiwi fb9acd4588 Update/cleanup Makefiles (#265) 
- add new target "make mfkey" to build mfkey32 and mfkey64
- include above when "make all"
- fix Qt detection for Kali Linux
- create and use dependency files when building client
- create client/lualibs/usb_cmd.lua from include/usb_cmd.h when building client
- add Windows *.exe files with "make tarbin"
- For the time being don't include Makefile.common in Makefile and client/Makefile
- set com3 as default flashing port for Windows (including mingw)
- remove static targets snooper and cli. Remove their sources as well.
 2017-03-31 16:04:04 +02:00
marshmellow42 fa2aab705b Fix data mtrim (#262) 
I don't even know what happened there...
 2017-03-30 22:23:02 +02:00
marshmellow42 3991b2ec6a Fix data mtrim 
I don't even know what happened there...
 2017-03-30 12:05:03 -04:00
m2otech 1f1f1955dc Fixed compile error in MinGW (#260) 
* Fixed compile error in MinGW

Some versions of MinGW miss some definitions. In order to be able to
compile I redefined a function and added an explicit include. It is only
a quick workaround, as other people also seemed to have the same
problem. It should be checked whether a better solution is possible.

* Removed _ftime_s redefine, calling _ftime directly
 2017-03-30 03:39:39 +02:00
marshmellow42 f2ea55fb3c fix/update removeParity & fix securakey detection 2017-03-29 10:02:29 -04:00
marshmellow42 c3caf0409c add lf securakey 
still unknown - checksum and how FC relates to printed FC/Code

also removed noralsy extra ST check (i was tired...)
 2017-03-29 00:37:16 -04:00
marshmellow42 199c74a47f fix build error on kali in new noralsy 2017-03-28 18:15:43 -04:00
marshmellow42 a9968da347 add jablotron+noralsy lf tag definitions/cmds 
Thanks to @iceman1001 for most of the code.
Jablotron is complete
noralsy is mostly known - a few bits are still unknown.
 2017-03-28 18:01:45 -04:00
marshmellow42 b2f565142c fix copy paste header issue 
thanks @iceman101 for noticing.
since i forgot to remove it from cmddata.h it didn't show during
compile.
 2017-03-28 09:11:29 -04:00
marshmellow42 5bce72d5e3 split lf paradox/nexwatch into own files 
see changelog.md for cli changes!
 2017-03-27 18:04:20 -04:00
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
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
marshmellow42 d0b0586411 cleanup cmdlfem4x.h - add chip detection to ... 
... lf search
 2017-02-21 11:46:13 -05:00
marshmellow42 0a85edf471 add em4x05 config printout 2017-02-21 11:06:19 -05:00
marshmellow42 a37228c8c2 shorten em4x05 capture samples 
add cap option for 4469
add sample size option for  DoAcquisition so i can limit how many
samples i want to collect.
use with DoPartialAcquisition
 2017-02-20 17:39:39 -05:00
marshmellow42 893534d3b5 speed up the em4x05 cmds by only getting 6k... 
samples back
 2017-02-20 15:06:22 -05:00
James Chambers 4b12061bee fix recvLen variable name in hf_reader 2017-02-20 14:31:21 -05:00
marshmellow42 fa1e00cfbb add em4x05 info command 
plus some minor adjustments
and added a quick em4x05 test:
bool EM4x05Block0Test(uint32_t *wordData)
if successful very likely the tag is an em4x05 or compatible...
 2017-02-20 09:50:00 -05:00
marshmellow42 34212c662c fix dump output 2017-02-19 21:31:46 -05:00
marshmellow42 4c6ccc2b04 a little cleanup 2017-02-19 20:47:45 -05:00
marshmellow42 61500621bc @iceman1001 s idea to output failure report 2017-02-17 14:48:19 -05:00
marshmellow42 6980d66b05 add psk to em4x05 reads and tweak psk demod 2017-02-17 14:40:40 -05:00
marshmellow42 e39a92bb1d em4x05 getting better 
got the read/dump cmds working pretty well
some tweaking still left to do.
 2017-02-17 01:33:27 -05:00
marshmellow42 2d99d9912c a couple em4x05 fixes. 2017-02-16 13:57:14 -05:00
marshmellow42 59f726c989 EM4x05/EM4x69 continued + a couple of icemans utils. 2017-02-15 23:27:15 -05:00
marshmellow42 6f1a597855 couple q5 fixes + continue with em4x05 em4x69.. 
.. readword demods
(not tested)  still a work in progress
 2017-02-14 23:42:55 -05:00
marshmellow42 7666f4608e update em4x05/em4x69 cmds 
@iceman1001 s updates + some of my own.
still more to do:
-auto demod responses
-figure out config block
-figure out block 0 info / serial # in block 1
-figure out block 3 protection data
-add dump all blocks cmd
 2017-02-12 23:59:44 -05:00
marshmellow42 e04475c421 Add @Iceman1001 s cotag read 
also needed to include some of icemans timer additions.
 2017-02-03 00:14:34 -05:00
marshmellow42 38cb7c71c5 add check for no wave in graphbuffer prior to... 
hitag lf search check
 2017-02-01 15:39:10 -05:00
marshmellow42 11117f6ab5 Merge remote-tracking branch 'upstream/master' 2017-01-30 23:20:55 -05:00
marshmellow42 103c60ec7e flag needed for some compile environments 
used for 'z' and 'l' in printf commands.
 2017-01-30 23:13:22 -05:00
pwpiwi 1888664863 Merge pull request #209 from micolous/14a-random-nonce 
Adds random nonce (r) option to `hf mf sim`.
 2017-01-28 17:11:13 +01:00
Michael Farrell 5b5489baf4 hf mf sim: Multiple fixes from review of PR #209. 
- Don't increment the nonce when random mode is disabled (this breaks the
  standard attack).

- Don't attempt the standard attack when random mode is enabled (there's no
  point as it won't work, per comments from @pwpiwi).

- Attempt the moebius attack if the standard attack fails.
 2017-01-26 20:30:13 +11:00
Michael Farrell f9c1dcd9f6 Adds random nonce (r) option to hf mf sim. 
This makes the PM3 generate pseudo-random nonces rather than sequential
nonces, to make it act a bit more like a "real" MFC card.  A reader would
otherwise be able to detect the PM3 probing based on the predictable nonces
and throw different authentication challenges (or refuse to authenticate at
all).

The code includes an implementation of a rand-like function (prand), similar
to the one from libc, which is seeded automatically based on the time it
takes between the PM3 starting up and the first call to the RNG.

This isn't cryptographically random, but should be "good enough" to be able
to evade basic detection.
 2017-01-26 18:32:25 +11:00
marshmellow42 01d0f8ae8f bug fixes - LF rawdemod am and ST 
rawdemod parameter length test too short for help text
amp option should amp prior to ST check
ST check adjusted to make room for rf/32 clock instead of rf/64 (so will
have extra room if clock is higher than 32)
ST check improved to better account for low drift
 2017-01-20 00:55:40 -05:00
marshmellow42 89696b8b24 fixed lf antenna left on bug && some iclass ... 
output cleanup by @iceman1001
 2016-12-19 09:45:23 -05:00
marshmellow42 921e63992c a few bug fixes with adding hitag detection to... 
`lf search`
 2016-12-16 14:04:39 -05:00
marshmellow42 0b91ce03e5 Merge remote-tracking branch 'upstream/master' 2016-11-29 15:09:27 -05:00
Iceman d1057e7a21 Merge pull request #119 from marshmellow42/pm3+reveng 
add reveng 1.30 source to PM3 for CRC calculations & searches
 2016-10-08 19:18:14 +02:00
ikarus 2943527472 Fixed all "misleading-indentation" warnings (fixes #187). 2016-09-26 21:15:49 +02:00
menshiyun 5bac3d9b3c fix client/Makefile 2016-09-25 14:32:06 +08:00
menshiyun 94e27a0961 fix client/Makefile 2016-09-25 14:26:11 +08:00
menshiyun 775c4c4a28 test-pr 2016-09-24 12:56:08 +08:00
Johnny Bengtsson ad8a18e66e Code cleanup 
Some variable type changes.
 2016-09-14 13:27:24 +02:00
Johnny Bengtsson 015520dc4e Warning removal fix 
Minor fix of data type corrections.

gcc -std=c99 -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall  -g -O4 -DHAVE_GUI -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED  -c -o obj/fpga_compress.o fpga_compress.c
fpga_compress.c: I funktion "zlib_compress":
fpga_compress.c:90:20: varning: format "%lu" förväntar sig argument av typen "long unsigned int", men argument 3 har typen "int" [-Wformat=]
    fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.\n", num_infiles*FPGA_CONF
                    ^
fpga_compress.c:142:18: varning: format "%lu" förväntar sig argument av typen "long unsigned int", men argument 3 har typen "uint32_t {även unsigned int}" [-Wformat=]
  fprintf(stderr, "compressed %lu input bytes to %lu output bytes\n", i, compressed_fpga_stream.total_out);
 2016-09-13 12:21:46 +02:00
Johnny Bengtsson 887f6ab4b3 Better Linux compilation compability 
Addition of the termcap and ncurses libraries fixes the compilation issue on Slackware Linux 14.2.

/usr/lib64/gcc/x86_64-slackware-linux/5.4.0/../../../../lib64/libreadline.so: undefined reference to `PC'
collect2: fel: ld returnerade avslutningsstatus 1
Makefile:132: receptet för målet "proxmark3" misslyckades
make[1]: *** [proxmark3] Fel 1
make[1]: Lämnar katalogen "/home/github/proxmark3/proxmark3/client"
Makefile:12: receptet för målet "client/all" misslyckades
make: *** [client/all] Fel 2
make: Lämnar katalogen "/home/github/proxmark3/proxmark3"
 2016-09-12 16:03:46 +02:00
Iceman 7669409547 Merge pull request #185 from marshmellow42/master 
some lf fixes and hf mf sim attack mode add-ons
 2016-08-12 13:55:09 +02:00
marshmellow42 f86d6b557a attempt hitag2 uid read for lf search 2016-08-04 13:51:37 -04:00
marshmellow42 ef3f88bca9 disable extra attack - disable stats.txt 
Moebius attack didn't yield any better results in my testing so
disabling it, but allowing it to be re-enabled at will.
also disabled the auto logging of all keys with uid delimited file
stats.txt - can be uncommented when needed
 2016-07-28 12:52:18 -04:00
marshmellow42 91f4d53123 couple bug fixes - clean up 2016-06-28 21:02:26 -04:00
marshmellow42 76ef5273d8 hf mf sim code cleanup - update changelog 2016-06-27 00:09:40 -04:00
marshmellow42 73ab92d14c mf 1k sim reader attack cleanup 
add abort options - keyboard & button press.
 2016-06-25 00:53:53 -04:00
marshmellow42 bbd118760b allow mf1k reader attack from file full of UIDs 
also add UID to stats.txt collection.
 2016-06-24 23:43:53 -04:00
marshmellow42 6eae192c41 fix bug in moebius nonce collection - now finishes 
also cleaned up some comments
note previous update added the creation of a stats.txt file to generate
statistics of the differences between std mfkey32 and the moebius
version.
 2016-06-24 16:46:11 -04:00
marshmellow42 c872d8c177 update hf mf sim x attack mode - start 10byte uid.. 
..support  (some from @iceman1001)
(sim reader attack currently testing std mfkey32 vs mfkey32_moebius
version...)  possibly will remove one later.
 2016-06-24 01:31:27 -04:00
marshmellow42 7314995a5a hf mf sim x reader attack add-ons 
forgot to include the mfkey32 attack
 2016-06-22 11:26:11 -04:00
marshmellow42 79dcb9e090 improve hf mf sim x reader attack 
can now directly extract multiple keys for multiple sectors
 2016-06-22 11:03:37 -04:00
marshmellow42 8f2268397d fix bug in viking clone/sim 
from @iceman1001
 2016-06-20 00:28:26 -04:00
marshmellow42 de53156e1e Fix the AskEdgeDetect cleaning tool 
somehow it got broken.
(maybe i had an incomplete pull request once upon a time)
 2016-06-19 23:44:54 -04:00
marshmellow42 c0d32c3186 Merge remote-tracking branch 'upstream/master' 2016-06-05 22:20:36 -04:00
Richard Antony Burton fdcfbdcc21 add l/h option to hw tune and optimize order of tuning 2016-06-01 08:13:20 +01:00
András Veres-Szentkirályi f9ce1c3a00 removed unused variable 2016-05-10 10:33:30 +02:00
marshmellow42 29ada8fc08 add ST to ask/manchester sim, finish presco... 
...as it is currently understood - need to add base 12 printed ID to
demod output...
add Q5 option to pyramid
fix missing include I mistakenly removed in cmdlf
 2016-03-07 01:01:40 -05:00
marshmellow42 e3c992a92f fix comment typo error 2016-03-05 23:46:34 -05:00
marshmellow42 6923d3f14f Add @iceman1001 s presco and pyramid functions + 
plus comment some includes.
fix indala error checking bugs
cmddata.h previously relied on several headers being included prior to
cmddata.h, now self contained.
 2016-03-05 23:45:28 -05:00