]>
cvs.zerfleddert.de Git - proxmark3-svn/log
pwpiwi [Sun, 12 Mar 2017 17:36:24 +0000 (18:36 +0100)]
fix: add missing #includes
pwpiwi [Sun, 12 Mar 2017 14:06:27 +0000 (15:06 +0100)]
Provide msclock() as Milliseconds timer for performance measures (#231)
- don't use clock(). It has different functionalities in Windows and Linux
- move sleep functions to util.h
pwpiwi [Sun, 12 Mar 2017 14:05:54 +0000 (15:05 +0100)]
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
marshmellow42 [Sun, 12 Mar 2017 00:21:53 +0000 (19:21 -0500)]
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
pwpiwi [Sat, 11 Mar 2017 07:50:32 +0000 (08:50 +0100)]
Create directory client/obj/crapto1 (missing in commit
33443e7 )
pwpiwi [Thu, 9 Mar 2017 10:12:50 +0000 (11:12 +0100)]
Code cleanup: deduplicate crapto1 library (#228)
- merge the existing 4 crapto1 sources into common/crapto1
Iceman [Wed, 8 Mar 2017 11:20:47 +0000 (12:20 +0100)]
Merge pull request #230 from zhovner/master
Adding homebrew tap method for macOS
Pavel Zhovner [Wed, 8 Mar 2017 11:16:33 +0000 (14:16 +0300)]
Adding homebrew tap method for macOS
Iceman [Wed, 8 Mar 2017 05:42:08 +0000 (06:42 +0100)]
Merge pull request #229 from marshmellow42/master
add iceman1001 s lf visa2000 commands
marshmellow42 [Tue, 7 Mar 2017 13:48:16 +0000 (08:48 -0500)]
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)
pwpiwi [Mon, 6 Mar 2017 21:19:15 +0000 (22:19 +0100)]
Merge pull request #227 from pwpiwi/client_fixes
Client code cleanup:
pwpiwi [Mon, 6 Mar 2017 19:07:02 +0000 (20:07 +0100)]
Client code cleanup:
- cleanup some header files and respective #includes
- rearrange functions (definition before first use)
- use SCNxxx instead of PRIxxx macros in scanf()
- use stdbool true/false instead of self defined TRUE/FALSE
Iceman [Mon, 6 Mar 2017 19:46:09 +0000 (20:46 +0100)]
Merge pull request #226 from pwpiwi/fix_defines
Fix some #defines
Iceman [Mon, 6 Mar 2017 19:45:58 +0000 (20:45 +0100)]
Merge pull request #225 from pwpiwi/armsrc_header_fixes
Remove local armsrc/stdint.h and fix some other #includes
pwpiwi [Mon, 6 Mar 2017 18:55:23 +0000 (19:55 +0100)]
Fix some #defines
- Use -D_ISOC99_SOURCE instead of -D__USE_MINGW_ANSI_STDIO=1
- WIN32 is deprecated. Use _WIN32 instead
pwpiwi [Mon, 6 Mar 2017 18:22:35 +0000 (19:22 +0100)]
Remove local armsrc/stdint.h and fix some other #includes
Iceman [Sat, 4 Mar 2017 12:54:44 +0000 (13:54 +0100)]
Merge pull request #223 from 4m4rOk/master
Typo fix for CmdPing
Luca [Sat, 4 Mar 2017 12:38:57 +0000 (13:38 +0100)]
Typo fix for CmdPing
Ping successfull -> Ping successful
pwpiwi [Sat, 4 Mar 2017 11:48:37 +0000 (12:48 +0100)]
Merge pull request #221 from jamchamb/clean-mfu-dump
Clean mfu dump output
James Chambers [Fri, 3 Mar 2017 23:04:58 +0000 (18:04 -0500)]
make clean_ascii a util function
James Chambers [Fri, 3 Mar 2017 22:38:51 +0000 (17:38 -0500)]
clean up unprintable characters in MFU dump output
pwpiwi [Wed, 1 Mar 2017 06:08:50 +0000 (07:08 +0100)]
Merge pull request #220 from marshmellow42/master
small patches and small added features listed below:
marshmellow42 [Tue, 28 Feb 2017 22:44:19 +0000 (17:44 -0500)]
update changelog
marshmellow42 [Tue, 28 Feb 2017 22:28:51 +0000 (17:28 -0500)]
fix stt mark location bug
add `data mtrim` to do a middle trim of the graph.
marshmellow42 [Tue, 28 Feb 2017 21:35:01 +0000 (16:35 -0500)]
implement marking the second STT when detected
on the graph window
marshmellow42 [Tue, 28 Feb 2017 20:53:33 +0000 (15:53 -0500)]
Add 2 pre-setable markers for the graph
marshmellow42 [Tue, 28 Feb 2017 18:32:23 +0000 (13:32 -0500)]
fix em410x XL bug
and make it rule out more false positives.
marshmellow42 [Tue, 28 Feb 2017 18:18:52 +0000 (13:18 -0500)]
adjust em4x05/em4x69 command timings to...
better conform to datasheet.
marshmellow42 [Tue, 28 Feb 2017 16:53:55 +0000 (11:53 -0500)]
fix STT bug for strong waves (or cleaned ones)
marshmellow42 [Tue, 28 Feb 2017 16:09:42 +0000 (11:09 -0500)]
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.
Iceman [Tue, 28 Feb 2017 07:00:00 +0000 (08:00 +0100)]
Merge pull request #219 from marshmellow42/master
em cleanup and fix bug in lf config [threshold] option making it not work...
marshmellow42 [Tue, 28 Feb 2017 04:03:55 +0000 (23:03 -0500)]
Adjust global variable name
pwpiwi [Mon, 27 Feb 2017 07:39:12 +0000 (08:39 +0100)]
fix for Kali Linux users (Issue #218)
marshmellow42 [Mon, 27 Feb 2017 02:44:40 +0000 (21:44 -0500)]
adjust timeouts on lf read/lf search to no timeout if threshold was set.
NOTE: lf snoop already doesn't have a timeout...
also adjusted PRIx64 to SCNx64 in em410xwrite
pwpiwi [Fri, 24 Feb 2017 15:19:35 +0000 (16:19 +0100)]
Fix issues with commit
4197a3f on some linux distributions and old mingw environments (issue #217)
marshmellow42 [Fri, 24 Feb 2017 06:02:25 +0000 (01:02 -0500)]
the timeout on lf read makes the threshold ...
option not work as expected.. need to find a more robust option...
+ added iceman's lf_em410x_sim help text..
Jeff Morsch [Fri, 24 Feb 2017 05:45:57 +0000 (00:45 -0500)]
Merge remote-tracking branch 'upstream/master'
marshmellow42 [Thu, 23 Feb 2017 19:08:41 +0000 (14:08 -0500)]
Merge remote-tracking branch 'upstream/master'
Merge Head
marshmellow42 [Thu, 23 Feb 2017 18:53:40 +0000 (13:53 -0500)]
cleanup
combine preamble searches (thanks @iceman1001)
simplify Em410xDecode
fix bug in removeParity (I made recently)
move Unique TAG ID printout to avoid confusion
pwpiwi [Thu, 23 Feb 2017 17:30:29 +0000 (18:30 +0100)]
Make LUA scripting work even if proxmark3 is called from arbitrary working directory
- add @gpakosz whereami library (https://github.com/gpakosz/whereami) in order to ...
- determine and set absolute paths for LUA scripts and LUA libraries
pwpiwi [Thu, 23 Feb 2017 08:40:12 +0000 (09:40 +0100)]
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
pwpiwi [Wed, 22 Feb 2017 21:45:00 +0000 (22:45 +0100)]
Code cleanup:
- correctly use inttypes.h scanf and printf macros (PRIx64 et al)
- fix indendation warnings
pwpiwi [Wed, 22 Feb 2017 16:38:56 +0000 (17:38 +0100)]
Merge pull request #216 from marshmellow42/master
EM4x05/EM4x69 command rewrite and improvements
marshmellow42 [Wed, 22 Feb 2017 15:41:40 +0000 (10:41 -0500)]
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...
marshmellow42 [Wed, 22 Feb 2017 04:00:43 +0000 (23:00 -0500)]
fix false positive psk demod with fsk wave
also break out new find start of modulation routine.
marshmellow42 [Tue, 21 Feb 2017 21:57:32 +0000 (16:57 -0500)]
update changelog
Iceman [Tue, 21 Feb 2017 18:53:52 +0000 (19:53 +0100)]
Merge pull request #215 from AdamLaurie/master
buspirate config for debricking.
Adam Laurie [Tue, 21 Feb 2017 17:53:56 +0000 (17:53 +0000)]
buspirate config for debricking
marshmellow42 [Tue, 21 Feb 2017 17:00:09 +0000 (12:00 -0500)]
simplified lf em command structure
WARNING changes command calling!
marshmellow42 [Tue, 21 Feb 2017 16:46:13 +0000 (11:46 -0500)]
cleanup cmdlfem4x.h - add chip detection to ...
... lf search
marshmellow42 [Tue, 21 Feb 2017 16:06:19 +0000 (11:06 -0500)]
add em4x05 config printout
marshmellow42 [Mon, 20 Feb 2017 22:39:39 +0000 (17:39 -0500)]
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
marshmellow42 [Mon, 20 Feb 2017 20:06:22 +0000 (15:06 -0500)]
speed up the em4x05 cmds by only getting 6k...
samples back
Iceman [Mon, 20 Feb 2017 20:05:35 +0000 (21:05 +0100)]
Merge pull request #214 from jamchamb/fix-hf-reader
Fix recvLen variable name in hf_reader
James Chambers [Mon, 20 Feb 2017 19:31:21 +0000 (14:31 -0500)]
fix recvLen variable name in hf_reader
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
pwpiwi [Wed, 8 Feb 2017 20:49:26 +0000 (21:49 +0100)]
Merge pull request #211 from marshmellow42/master
Add Flag for compile warnings, lf cotag read by iceman
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