marshmellow42
f2ea55fb3c
fix/update removeParity & fix securakey detection
2017-03-29 10:02:29 -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
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
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
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
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
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
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
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
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
b1ee7eed65
fix em410x XL bug
...
and make it rule out more false positives.
2017-02-28 13:32:23 -05:00
marshmellow42
dda5a928f0
fix STT bug for strong waves (or cleaned ones)
2017-02-28 11:53:55 -05:00
marshmellow42
fac69c3d76
Adjust global variable name
2017-02-27 23:03:55 -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
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
4c6ccc2b04
a little cleanup
2017-02-19 20:47:45 -05:00
marshmellow42
6980d66b05
add psk to em4x05 reads and tweak psk demod
2017-02-17 14:40:40 -05:00
marshmellow42
c85858f524
minor fixes for FSK demod
...
works better with EM4x03 and t55x7 tags (in theory)...
2017-02-17 12:59:35 -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
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
ikarus
2943527472
Fixed all "misleading-indentation" warnings ( fixes #187 ).
2016-09-26 21:15:49 +02:00
ikarus
9b3c48688e
Revert "Do not treat gcc's "misleading-indentation" warning as error."
...
This reverts commit fd4f21b766
.
2016-09-26 20:39:31 +02:00
ikarus
fd4f21b766
Do not treat gcc's "misleading-indentation" warning as error ( fixes #187 ).
2016-09-26 19:21:01 +02: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
16ea2b8ca3
fix askAmp
...
again... must have been something i missed before. this function wasn't
complete.
2016-06-20 00:42:03 -04:00
marshmellow42
cf194819cc
simplify some code, add comments
...
ABS simplification from Iceman1001
2016-03-19 00:09:58 -04: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
marshmellow42
88e85bde41
refactor gProxII demod... add 0 spacer to ...
...
... parity functions (remove, add)
make MAX_GRAPH_TRACE_LEN match with client side
2016-02-29 17:05:02 -05:00
marshmellow42
01d7272d5b
Merge remote-tracking branch 'upstream/master'
2016-02-20 10:10:10 -05:00
marshmellow42
b96bcc795b
finish LF ASK Sequence Terminator detection
2016-02-19 15:09:51 -05:00
William Robinet
63744b5681
Typos
2016-02-17 15:44:18 +01:00