github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-16 02:03:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
1567 commits 3 branches 11 tags 34 MiB
Commit graph

1567 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Iceman
910ad5470d Merge pull request #202 from marshmellow42/master 
add hitag2 uid read and fixes for iclass write
 2016-12-19 16:09:58 +01: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
Iceman
d1057e7a21 Merge pull request #119 from marshmellow42/pm3+reveng 
add reveng 1.30 source to PM3 for CRC calculations & searches
 2016-10-08 19:18:14 +02: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
Iceman
fcfd0cbc4e 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.
 2016-09-25 08:46:59 +02:00
menshiyun
5bac3d9b3c fix client/Makefile 2016-09-25 14:32:06 +08:00
menshiyun
94e27a0961 fix client/Makefile 2016-09-25 14:26:11 +08:00
menshiyun
775c4c4a28 test-pr 2016-09-24 12:56:08 +08:00
Iceman
99911e5c7b Merge pull request #196 from k02a/patch-5 
Code cleanup,
 2016-09-23 13:04:07 +02:00
Johnny Bengtsson
ad8a18e66e Code cleanup 
Some variable type changes.
 2016-09-14 13:27:24 +02:00
Iceman
41f08b7c08 Merge pull request #195 from k02a/patch-4 
Warning removal fix
 2016-09-13 14:25:02 +02:00
Johnny Bengtsson
015520dc4e 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);
 2016-09-13 12:21:46 +02:00
Iceman
69f30e3209 Update README.txt 
Added some new stores
 2016-09-12 23:34:42 +02:00
Iceman
04dc10fc43 Merge pull request #193 from k02a/patch-2 
Better Linux compilation compability
 2016-09-12 18:06:24 +02:00
Iceman
b2030b2216 Merge pull request #192 from k02a/patch-1 
Patching Lua compilation error
 2016-09-12 18:04:14 +02:00
Johnny Bengtsson
887f6ab4b3 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"
 2016-09-12 16:03:46 +02:00
Johnny Bengtsson
147a3169fd Better Linux compilation compability 2016-09-12 15:55:44 +02:00
marshmellow42
fc249a8e13 Merge pull request #7 from marshmellow42/hitag2_tests 
attempt hitag2 uid read for lf search
 2016-08-25 13:41:11 -04:00
Iceman
51b42675bf Merge pull request #184 from koalazak/patch-1 
Add details to compile using brew in Mac OS X
 2016-08-12 13:55:39 +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
ef3f88bca9 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
 2016-07-28 12:52:18 -04:00
Facu ZAK
ed1525805c Add details to compile using brew in Mac OS X 2016-07-19 21:17:38 -03: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
bbd118760b allow mf1k reader attack from file full of UIDs 
also add UID to stats.txt collection.
 2016-06-24 23:43: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
7314995a5a hf mf sim x reader attack add-ons 
forgot to include the mfkey32 attack
 2016-06-22 11:26:11 -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
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
8f2268397d fix bug in viking clone/sim 
from @iceman1001
 2016-06-20 00:28:26 -04:00
marshmellow42
de53156e1e Fix the AskEdgeDetect cleaning tool 
somehow it got broken.
(maybe i had an incomplete pull request once upon a time)
 2016-06-19 23:44:54 -04:00
pwpiwi
83f11ccf72 Merge pull request #181 from raburton/tune 
add l/h option to hw tune and optimize order of tuning
 2016-06-08 16:20:11 +02: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
Martin Holst Swende
6fcb5dda51 Merge pull request #175 from hiviah/master 
Fix hitagS sources to compile on gcc 4.9.3
 2016-05-20 13:24:40 +02:00
Martin Holst Swende
cd2872f2cc Merge pull request #178 from dnet/cmdlf-unused-strlen 
removed unused variable
 2016-05-20 13:17:31 +02:00
András Veres-Szentkirályi
f9ce1c3a00 removed unused variable 2016-05-10 10:33:30 +02:00
Ondrej Mikle
39d56ec88b Fix hitagS sources to compile on gcc 4.9.3 2016-04-23 10:01:19 +02:00
Martin Holst Swende
b324b02f88 Merge pull request #167 from spenneb/master 
Experimental HitagS support
 2016-04-05 21:12:24 +02:00
Ralf Spenneberg
5cfd18ac1e Changelog modified 2016-04-05 08:52:53 +02:00