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 |
|
|
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 |
|
|
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 |
|