Iceman
1ee7925609
Merge pull request #249 from pwpiwi/parity
...
Refactor parity functions
2017-03-26 08:28:43 +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
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
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
pwpiwi
b8e461ff61
Remove local armsrc/stdint.h and fix some other #includes
2017-03-06 19:22:35 +01:00
marshmellow42
62a38cc883
adjust em4x05/em4x69 command timings to...
...
better conform to datasheet.
2017-02-28 13:18:52 -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
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
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
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
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
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
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
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
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
marshmellow42
671ff89fcb
fix iclass write
...
thanks to prof_abrasive && go_tus
2016-11-29 14:59:14 -05:00
ikarus
2943527472
Fixed all "misleading-indentation" warnings ( fixes #187 ).
2016-09-26 21:15:49 +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
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
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
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
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
Ondrej Mikle
39d56ec88b
Fix hitagS sources to compile on gcc 4.9.3
2016-04-23 10:01:19 +02:00
marshmellow42
cf194819cc
simplify some code, add comments
...
ABS simplification from Iceman1001
2016-03-19 00:09:58 -04: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
Ralf Spenneberg
4e12287d19
Experimental HitagS support
2016-03-04 17:28:05 +01:00
marshmellow42
39611e3d68
fix ask/Biphase sim bug
2016-02-29 18:05:47 -05:00
marshmellow42
72c5877a74
some minor lf fixes from @iceman1001
2016-02-21 17:05:53 -05:00
marshmellow42
29b757391a
remove errant 'void'
...
have to watch my copy and paste...
2016-02-20 10:22:45 -05:00
marshmellow42
3cec706139
move the clear buffer outside of potentially time..
...
... sensitive routines
see http://www.proxmark.org/forum/viewtopic.php?id=2820
2016-02-20 10:07:44 -05:00
Martin Holst Swende
b31ef4f510
Merge pull request #162 from marshmellow42/CoverityFixes
...
Coverity fixes - mainly from @iceman1001 s fork
2016-02-15 18:43:25 +01:00
Martin Holst Swende
b5cefff12c
Merge pull request #160 from marshmellow42/master
...
lf viking and standalone bug fixes
2016-02-15 18:39:42 +01:00
marshmellow42
e7707cdb17
verify wait isn't null
2016-02-14 17:41:16 -05:00
William Robinet
b8140ab108
Fix typos
2016-02-11 23:03:15 +01:00
marshmellow42
098015eb75
fix bug in lf standalone mode
...
clone command mixed up parameters.
2016-02-10 10:03:28 -05:00
marshmellow42
c4c3af7c16
some @iceman1001 s coverty scan fixes
...
great work!
2016-01-08 18:26:56 -05:00
Martin Holst Swende
2c7928874b
Merge pull request #149 from marshmellow42/T55xx_tests
...
Add lf viking, lf demod/clock detection improvements
2015-12-10 10:44:44 +01:00