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
b642ce7ab5
Merge pull request #264 from qweenwasabi/master
...
Update README.txt
2017-03-30 23:12:22 -04:00
marshmellow42
fa2aab705b
Fix data mtrim ( #262 )
...
I don't even know what happened there...
2017-03-30 22:23:02 +02:00
Jacky
425b6c0eb0
Update README.txt
2017-03-30 12:51:49 -07: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
Iceman
f25c62c5ec
Merge pull request #256 from pwpiwi/fast_select
...
add: iceman1001's idea to reuse @pwpiwi's fast select without anticol…
2017-03-29 17:36:37 +02:00
Iceman
06da1c3f4b
Merge pull request #259 from marshmellow42/master
...
fix/update removeParity & fix securakey detection
2017-03-29 17:12:55 +02:00
marshmellow42
f2ea55fb3c
fix/update removeParity & fix securakey detection
2017-03-29 10:02:29 -04:00
Iceman
2938b3cb12
Merge pull request #258 from marshmellow42/master
...
Add lf jablotron & lf noralsy tag definitions/cmds
2017-03-29 07:39:40 +02: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
Iceman
160dba8697
Merge pull request #257 from marshmellow42/master
...
split lf paradox/nexwatch into own files
2017-03-28 16:04:27 +02: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
pwpiwi
de77d4acde
add: iceman1001's idea to reuse @pwpiwi's fast select without anticollision to speedup hf mf chk
...
(see http://www.proxmark.org/forum/viewtopic.php?id=2920 )
2017-03-27 10:29:44 +02:00
Iceman
9331855865
Merge pull request #254 from marshmellow42/master
...
fix indentation warning
2017-03-26 23:39:37 +02: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
7cd25ae5a3
Merge pull request #250 from pwpiwi/fix_mfkey
...
fix mfkey tools (issue #247 )
2017-03-26 13:05:26 +02:00
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
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
a7e0d39ce3
Merge pull request #246 from marshmellow42/master
...
hitag sim fix
mea culpa.
2017-03-25 13:12:05 +01:00
marshmellow42
28598e80c0
hitag sim fix
...
from
e1778858dd
and http://www.proxmark.org/forum/viewtopic.php?pid=26733#p26733
sim mode should not have the reader field on.
2017-03-25 07:49:53 -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
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