]>
git.zerfleddert.de Git - proxmark3-svn/log
marshmellow42 [Mon, 20 Feb 2017 14:50:00 +0000 (09:50 -0500)]
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...
marshmellow42 [Mon, 20 Feb 2017 02:31:46 +0000 (21:31 -0500)]
fix dump output
marshmellow42 [Mon, 20 Feb 2017 01:47:45 +0000 (20:47 -0500)]
a little cleanup
marshmellow42 [Fri, 17 Feb 2017 19:48:19 +0000 (14:48 -0500)]
@iceman1001 s idea to output failure report
marshmellow42 [Fri, 17 Feb 2017 19:40:40 +0000 (14:40 -0500)]
add psk to em4x05 reads and tweak psk demod
marshmellow42 [Fri, 17 Feb 2017 17:59:35 +0000 (12:59 -0500)]
minor fixes for FSK demod
works better with EM4x03 and t55x7 tags (in theory)...
marshmellow42 [Fri, 17 Feb 2017 06:33:27 +0000 (01:33 -0500)]
em4x05 getting better
got the read/dump cmds working pretty well
some tweaking still left to do.
marshmellow42 [Thu, 16 Feb 2017 18:57:14 +0000 (13:57 -0500)]
a couple em4x05 fixes.
marshmellow42 [Thu, 16 Feb 2017 04:27:15 +0000 (23:27 -0500)]
EM4x05/EM4x69 continued + a couple of icemans utils.
marshmellow42 [Wed, 15 Feb 2017 04:42:55 +0000 (23:42 -0500)]
couple q5 fixes + continue with em4x05 em4x69..
.. readword demods
(not tested) still a work in progress
marshmellow42 [Mon, 13 Feb 2017 04:59:44 +0000 (23:59 -0500)]
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
marshmellow42 [Sat, 4 Feb 2017 21:10:26 +0000 (16:10 -0500)]
update changelog
marshmellow42 [Fri, 3 Feb 2017 05:14:34 +0000 (00:14 -0500)]
Add @Iceman1001 s cotag read
also needed to include some of icemans timer additions.
marshmellow42 [Wed, 1 Feb 2017 20:39:10 +0000 (15:39 -0500)]
add check for no wave in graphbuffer prior to...
hitag lf search check
marshmellow42 [Tue, 31 Jan 2017 04:20:55 +0000 (23:20 -0500)]
Merge remote-tracking branch 'upstream/master'
marshmellow42 [Tue, 31 Jan 2017 04:13:22 +0000 (23:13 -0500)]
flag needed for some compile environments
used for 'z' and 'l' in printf commands.
pwpiwi [Sat, 28 Jan 2017 16:11:13 +0000 (17:11 +0100)]
Merge pull request #209 from micolous/14a-random-nonce
Adds random nonce (r) option to `hf mf sim`.
Michael Farrell [Thu, 26 Jan 2017 09:27:08 +0000 (20:27 +1100)]
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.
pwpiwi [Thu, 26 Jan 2017 08:10:38 +0000 (09:10 +0100)]
Merge pull request #208 from marshmellow42/master
bug fixes - LF rawdemod am and ST
Michael Farrell [Thu, 26 Jan 2017 07:16:10 +0000 (18:16 +1100)]
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.
marshmellow42 [Fri, 20 Jan 2017 05:55:40 +0000 (00:55 -0500)]
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
Iceman [Mon, 19 Dec 2016 15:09:58 +0000 (16:09 +0100)]
Merge pull request #202 from marshmellow42/master
add hitag2 uid read and fixes for iclass write
marshmellow42 [Mon, 19 Dec 2016 14:45:23 +0000 (09:45 -0500)]
fixed lf antenna left on bug && some iclass ...
output cleanup by @iceman1001
marshmellow42 [Fri, 16 Dec 2016 19:04:39 +0000 (14:04 -0500)]
a few bug fixes with adding hitag detection to...
`lf search`
marshmellow42 [Tue, 29 Nov 2016 20:09:27 +0000 (15:09 -0500)]
Merge remote-tracking branch 'upstream/master'
marshmellow42 [Tue, 29 Nov 2016 19:59:14 +0000 (14:59 -0500)]
fix iclass write
thanks to prof_abrasive && go_tus
Iceman [Sat, 8 Oct 2016 17:18:14 +0000 (19:18 +0200)]
Merge pull request #119 from marshmellow42/pm3+reveng
add reveng 1.30 source to PM3 for CRC calculations & searches
ikarus [Mon, 26 Sep 2016 19:15:49 +0000 (21:15 +0200)]
Fixed all "misleading-indentation" warnings (fixes #187).
ikarus [Mon, 26 Sep 2016 18:39:31 +0000 (20:39 +0200)]
Revert "Do not treat gcc's "misleading-indentation" warning as error."
This reverts commit
fd4f21b766a715303f0b1436c9970f5965e644dc .
ikarus [Mon, 26 Sep 2016 17:21:01 +0000 (19:21 +0200)]
Do not treat gcc's "misleading-indentation" warning as error (fixes #187).
Iceman [Sun, 25 Sep 2016 06:46:59 +0000 (08:46 +0200)]
Merge pull request #197 from menshiyun/test-pr
minor fix in client/makefile
extra option to LDLIBS is not needed for mingw env as of now. Might be in the future.
menshiyun [Sun, 25 Sep 2016 06:32:06 +0000 (14:32 +0800)]
fix client/Makefile
menshiyun [Sun, 25 Sep 2016 06:26:11 +0000 (14:26 +0800)]
fix client/Makefile
menshiyun [Sat, 24 Sep 2016 04:56:08 +0000 (12:56 +0800)]
test-pr
Iceman [Fri, 23 Sep 2016 11:04:07 +0000 (13:04 +0200)]
Merge pull request #196 from k02a/patch-5
Code cleanup,
Johnny Bengtsson [Wed, 14 Sep 2016 11:27:24 +0000 (13:27 +0200)]
Code cleanup
Some variable type changes.
Iceman [Tue, 13 Sep 2016 12:25:02 +0000 (14:25 +0200)]
Merge pull request #195 from k02a/patch-4
Warning removal fix
Johnny Bengtsson [Tue, 13 Sep 2016 10:21:46 +0000 (12:21 +0200)]
Warning removal fix
Minor fix of data type corrections.
gcc -std=c99 -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall -g -O4 -DHAVE_GUI -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED -c -o obj/fpga_compress.o fpga_compress.c
fpga_compress.c: I funktion "zlib_compress":
fpga_compress.c:90:20: varning: format "%lu" förväntar sig argument av typen "long unsigned int", men argument 3 har typen "int" [-Wformat=]
fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.\n", num_infiles*FPGA_CONF
^
fpga_compress.c:142:18: varning: format "%lu" förväntar sig argument av typen "long unsigned int", men argument 3 har typen "uint32_t {även unsigned int}" [-Wformat=]
fprintf(stderr, "compressed %lu input bytes to %lu output bytes\n", i, compressed_fpga_stream.total_out);
Iceman [Mon, 12 Sep 2016 21:34:42 +0000 (23:34 +0200)]
Update README.txt
Added some new stores
Iceman [Mon, 12 Sep 2016 16:06:24 +0000 (18:06 +0200)]
Merge pull request #193 from k02a/patch-2
Better Linux compilation compability
Iceman [Mon, 12 Sep 2016 16:04:14 +0000 (18:04 +0200)]
Merge pull request #192 from k02a/patch-1
Patching Lua compilation error
Johnny Bengtsson [Mon, 12 Sep 2016 14:03:46 +0000 (16:03 +0200)]
Better Linux compilation compability
Addition of the termcap and ncurses libraries fixes the compilation issue on Slackware Linux 14.2.
/usr/lib64/gcc/x86_64-slackware-linux/5.4.0/../../../../lib64/libreadline.so: undefined reference to `PC'
collect2: fel: ld returnerade avslutningsstatus 1
Makefile:132: receptet för målet "proxmark3" misslyckades
make[1]: *** [proxmark3] Fel 1
make[1]: Lämnar katalogen "/home/github/proxmark3/proxmark3/client"
Makefile:12: receptet för målet "client/all" misslyckades
make: *** [client/all] Fel 2
make: Lämnar katalogen "/home/github/proxmark3/proxmark3"
Johnny Bengtsson [Mon, 12 Sep 2016 13:55:44 +0000 (15:55 +0200)]
Better Linux compilation compability
marshmellow42 [Thu, 25 Aug 2016 17:41:11 +0000 (13:41 -0400)]
Merge pull request #7 from marshmellow42/hitag2_tests
attempt hitag2 uid read for lf search
Iceman [Fri, 12 Aug 2016 11:55:39 +0000 (13:55 +0200)]
Merge pull request #184 from koalazak/patch-1
Add details to compile using brew in Mac OS X
Iceman [Fri, 12 Aug 2016 11:55:09 +0000 (13:55 +0200)]
Merge pull request #185 from marshmellow42/master
some lf fixes and hf mf sim attack mode add-ons
marshmellow42 [Thu, 4 Aug 2016 17:51:37 +0000 (13:51 -0400)]
attempt hitag2 uid read for lf search
marshmellow42 [Thu, 28 Jul 2016 16:52:18 +0000 (12:52 -0400)]
disable extra attack - disable stats.txt
Moebius attack didn't yield any better results in my testing so
disabling it, but allowing it to be re-enabled at will.
also disabled the auto logging of all keys with uid delimited file
stats.txt - can be uncommented when needed
Facu ZAK [Wed, 20 Jul 2016 00:17:38 +0000 (21:17 -0300)]
Add details to compile using brew in Mac OS X
marshmellow42 [Wed, 29 Jun 2016 01:02:26 +0000 (21:02 -0400)]
couple bug fixes - clean up
marshmellow42 [Mon, 27 Jun 2016 04:09:40 +0000 (00:09 -0400)]
hf mf sim code cleanup - update changelog
marshmellow42 [Sat, 25 Jun 2016 04:53:53 +0000 (00:53 -0400)]
mf 1k sim reader attack cleanup
add abort options - keyboard & button press.
marshmellow42 [Sat, 25 Jun 2016 03:43:53 +0000 (23:43 -0400)]
allow mf1k reader attack from file full of UIDs
also add UID to stats.txt collection.
marshmellow42 [Fri, 24 Jun 2016 20:46:11 +0000 (16:46 -0400)]
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.
marshmellow42 [Fri, 24 Jun 2016 05:31:27 +0000 (01:31 -0400)]
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.
marshmellow42 [Wed, 22 Jun 2016 15:26:11 +0000 (11:26 -0400)]
hf mf sim x reader attack add-ons
forgot to include the mfkey32 attack
marshmellow42 [Wed, 22 Jun 2016 15:03:37 +0000 (11:03 -0400)]
improve hf mf sim x reader attack
can now directly extract multiple keys for multiple sectors
marshmellow42 [Mon, 20 Jun 2016 04:42:03 +0000 (00:42 -0400)]
fix askAmp
again... must have been something i missed before. this function wasn't
complete.
marshmellow42 [Mon, 20 Jun 2016 04:28:26 +0000 (00:28 -0400)]
fix bug in viking clone/sim
from @iceman1001
marshmellow42 [Mon, 20 Jun 2016 03:44:54 +0000 (23:44 -0400)]
Fix the AskEdgeDetect cleaning tool
somehow it got broken.
(maybe i had an incomplete pull request once upon a time)
pwpiwi [Wed, 8 Jun 2016 14:20:11 +0000 (16:20 +0200)]
Merge pull request #181 from raburton/tune
add l/h option to hw tune and optimize order of tuning
marshmellow42 [Mon, 6 Jun 2016 02:20:36 +0000 (22:20 -0400)]
Merge remote-tracking branch 'upstream/master'
Richard Antony Burton [Mon, 30 May 2016 17:30:38 +0000 (18:30 +0100)]
add l/h option to hw tune and optimize order of tuning
Martin Holst Swende [Fri, 20 May 2016 11:24:40 +0000 (13:24 +0200)]
Merge pull request #175 from hiviah/master
Fix hitagS sources to compile on gcc 4.9.3
Martin Holst Swende [Fri, 20 May 2016 11:17:31 +0000 (13:17 +0200)]
Merge pull request #178 from dnet/cmdlf-unused-strlen
removed unused variable
András Veres-Szentkirályi [Tue, 10 May 2016 08:33:30 +0000 (10:33 +0200)]
removed unused variable
Ondrej Mikle [Sat, 23 Apr 2016 08:01:19 +0000 (10:01 +0200)]
Fix hitagS sources to compile on gcc 4.9.3
Martin Holst Swende [Tue, 5 Apr 2016 19:12:24 +0000 (21:12 +0200)]
Merge pull request #167 from spenneb/master
Experimental HitagS support
Ralf Spenneberg [Tue, 5 Apr 2016 06:52:53 +0000 (08:52 +0200)]
Changelog modified
Martin Holst Swende [Sun, 3 Apr 2016 19:55:54 +0000 (21:55 +0200)]
Merge pull request #168 from zhovner/master
mfkey64: Added optional decryption of communication using keystream
marshmellow42 [Sat, 19 Mar 2016 04:09:58 +0000 (00:09 -0400)]
simplify some code, add comments
ABS simplification from Iceman1001
Pavel Zhovner [Wed, 9 Mar 2016 00:52:54 +0000 (03:52 +0300)]
remove binary files
Pavel Zhovner [Wed, 9 Mar 2016 00:32:39 +0000 (03:32 +0300)]
Optional decryption of communication using keystream
Pavel Zhovner [Tue, 8 Mar 2016 23:41:20 +0000 (02:41 +0300)]
Optional decryption of communication using keystream
marshmellow42 [Mon, 7 Mar 2016 06:01:40 +0000 (01:01 -0500)]
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
marshmellow42 [Sun, 6 Mar 2016 04:46:34 +0000 (23:46 -0500)]
fix comment typo error
marshmellow42 [Sun, 6 Mar 2016 04:45:28 +0000 (23:45 -0500)]
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.
Ralf Spenneberg [Fri, 4 Mar 2016 16:28:05 +0000 (17:28 +0100)]
Experimental HitagS support
marshmellow42 [Mon, 29 Feb 2016 23:17:51 +0000 (18:17 -0500)]
fix uint8 vs uint32 and use sprint_hex
thanks @iceman1001 for the suggestion.
marshmellow42 [Mon, 29 Feb 2016 23:05:47 +0000 (18:05 -0500)]
fix ask/Biphase sim bug
marshmellow42 [Mon, 29 Feb 2016 22:05:02 +0000 (17:05 -0500)]
refactor gProxII demod... add 0 spacer to ...
... parity functions (remove, add)
make MAX_GRAPH_TRACE_LEN match with client side
marshmellow42 [Sun, 21 Feb 2016 22:05:53 +0000 (17:05 -0500)]
some minor lf fixes from @iceman1001
Martin Holst Swende [Sun, 21 Feb 2016 16:41:58 +0000 (17:41 +0100)]
Merge pull request #166 from marshmellow42/master
Add LF ASK ST detect and demodulate...
marshmellow42 [Sat, 20 Feb 2016 21:53:59 +0000 (16:53 -0500)]
fix clock detection when ST used
ST = sequence terminator
fixes t55xx auto detection of tags with ST used.
marshmellow42 [Sat, 20 Feb 2016 15:22:45 +0000 (10:22 -0500)]
remove errant 'void'
have to watch my copy and paste...
marshmellow42 [Sat, 20 Feb 2016 15:10:10 +0000 (10:10 -0500)]
Merge remote-tracking branch 'upstream/master'
marshmellow42 [Sat, 20 Feb 2016 15:07:44 +0000 (10:07 -0500)]
move the clear buffer outside of potentially time..
... sensitive routines
see http://www.proxmark.org/forum/viewtopic.php?id=2820
marshmellow42 [Fri, 19 Feb 2016 20:54:32 +0000 (15:54 -0500)]
fix detection of lf t55x7 if xtd bits set but...
...not used
marshmellow42 [Fri, 19 Feb 2016 20:11:44 +0000 (15:11 -0500)]
fix wrong type in print bug
marshmellow42 [Fri, 19 Feb 2016 20:09:51 +0000 (15:09 -0500)]
finish LF ASK Sequence Terminator detection
Martin Holst Swende [Wed, 17 Feb 2016 15:15:39 +0000 (16:15 +0100)]
Merge pull request #165 from wllm-rbnt/master
Typos
William Robinet [Wed, 17 Feb 2016 14:44:18 +0000 (15:44 +0100)]
Typos
marshmellow42 [Wed, 17 Feb 2016 02:10:48 +0000 (21:10 -0500)]
update changelog
marshmellow42 [Tue, 16 Feb 2016 17:49:30 +0000 (12:49 -0500)]
Add LF ASK Sequence Terminator detection...
...and demodulate data beginning after the first ST
also add some type casts in print calls.
Martin Holst Swende [Tue, 16 Feb 2016 14:39:52 +0000 (15:39 +0100)]
Merge pull request #164 from marshmellow42/master
fix issue #163, prevent two calls to getFromGraphBuf - fix char array pointer...
marshmellow42 [Tue, 16 Feb 2016 14:38:37 +0000 (09:38 -0500)]
use memcpy instead of re-assign pointer
marshmellow42 [Tue, 16 Feb 2016 03:36:51 +0000 (22:36 -0500)]
clear char array with each call
marshmellow42 [Tue, 16 Feb 2016 03:31:21 +0000 (22:31 -0500)]
fix char* pointer not assigned
fix
marshmellow42 [Tue, 16 Feb 2016 02:39:34 +0000 (21:39 -0500)]
use different fsk field clock detection routine ...
... to prevent double call to getFromGraphBuf()...
also adjust %hu to u and as there is a possible problem with %hu in
printf.
marshmellow42 [Mon, 15 Feb 2016 19:13:49 +0000 (14:13 -0500)]
Merge remote-tracking branch 'upstream/master' into pm3+reveng