Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-09-21 23:36:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
1837 commits 3 branches 11 tags 34 MiB
Commit graph

1108 commits

Author SHA1 Message Date
marshmellow42 893534d3b5 speed up the em4x05 cmds by only getting 6k... 
samples back
 2017-02-20 15:06:22 -05:00
James Chambers 4b12061bee fix recvLen variable name in hf_reader 2017-02-20 14:31:21 -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 34212c662c fix dump output 2017-02-19 21:31:46 -05:00
marshmellow42 4c6ccc2b04 a little cleanup 2017-02-19 20:47:45 -05:00
marshmellow42 61500621bc @iceman1001 s idea to output failure report 2017-02-17 14:48:19 -05:00
marshmellow42 6980d66b05 add psk to em4x05 reads and tweak psk demod 2017-02-17 14:40:40 -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 6f1a597855 couple q5 fixes + continue with em4x05 em4x69.. 
.. readword demods
(not tested)  still a work in progress
 2017-02-14 23:42:55 -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
marshmellow42 38cb7c71c5 add check for no wave in graphbuffer prior to... 
hitag lf search check
 2017-02-01 15:39:10 -05:00
marshmellow42 11117f6ab5 Merge remote-tracking branch 'upstream/master' 2017-01-30 23:20:55 -05:00
marshmellow42 103c60ec7e flag needed for some compile environments 
used for 'z' and 'l' in printf commands.
 2017-01-30 23:13:22 -05:00
pwpiwi 1888664863 Merge pull request #209 from micolous/14a-random-nonce 
Adds random nonce (r) option to `hf mf sim`.
 2017-01-28 17:11:13 +01: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 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
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
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
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
Johnny Bengtsson ad8a18e66e Code cleanup 
Some variable type changes.
 2016-09-14 13:27:24 +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
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
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
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 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
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
András Veres-Szentkirályi f9ce1c3a00 removed unused variable 2016-05-10 10:33:30 +02: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
marshmellow42 e3c992a92f fix comment typo error 2016-03-05 23:46:34 -05: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
Ralf Spenneberg 4e12287d19 Experimental HitagS support 2016-03-04 17:28:05 +01:00
marshmellow42 31e8a4f21b fix uint8 vs uint32 and use sprint_hex 
thanks @iceman1001 for the suggestion.
 2016-02-29 18:17:51 -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 72c5877a74 some minor lf fixes from @iceman1001 2016-02-21 17:05:53 -05:00
marshmellow42 b66ff08113 fix clock detection when ST used 
ST = sequence terminator
fixes t55xx auto detection of tags with ST used.
 2016-02-20 16:53:59 -05:00
marshmellow42 01d7272d5b Merge remote-tracking branch 'upstream/master' 2016-02-20 10:10:10 -05:00
marshmellow42 35cfcfc7a1 fix detection of lf t55x7 if xtd bits set but... 
...not used
 2016-02-19 15:54:32 -05:00
marshmellow42 8e90cd4174 fix wrong type in print bug 2016-02-19 15:11:44 -05:00
William Robinet 63744b5681 Typos 2016-02-17 15:44:18 +01:00
marshmellow42 d1869c3336 Add LF ASK Sequence Terminator detection... 
...and demodulate data beginning after the first ST
also add some type casts in print calls.
 2016-02-16 12:49:30 -05:00
marshmellow42 38b3509542 use memcpy instead of re-assign pointer 2016-02-16 09:38:37 -05:00
marshmellow42 9e4cee22b7 clear char array with each call 2016-02-15 22:36:51 -05:00
marshmellow42 0c50084a2b fix char* pointer not assigned 
fix
 2016-02-15 22:31:21 -05:00
marshmellow42 a0cc89b479 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.
 2016-02-15 21:39:34 -05:00
marshmellow42 7f0d592636 Merge remote-tracking branch 'upstream/master' into pm3+reveng 2016-02-15 14:13:49 -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 7c5e0ebe7a undo adjustments to cmdhf14a.c and cmdhfmf.c 
as these will be adjusted with the magic command adjustments
 2016-02-14 18:37:09 -05:00
marshmellow42 d0168f2f49 clear array before assigning 2016-02-14 18:08:14 -05:00
marshmellow42 776f7e6160 put back viking clone bug fix 
forgot i added this on a different computer recently - forgot to merge
it in...
 2016-02-14 17:00:20 -05:00
marshmellow42 38d618baa9 remove redundant llx prix64 defines 
remove unused commented out #includes
coverity indicates compressed_fpga_stream.opaque needs to be initialized
to Z_NULL
fgetc returns int
define llu
 2016-02-14 14:43:19 -05:00
marshmellow42 d23411ef61 resource leak and malloc(x) cannot be negative 
thanks iceman1001
 2016-02-14 13:41:25 -05:00
marshmellow42 735136e6a3 lf t55 bruteforce lots of resource leaks... 
plus strlen(Cmd) can never be less than 0
iceman1001 fixes...
 2016-02-14 13:37:05 -05:00
marshmellow42 8ea5706047 additional memory leaks, overflow and unchecked ... 
return values fixed

thanks to iceman1001
 2016-02-14 13:24:03 -05:00
marshmellow42 568377946c FIX: Coverity, Out-of-bounds. In the loop, variable i, can... 
...be as much as 1051, overflowing the databuf with size 1024.
 2016-02-14 12:36:55 -05:00
marshmellow42 165e0775b1 fix possible null if no file found 
also initialize filename variable so not null

found by iceman1001
 2016-02-14 12:33:07 -05:00
marshmellow42 b0c68b72d3 fix keyNbr entry error checking 
coverity scan by iceman1001 found.
 2016-02-14 12:26:03 -05:00
marshmellow42 eb5b63b4a6 FIX, Coverity, Argument can't be negative. CID# 212322, ftell(f) can … 
…be negative. Not allowed in malloc...
from iceman1001
 2016-02-14 12:13:22 -05:00
marshmellow42 7a616c0d70 FIX, Coverity, Argument can't be negative. CID# 212322, ftell(f) can … 
…be negative. Not allowed in malloc...
from @iceman1001
 2016-02-14 12:06:29 -05:00
marshmellow42 3d4982ddbf FIX: Coverity, unintended sign extention, CID #121363, (numbits << 16… 
…) becomes int, then uint64_t. But the signness might set all upper bits
to 1 in the process.
from @iceman1001 .
 2016-02-14 11:42:34 -05:00
marshmellow42 fd9172d5c2 @iceman1001 s coverity fixes 
resource leak in hf mf sniff
possible overflow in hf 14a raw - add check to fix
 2016-02-14 11:26:00 -05:00
marshmellow42 33c795d0bd add check to fread call 2016-02-14 11:07:16 -05:00
William Robinet b8140ab108 Fix typos 2016-02-11 23:03:15 +01:00
marshmellow42 0c1cb4aef0 fix lf viking clone mask bug 
should be a 32 bit mask not a 16 bit mask
also added client feedback.
 2016-02-09 13:40:01 -05:00
marshmellow42 9fc602c835 fix print clock as decimal instead of uint8_t 2016-01-28 00:27:53 -05:00
marshmellow42 c4c3af7c16 some @iceman1001 s coverty scan fixes 
great work!
 2016-01-08 18:26:56 -05:00
marshmellow42 3975d477e1 comment out unused includes and defines 
prep for permanent removal.
 2016-01-07 21:54:32 -05:00
marshmellow42 5490c2d6d2 add broken_bad and @iceman1001 s q5 trace and ... 
wipe adjustments
 2016-01-05 21:21:06 -05:00
marshmellow42 254687260c Merge remote-tracking branch 'upstream/master' 2015-12-21 23:56:55 -05:00
Adam Laurie bc37cfb3eb add support for raw block 3/4 iclass keys 2015-12-19 16:37:32 +00:00
marshmellow42 af5384bc90 additional Q5 lf t55xx fixes 2015-12-14 17:36:08 -05:00
marshmellow42 6ca1477c74 fix occasional strange printed clock value with... 
...fskdemod
Fix Q5 tag detection in lf t55xx detect
Fix param_get8 reversed parameters
 2015-12-14 16:51:11 -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
marshmellow42 534678c3e9 Fix incorrect memset parameters in lf t55xx wipe 
thanks @iceman1001 for the catch

add added a restore graphbuffer after lf t55xx psk demodulation
 2015-12-09 22:44:01 -05:00
marshmellow42 7bc6fac3ce fix sprint_bin bug i made :( 2015-12-09 20:40:12 -05:00
marshmellow42 ace26dbdfd Fix printdemodbuffer length tests + add length... 
parameter
increase askdemod MaxBits
fix util.c sprint_bin_break and increase buffer size (had memory
overflow possible before)
 2015-12-07 21:18:30 -05:00
marshmellow42 51923aca85 minor help text changes 2015-12-04 12:09:26 -05:00
marshmellow42 6e083f0412 include default password dictionary for lf t55xx... 
...bruteforce
 2015-12-03 16:44:06 -05:00
marshmellow42 506672c48b icemans lf fixes & adjustments + lf t55xx bruteforce 
Fix small fskdemod clock bug
 2015-12-02 17:27:12 -05:00
marshmellow42 fe876493f8 include cmdlfviking.c in makefile and cmdlf 
fix minor typos
 2015-11-26 21:05:46 -05:00
marshmellow42 ab5ffe3bef iceman's finished t55xx detect parameter adjustments 2015-11-26 20:30:58 -05:00
marshmellow42 d1cea2a4a0 fix const vs static... 2015-11-22 16:42:13 -05:00
marshmellow42 709665b5d1 lf viking build / lf awid refactor / lfdemod.c debugMode==2 
lf viking from other users - just put my spin on it
lf awid refactored code - possible to make it not 26bit specific now
with minor chanages
lfdemod.c now supports extra debug printing if `data setdebug` = 2 when
not on device (on client not arm)
 2015-11-22 00:00:32 -05:00
marshmellow42 6fe5c94bda lf demod cleanup nrz clock detect fixes 
slight adjustment to lf t55xx sampling code to start at the same spot
more consistently
reduce indala detection false positives
lf t55xx commands heavily tested and seem to be stable and reliable on
most modulations/bitrates (excluding Sequence Terminator configured
cards).
 2015-11-18 00:10:11 -05:00
marshmellow42 93507a3375 remove old comment 2015-11-16 18:55:46 -05:00
marshmellow42 db8296025f lf t55xx and some lf demod fixes/adjustments 
finally think I like the lf t55xx detect and read cmds.  pretty reliable
now.
 2015-11-16 18:49:20 -05:00
Martin Holst Swende 9983a92943 Merge pull request #143 from marshmellow42/master 
lfops cleanup, t55xx additions/fixes, PCF7931 input cleanup
 2015-11-15 13:22:26 +01:00
marshmellow42 f665067919 add some Q5 functionality - add t55xx wipe cmd 
not fully tested yet
 2015-11-12 00:27:24 -05:00
marshmellow42 14331320c4 Fix viking demod bug - clean my indala demod code 
NOTE lf indalademod is still available as it uses a different technique
to demodulating, which sometimes works better (and sometimes worse).
 2015-11-10 11:59:41 -05:00
marshmellow42 415274a7c3 Add Viking demod, 
fix compiler warning for int vs uint8_t for em410x sim clock variable
 2015-11-09 23:09:26 -05:00
András Veres-Szentkirályi 7cdf6236cb Fixed copypasted hex output to match input 
The value `x0` was obviously copypasted but not edited to reflect the real values used in `case` matching.
 2015-11-09 21:06:58 +01:00
marshmellow42 daa4fbaeec fix em410xsim help - add clock input to em410xsim 2015-11-07 21:02:30 -05:00
pwpiwi 2487dfeb07 fix: .history was never written 2015-11-06 11:34:43 +01:00
marshmellow42 8949e04584 Merge remote-tracking branch 'upstream/master' 2015-11-03 20:19:46 -05:00
marshmellow42 76346455d2 minor lf updates/cleanup 2015-11-03 20:18:16 -05:00
pwpiwi b2fe0e77c5 Merge branch 'topaz' 
Conflicts:
	CHANGELOG.md
	client/cmdhf.c
 2015-11-03 21:06:59 +01:00
etmatrix edc9ce00b3 - Little change to description in client 
- Added description to CHANGELOG.md
 2015-11-03 07:15:56 +01:00
marshmellow42 9f669cb26f minor cleanups 2015-10-31 23:12:42 -04:00
marshmellow42 66837a0302 Add lf t55xx resetread cmd + fix clone cmds 
resetread cmd to determine start of streaming bits of ata5577 or
compatible chips...
fixed lf clone bugs introduced while refactoring recently...
 2015-10-30 23:23:27 -04:00
pwpiwi d9cc4e1ae2 Merge branch 'master' into topaz. Update Changelog. 2015-10-27 20:57:16 +01:00
marshmellow42 0c8200f11c text cleanup t55xx cmds 2015-10-23 13:05:40 -04:00
etmatrix 0472d76de4 The great work of Enio hf snoop is now ported into latest version in git 
you can find original work here https://github.com/EnioArda/proxmark3
 2015-10-23 15:40:35 +02:00
marshmellow42 be2d41b73a updates to lf t55xx commands 
fix wakeup cmd per @iceman1001
fix dump and read cmds
clean up write command
allow page 1 read/write (block 3 is writable)(ata5577 only)
remove duplicate code
 2015-10-22 16:19:23 -04:00
marshmellow42 8e99ec25ed add wake option to t55xx read command 2015-10-17 15:01:26 -04:00
marshmellow42 21a615cb3b begin update lf commands with help text and 
cmd structure.
update changelog for recent changes
 2015-10-17 10:48:54 -04:00
marshmellow42 f1b74c3089 add lf t5 read w/pwd warning and checks 
ideas from @iceman1001 for issue #136
 2015-10-15 21:26:23 -04:00
marshmellow42 7cfc777b0e lf t55xx code cleanup + 
@iceman1001 s cleanup of some t55xx read code, plus some timing tests to
improve lf t5 detect/read...
small typo in pcf 16 address bytes instead of 4...
add option for verbose or not on bigbuf clear cmd.
 2015-10-15 14:53:49 -04:00
marshmellow42 59b5b7e14c PCF-fix bytepos range from 0-3 to 0-15 2015-10-15 01:31:52 -04:00
marshmellow42 f4eadf8a50 adjust lf t55xx read commands 
seems to make them a lot more accurate for me
 2015-10-15 01:09:49 -04:00
marshmellow42 d10e08ae6e Clean up pcf7931 
@iceman1001 s cleanup of pcf7931 commands on client side
and split out pcf7931 from lfops.c as it is getting large
 2015-10-14 16:17:56 -04:00
Martin Holst Swende be6250d31b Merge pull request #140 from marshmellow42/iclass 
iClass major updates
 2015-10-13 09:39:04 +02:00
pwpiwi 8c6b22980c hf mf mifare: (finally) fix watchdog reset 
- minor changes to sync
- try alternative strategies when debugging
 2015-10-10 15:04:17 +02:00
marshmellow42 c54dff4f4a Merge remote-tracking branch 'Proxmark/master' into iclass 
Conflicts:
	CHANGELOG.md
 2015-10-07 09:34:47 -04:00
marshmellow42 4ff341efff fix help typo 2015-10-07 09:32:50 -04:00
marshmellow42 1a5a73abae Add mifare crypto trace decryption utility 
allows manual decryption of hf 14a snoop traces of a mf card.
someday we should fix hf mf sniff...
 2015-10-07 00:24:55 -04:00
pwpiwi dfb387bf0f hf mf mifare: 
- gracefully exit on unsuccessful syncs instead of hard watchdog reset
 2015-09-30 20:59:50 +02:00
pwpiwi 7624e8b21b hf topaz reader implementation: 
- read and display dynamic memory as well
- display "locked" status per byte instead per block
 2015-09-28 08:26:00 +02:00
Dake 940d53098c corrective values 2015-08-26 15:57:41 +02:00
Dake dc4300bafb add : writing on PCF7931 tags 2015-08-26 15:53:49 +02:00
pwpiwi 8e21541e77 Merge branch 'master' into topaz 2015-08-25 07:53:00 +02:00
Martin Holst Swende 5d01f50ae1 Minor corrections 2015-07-31 23:30:48 +02:00
Martin Holst Swende f68211671c Implemented data hex2bin and data bin2hex as per suggestion in http://www.proxmark.org/forum/viewtopic.php?pid=17504 2015-07-31 23:28:32 +02:00
pwpiwi 67b7d6fa31 fix: avoid USB Speed Test timeout in case of slow transfer speeds 
fix: don't add CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K commands into command buffer
 2015-07-31 20:11:37 +02:00
pwpiwi bfb01844fb add: USB Speed Test to hw status 
fix: choose Real Time Clock divider based on actual slow clock frequency
 2015-07-29 18:52:43 +02:00
marshmellow42 e1c6e9e8f1 iclass Write doMAC_N - rename variables to correct descriptions. 2015-07-28 15:20:19 -04:00
marshmellow42 bbd19beced update books to app_areas. clearer. 2015-07-25 23:24:53 -04:00
marshmellow42 b82d809852 update iClass chip identification 2015-07-25 23:09:07 -04:00
marshmellow42 3ac22ee1cf use read instead of readcheck except to auth 2015-07-23 01:12:02 -04:00
Martin Holst Swende e2012d1bd3 Implemented 'hw status' and 'hw ping', put back client-side cacheing of 'hw version' 2015-07-21 23:18:51 +02:00
marshmellow42 4d68ec02b2 iclass refactor/cleanup 2015-07-21 14:26:46 -04:00
marshmellow42 6b659d2406 Merge remote-tracking branch 'upstream/master' into iclass 2015-07-20 21:26:35 -04:00
marshmellow42 a40680f3ac Merge remote-tracking branch 'upstream/master' 2015-07-20 17:29:52 -04:00
Martin Holst Swende 23931c11d5 Minor fix with previous cache-removal 2015-07-20 23:22:33 +02:00
Martin Holst Swende db2dc28d34 Reverted previous change to , I made it no longer cache previous results 2015-07-20 23:17:55 +02:00
marshmellow42 aa53efc340 iclass additions 
multiple contributors - thanks!
 2015-07-20 13:41:40 -04:00
Martin Holst Swende 40c5f34265 Clear command buffer 2015-07-17 21:49:27 +02:00
Martin Holst Swende 976627d5ba Fixed (?) issues from PR #129 2015-07-16 23:50:41 +02:00
Martin Holst Swende 37824afe63 Changed indentation to tabs 2015-07-16 22:47:14 +02:00
marshmellow42 d5810937bd Merge remote-tracking branch 'upstream/master' 
Conflicts:
	armsrc/iso14443b.c
 2015-07-15 22:25:11 -04:00
Craig Young bcffcca25f Adding usage information to 'lf awid' commands 2015-07-13 18:14:12 -04:00
Craig Young d6b455ed4e Adding 'lf awid' context to cmdlf.c 2015-07-13 16:47:11 -04:00
Craig Young c0c35f9bb6 Adding CMD_AWID_DEMOD_FSK to commands.lua 2015-07-13 16:18:59 -04:00
Craig Young dbf6e824f9 Adding support for AWID26 realtime demodulation as well as cloning and simulation from facility code and card number 2015-07-13 15:45:28 -04:00
Martin Holst Swende 40c514454d Fixed issue #94, so lua-script 'mifare_autopwn' reacts correctly to card that are not vulnerable to darkside-attacks 2015-07-12 23:38:52 +02:00
marshmellow42 b362de6262 initialize global variables. 2015-07-11 00:35:27 -04:00
pwpiwi 5330f5329f - fix: trace of hf mf mifare had always been cleared by mfCheckKeys() in nonce2key() 
- fix: parity was not checked for reader commands in hf list 14a
- add: enable tracing for hf mf nested
 2015-07-07 09:02:00 +02:00
marshmellow42 29b6cacc6f more verification on FDX-B tag demod - reduce... 
... false positives
 2015-07-05 23:35:00 -04:00
marshmellow42 7ce6e2c0b5 add -ss to hf 14b raw for select of SRx chips 2015-07-03 23:15:08 -04:00
marshmellow42 146600578c fix my understanding of REQB vs WUPB 2015-07-03 22:35:03 -04:00
marshmellow42 f3b83bee83 small fixes to 14b info, added 14b sim cmds 2015-07-02 15:04:09 -04:00
pwpiwi db2b81ba11 Merge branch 'master' into topaz 
Conflicts:
	client/Makefile
	client/cmdhf.c
	client/cmdhf14a.c
 2015-07-01 08:17:00 +02:00
pwpiwi 6e6f1099c8 hf topaz reader: add support for dynamic lock areas 2015-07-01 07:12:10 +02:00
marshmellow42 9d84e68964 fix 14b raw -s option, + get rid of... 
<empty trace - possible error>
 2015-06-30 09:46:37 -04:00
marshmellow42 463871be6e Merge remote-tracking branch 'upstream/master' 2015-06-29 22:30:18 -04:00
marshmellow42 1c7d367e24 update comments and changelog 2015-06-29 21:41:48 -04:00
marshmellow42 b8edab0f83 add -s to hf 14b raw to select a std 14b tag first 2015-06-29 21:33:10 -04:00
marshmellow42 c3ebcce424 fixed output bug in sri4k info output. 
too many parameters line 299
 2015-06-29 16:34:41 -04:00
marshmellow42 8e00825a34 fixed improper printBits usage. 2015-06-29 14:33:44 -04:00
pwpiwi a88c28271c Merge pull request #125 from pwpiwi/hf_mifare_fix 
(implementing suggestion #94)
 2015-06-29 07:50:52 +02:00
marshmellow42 bf7ebb7b20 Merge remote-tracking branch 'upstream/master' into pm3+reveng 
Conflicts:
	client/Makefile
 2015-06-29 00:06:59 -04:00
marshmellow42 cc34cc7b56 add SRx tag lock bit to hf 14b info 2015-06-28 23:47:30 -04:00
marshmellow42 8a258b5880 re-order 14b reader/info functions to avoid warnings 2015-06-27 23:10:00 -04:00
marshmellow42 3e553c0817 Merge remote-tracking branch 'upstream/master' 2015-06-27 22:54:55 -04:00
marshmellow42 b29d55f24b change lf config threshold, hf 14b reader, 
adjust lf config threshold to coincide with graph values and trigger on
highs over the threshold or lows under the threshold * -1

split general hf 14b reader from full info printing
 2015-06-27 22:49:26 -04:00
Martin Holst Swende 86ed606758 Merge pull request #122 from marshmellow42/master 
add hf 14b info command +
 2015-06-27 21:51:23 +02:00
pwpiwi dc8ba239fb (implementing suggestion #94) 
hf mf mifare: gracefully exit if tag isn't vulnerable to this attack
hf mf nested: dito
 2015-06-25 08:32:29 +02:00
pwpiwi 7b242c1ca2 fix: fpga_compressor file size check 
- commit 61611f5 fixed the check in case of correct filesizes but fails
  in case of files which are too big to fit in fpga_config[]
- fix exit codes and Makefile to handle errors correctly during make
 2015-06-25 08:16:48 +02:00
marshmellow42 9152bda817 Merge remote-tracking branch 'upstream/master' 2015-06-24 19:56:15 -04:00
Frederik Möllers 61611f5b85 Fix comparison error in fpga_compress 
The comparison would check for greater-than-or-equal the maximum amount
of bytes to read/write when it should check for greater-than only.
 2015-06-24 14:57:08 +02:00
pwpiwi 2da2e92837 Merge pull request #109 from pwpiwi/image_shrink 
Compress FPGA configs and initialized data
 2015-06-24 07:47:45 +02:00
marshmellow42 ff4fdb321f add 14b info command 
add 14b to hf search
update change log
 2015-06-23 17:41:24 -04:00
Martin Holst Swende 1e1de234ac Merge pull request #121 from frederikmoellers/master 
Add PACE replay functionality
 2015-06-23 22:23:08 +02:00
Martin Holst Swende b8d34d0598 Merge pull request #118 from marshmellow42/master 
fix t55xx write timing
 2015-06-23 22:18:50 +02:00
marshmellow42 2ec8773314 fix bug in pskdemod return value if no samples... 
... caused crash in data psknexwatchdemod if no samples were in the
graphbuffer.
also fixed hf mfu wrbl and rdbl to allow printing of help without a tag
being present.
 2015-06-23 12:16:23 -04:00
pwpiwi 01b7a6a898 Merge pull request #114 from pwpiwi/iso14443b_fix 
fixing iso14443b (issue #103): fix bug introduced during Bigbuf rework
 2015-06-23 07:14:52 +02:00
Frederik Möllers 3bb07d96c8 Add PACE replay functionality 
This function allows the user to specify APDUs which are sent to a card
supporting the PACE protocol. The response times are measured and
printed.
The code was pulled from the old Google Code repository (branch "epa")
and modified to fit into the new code base.
 2015-06-22 14:20:13 +02:00
marshmellow42 7c8b5e6811 comment fudan check possibilities 2015-06-20 21:33:42 -04:00
marshmellow42 f4217d58b6 add ultralight compatible test 2015-06-18 17:19:43 -04:00
pwpiwi 132a02179c fixing iso 14443b (issue #103): 
- fix: treat empty commands as error
- deleting dead code
- rename USB-Commands (ISO14443 -> iso14443B)
 2015-06-18 09:49:22 +02:00
pwpiwi d5875804a3 fixing iso14443b (issue #103): 
fix: don't waste time to calculate parity bits. Instead add void parity bits to trace and ignore them on client side
 2015-06-18 07:56:08 +02:00
pwpiwi 51d4f6f114 fixing iso14443b (issue #103): 
- fix: IQ demodulator (FPGA)
- fix: approximately align reader signal delay to tag response delay (FPGA)
- fix: remove deprecated RSSI calculation to improve decoder speed (iso14443b.c)
- fix: better approximation of signal amplitude to avoid false carrier detection (iso14443b.c)
- fix: remove initial power off in iso14443b raw command (iso14443b.c)
- add: enable tracing for iso14443b raw command (iso14443b.c)
- fix: client crashed when checking CRC for incomplete responses (iso14433b.c)
- speeding up snoop to avoid circular buffer overflow
- added some comments for better documentation
- rename functions (iso14443 -> iso14443b)
- remove unused code in hi_read_rx_xcorr.v
 2015-06-17 20:27:36 +02:00
marshmellow42 c3dca45114 reveng - add some common use examples to -h help 2015-06-16 23:10:54 -04:00
marshmellow42 eb17726afa remove unused "width" 2015-06-15 22:40:30 -04:00
marshmellow42 6ac4cb270a minor fixes 
see @icemant1001 -
0ad1a1d492
for more details
 2015-06-15 00:44:57 -04:00
marshmellow42 954767dd95 added iceman1001 s latest reveng script version 2015-06-15 00:23:58 -04:00
marshmellow42 d679c29a4f @iceman1001 s compiler warning adjustment 2015-06-15 00:22:49 -04:00
marshmellow42 b43607e995 add reveng compile directory 2015-06-15 00:09:28 -04:00
marshmellow42 cf9aa77db0 remove commented out code from testing 
also put back CMD_BUFFER_SIZE as I didn't need to change it in the first
place..
 2015-06-15 00:03:16 -04:00
marshmellow42 9c823c1c87 comment change in config.h 
this line indicates potential platform compatibility issues
 2015-06-14 17:48:06 -04:00
Martin Holst Swende 26fbe1fbd9 Merge pull request #117 from marshmellow42/master 
askbiphase bug fix
 2015-06-14 19:32:36 +02:00
marshmellow42 fd227f4e7d add comment 2015-06-14 11:11:00 -04:00
marshmellow42 c7d6721290 bug fix. askdemod edits invert pointer, cannot be 0 2015-06-14 10:54:55 -04:00
Martin Holst Swende 0f5b97d92c Merge pull request #115 from marshmellow42/master 
add-ons and bug fixes
 2015-06-14 09:02:13 +02:00
marshmellow42 330f65fbaf undo ARC rename, bug was fixed in scripting.c earlier 2015-06-11 23:09:15 -04:00
marshmellow42 5afe9838eb fix reveng CRC-16 bug 2015-06-10 11:01:01 -04:00
marshmellow42 d2219cae51 reveng -g (model search given just hexstr with crc) 2015-06-10 01:33:37 -04:00
marshmellow42 53ee28cb3a reveng- iceman1001 s scripting updates 2015-06-09 21:21:51 -04:00
marshmellow42 2e16354693 fix reveng memory bug + @iceman1001 s scripting 2015-06-09 13:40:01 -04:00
marshmellow42 7a23fca13a reveng RunModel - add endian switches 2015-06-08 23:14:11 -04:00
marshmellow42 37f4270a24 reveng add api RunModel 2015-06-08 21:22:18 -04:00
marshmellow42 2d3c535ec9 fixed bug in util getpraram8 + reveng adjustments 
reveng:
fixed error handling some.
added -s option to GetModels()
 2015-06-08 13:37:22 -04:00
marshmellow42 7e59994713 begin reveng add-ons for lua 2015-06-08 12:25:50 -04:00
marshmellow42 8e2e6c8eb0 add clock to ask rawdemod outputs 
fix biphase invert bug (correctly)
 2015-06-07 00:42:57 -04:00
marshmellow42 f46c366321 Fix reveng 2015-06-07 00:10:54 -04:00
marshmellow42 fe81b47811 add reveng-1.30 
new command menu:
crc help
crc calc
crc calc -h for help on command set
 2015-06-06 01:09:54 -04:00
marshmellow42 07b5a3c3ba Modified kermit crc to use existing crc calc code 2015-06-05 22:39:56 -04:00
marshmellow42 c2c7f6c271 fdx-b clean up 2015-06-04 13:10:33 -04:00
marshmellow42 6eaa8da9dc Add CCITT Kermit CRC check for FDX-B demod 2015-06-04 12:53:19 -04:00
marshmellow42 cf4d3e21b0 add fdx-b to cmddata.h 2015-06-04 00:05:37 -04:00
marshmellow42 ecfcb34cc5 add fdx-b to lf search 2015-06-04 00:04:49 -04:00
marshmellow42 b2c330b367 bug fix - biphase invert + fdx-b adjustments 2015-06-03 23:59:22 -04:00
marshmellow42 fd1d30cb76 addition animal tags demod info 2015-06-03 18:28:56 -04:00
marshmellow42 04bb05670d Testing animal tags 2015-06-03 16:52:20 -04:00
Martin Holst Swende 6a2e5adffd Merge pull request #108 from p-l-/fix-hf-mf-csave 
Ported hf mf esave trick for unreadable UIDs to hf mf csave
 2015-06-01 19:57:57 +02:00
marshmellow42 4a74e2be72 add my_d move lean identification. 2015-06-01 00:18:03 -04:00
marshmellow42 be290d68bd new lua script from @iceman1001 + bug fix in hf mfu 2015-05-31 16:08:58 -04:00
pwpiwi 97a0f5f4aa fix format strings for nit picking compilers 2015-05-31 19:51:44 +02:00
marshmellow42 1c4c0b0681 add @Iceman1001 s sha1 scripting changes. 2015-05-30 21:51:15 -04:00
pwpiwi dc20a1f639 Fix linking under linux. liblua requires libld on linux. 2015-05-29 18:18:10 +02:00
marshmellow42 185e038c7d fixed further typo in lf t5 wr help 
also fixed offset option char to uint8_t warning in the new offset
option in data printdemodbuffer
 2015-05-28 23:14:06 -04:00
marshmellow42 5b37e87a24 fix help typo 2015-05-28 22:52:41 -04:00
marshmellow42 979bba376d add offset option to data printdemodbuffer 
easily see demod buffer's hex values at different bit offsets by using:
data printdemodbuffer x o <offset>
 2015-05-28 13:23:31 -04:00
pwpiwi fbd0526b34 delete (yet) unnecessary file client/cmdhftopaz.c 2015-05-28 02:55:57 +02:00
marshmellow42 4973f23d3c clean up mfu device side code 
+ add xor calc to util (prep for desfire)
commented out MifareUWriteBlockCompat as it isn't used in client
currently (it is a command we could support..  but why?)
relabeled a few device side mfu functions to be clearer.
 2015-05-27 12:24:13 -04:00
marshmellow42 dcbaa2b582 @iceman1001 s lua script fix 2015-05-26 20:31:07 -04:00
pwpiwi 8e074056ac also delete *.bin and fpga_compressor when "make clean". 
Add target to make fpga_compressor when client is not yet compiled.
Get version information and cache it when client starts (avoids clearing
BigBuf when calling hw version).
Add some comments and remove debugging printouts.
Add version info and ChangeLog in modified zlib.
 2015-05-26 18:12:40 +02:00
marshmellow42 22342f6dfe Add clearCommandBuffer before SendCommand 
adjust output of mfu rdbl to be consistent
fix output of mfu dump in case startPage was specified. (also was
missing "i" in second print...)
 2015-05-26 10:40:23 -04:00
pwpiwi 4b3f6d79ea Add option -d (decompress) to fpga_compress. Allows testing. 
Improve zlib deflate (note: no change required to inflate).
 2015-05-26 08:31:35 +02:00
pwpiwi 0fa01ec7da Compress the .data section as well (saves another 4KBytes and comes for free) 
zlib tuning: prevent fpga_compress from generating fixed code blocks
armsrc/Makefile: replace osimage with fullimage
 2015-05-26 08:31:32 +02:00
pwpiwi fb22897415 fpga_compress: interleave (combine) fpga_lf.bit and fpga_hf.bit before compression. 
fpga_loader.c: change to unweave fpga_lf and fpga_hf accordingly
prepare fpga_compress, fpga_loader and Makefile to handle more than two FPGA config files
revert removal of fullimage Makefile target. Remove osimage instead.
 2015-05-26 08:31:28 +02:00