pwpiwi
dc2349ae77
fix mfkey tools (issue #247 )
...
- add -std=c99 -D_ISOC99_SOURCE to compiler flags
- fix: include <string.h> instead of <strings.h> in mfkey64.c
2017-03-26 12:28:07 +02:00
Iceman
f513388ee0
Merge pull request #243 from pwpiwi/cleanup
...
Deduplicate mfkey32 and mfkey64
2017-03-24 08:19:23 +01:00
pwpiwi
42a6a3f87b
Remove duplicate #include stdio.h
2017-03-24 07:53:52 +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
bd2797de15
fix: compile issue on RasPi ( http://www.proxmark.org/forum/viewtopic.php?id=4678 )
2017-03-23 06:45:42 +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
pwpiwi
dc0bd4169f
Merge pull request #240 from marshmellow42/master
...
split io demod/pyramid demod to respective files
2017-03-22 22:27:02 +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
Iceman
bcec0edb97
Merge pull request #239 from marshmellow42/master
...
split hid demod/awid demod to respective files
2017-03-22 21:02:52 +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
Iceman
2f337fe8a3
Merge pull request #237 from marshmellow42/master
...
move em410x demods to cmdlfem4x.c from cmddata.c
2017-03-22 15:51:00 +01: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
marshmellow42
bad2eb8587
Merge remote-tracking branch 'upstream/master'
2017-03-21 10:40:29 -04: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
c9ad641b61
Merge remote-tracking branch 'upstream/master'
2017-03-14 14:48:31 -04:00
marshmellow42
713045f819
add bitswap option for lf em 4x05write
...
default read mode of this chip outputs in reverse order... so offer the
option to program in reverse order
2017-03-14 14:42:01 -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
