]> git.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
7 years agofix: compile issue on RasPi (http://www.proxmark.org/forum/viewtopic.php?id=4678)
pwpiwi [Thu, 23 Mar 2017 05:42:56 +0000 (06:42 +0100)]
fix: compile issue on RasPi (http://www.proxmark.org/forum/viewtopic.php?id=4678)

7 years agoMerge pull request #242 from marshmellow42/master
pwpiwi [Thu, 23 Mar 2017 05:38:22 +0000 (06:38 +0100)]
Merge pull request #242 from marshmellow42/master

move viking demod to respective file

7 years agomove viking demod to respective file 242/head
marshmellow42 [Thu, 23 Mar 2017 02:59:55 +0000 (22:59 -0400)]
move viking demod to respective file

see changelog.md for cli changes!

7 years agoMerge pull request #241 from pwpiwi/ukbhit_fix
Iceman [Wed, 22 Mar 2017 21:39:28 +0000 (22:39 +0100)]
Merge pull request #241 from pwpiwi/ukbhit_fix

fix: ukbhit() for OS X

7 years agoMerge pull request #240 from marshmellow42/master
pwpiwi [Wed, 22 Mar 2017 21:27:02 +0000 (22:27 +0100)]
Merge pull request #240 from marshmellow42/master

split io demod/pyramid demod to respective files

7 years agosplit io demod/pyramid demod to respective files 240/head
marshmellow42 [Wed, 22 Mar 2017 21:16:43 +0000 (17:16 -0400)]
split io demod/pyramid demod to respective files

out of cmddata.c / data cmds
see changelog.md for cli changes as options have changed!

7 years agofix: ukbhit() for OS X 241/head
pwpiwi [Wed, 22 Mar 2017 21:15:24 +0000 (22:15 +0100)]
fix: ukbhit() for OS X
- don't use CMIN and CTIME
- corrected comments

7 years agoMerge pull request #239 from marshmellow42/master
Iceman [Wed, 22 Mar 2017 20:02:52 +0000 (21:02 +0100)]
Merge pull request #239 from marshmellow42/master

split hid demod/awid demod to respective files

7 years agofix headers 239/head
marshmellow42 [Wed, 22 Mar 2017 19:54:32 +0000 (15:54 -0400)]
fix headers

7 years agosplit hid demod/awid demod to respective files
marshmellow42 [Wed, 22 Mar 2017 19:49:01 +0000 (15:49 -0400)]
split hid demod/awid demod to respective files

NOTE: see changelog.md for cli changes

7 years agoMerge pull request #237 from marshmellow42/master
Iceman [Wed, 22 Mar 2017 14:51:00 +0000 (15:51 +0100)]
Merge pull request #237 from marshmellow42/master

move em410x demods to cmdlfem4x.c from cmddata.c

7 years agomove em410x demod functions to cmdlfem4x.c 237/head
marshmellow42 [Tue, 21 Mar 2017 22:42:11 +0000 (18:42 -0400)]
move em410x demod functions to cmdlfem4x.c

from cmddata.c
NOTE: see changelog.md for command line changes!

7 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Tue, 21 Mar 2017 14:40:29 +0000 (10:40 -0400)]
Merge remote-tracking branch 'upstream/master'

7 years agoMerge pull request #235 from marshmellow42/lfdemod_refactors
pwpiwi [Tue, 21 Mar 2017 14:38:18 +0000 (15:38 +0100)]
Merge pull request #235 from marshmellow42/lfdemod_refactors

lfdemod refactor

7 years agoadjust ManchesterEncode 235/head
marshmellow42 [Tue, 21 Mar 2017 13:53:14 +0000 (09:53 -0400)]
adjust ManchesterEncode

removed dead size check
added a max size of 2k input bits (4k out)
this shouldn't overload the array memory passed to it typically...

7 years agoMerge pull request #234 from pwpiwi/nonce2key
Iceman [Tue, 21 Mar 2017 07:49:27 +0000 (08:49 +0100)]
Merge pull request #234 from pwpiwi/nonce2key

Code cleanup: Refactoring nonce2key

7 years agoadd bitswap option for lf em 4x05write (#236)
marshmellow42 [Tue, 21 Mar 2017 07:26:26 +0000 (03:26 -0400)]
add bitswap option for lf em 4x05write (#236)

default read mode of this chip outputs in reverse order...  so offer the
option to program in reverse order

7 years agoCode cleanup: Refactoring nonce2key 234/head
pwpiwi [Sat, 11 Mar 2017 17:32:53 +0000 (18:32 +0100)]
Code cleanup: Refactoring nonce2key
- include nonce2key() in mifarehost.c
- remove tools/nonce2key
- simplify mifare_autopwn.lua

7 years agofix: crapto3.3 sometimes crashing with hf mf mifare on Fudan clones (no par, all...
pwpiwi [Mon, 20 Mar 2017 20:05:26 +0000 (21:05 +0100)]
fix: crapto3.3 sometimes crashing with hf mf mifare on Fudan clones (no par, all NACK) (#233)

added readme.txt again in tools/nonce2key

7 years agoline break
marshmellow42 [Wed, 15 Mar 2017 15:07:52 +0000 (11:07 -0400)]
line break

7 years agorefactor pskdemod - remove nrz.._ext
marshmellow42 [Wed, 15 Mar 2017 14:53:32 +0000 (10:53 -0400)]
refactor pskdemod - remove nrz.._ext

7 years agofurther refactor
marshmellow42 [Tue, 14 Mar 2017 21:08:58 +0000 (17:08 -0400)]
further refactor

7 years agomove new functions to utilities area
marshmellow42 [Tue, 14 Mar 2017 20:24:14 +0000 (16:24 -0400)]
move new functions to utilities area

7 years agocontinue refactor detectST
marshmellow42 [Tue, 14 Mar 2017 20:20:15 +0000 (16:20 -0400)]
continue refactor detectST

detectST should be done now...

7 years agoMerge remote-tracking branch 'upstream/master' 236/head
marshmellow42 [Tue, 14 Mar 2017 18:48:31 +0000 (14:48 -0400)]
Merge remote-tracking branch 'upstream/master'

7 years agoadd bitswap option for lf em 4x05write
marshmellow42 [Tue, 14 Mar 2017 18:42:01 +0000 (14:42 -0400)]
add bitswap option for lf em 4x05write

default read mode of this chip outputs in reverse order...  so offer the
option to program in reverse order

7 years agowasn't ready for these yet...
marshmellow42 [Tue, 14 Mar 2017 17:18:20 +0000 (13:18 -0400)]
wasn't ready for these yet...

7 years agoadd first attempt at lf miller decoding
marshmellow42 [Tue, 14 Mar 2017 17:16:30 +0000 (13:16 -0400)]
add first attempt at lf miller decoding

don't have any tags capable to test and not yet hooked up to data
rawdemod...

7 years agofixed bug in new refactored detectST
marshmellow42 [Mon, 13 Mar 2017 17:27:38 +0000 (13:27 -0400)]
fixed bug in new refactored detectST

forgot to return i...

7 years agomeant to put clock detection before demods
marshmellow42 [Mon, 13 Mar 2017 03:11:52 +0000 (23:11 -0400)]
meant to put clock detection before demods

... fixing that.
no code changed here...

7 years agorefactor detectST a little...
marshmellow42 [Mon, 13 Mar 2017 02:57:01 +0000 (22:57 -0400)]
refactor detectST a little...

+ a little more shuffling

7 years agore-organize lfdemod.c
marshmellow42 [Mon, 13 Mar 2017 02:47:50 +0000 (22:47 -0400)]
re-organize lfdemod.c

sorry but it was ugly  (still is... but i can get to things easier)

7 years agofix: add missing #includes
pwpiwi [Sun, 12 Mar 2017 17:39:47 +0000 (18:39 +0100)]
fix: add missing #includes

7 years agofix: add missing #includes
pwpiwi [Sun, 12 Mar 2017 17:36:24 +0000 (18:36 +0100)]
fix: add missing #includes

7 years agoProvide msclock() as Milliseconds timer for performance measures (#231)
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

7 years agoUpgrade crapto1 library to v3.3 (#232)
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

7 years agostarted to enable demod graphing
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

7 years agoCreate directory client/obj/crapto1 (missing in commit 33443e7)
pwpiwi [Sat, 11 Mar 2017 07:50:32 +0000 (08:50 +0100)]
Create directory client/obj/crapto1 (missing in commit 33443e7)

7 years agoCode cleanup: deduplicate crapto1 library (#228)
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

7 years agoMerge pull request #230 from zhovner/master
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

7 years agoAdding homebrew tap method for macOS 230/head
Pavel Zhovner [Wed, 8 Mar 2017 11:16:33 +0000 (14:16 +0300)]
Adding homebrew tap method for macOS

7 years agoMerge pull request #229 from marshmellow42/master
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

7 years agoadd iceman1001 s lf visa2000 commands 229/head
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)

7 years agoMerge pull request #227 from pwpiwi/client_fixes
pwpiwi [Mon, 6 Mar 2017 21:19:15 +0000 (22:19 +0100)]
Merge pull request #227 from pwpiwi/client_fixes

Client code cleanup:

7 years agoClient code cleanup: 227/head
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

7 years agoMerge pull request #226 from pwpiwi/fix_defines
Iceman [Mon, 6 Mar 2017 19:46:09 +0000 (20:46 +0100)]
Merge pull request #226 from pwpiwi/fix_defines

Fix some #defines

7 years agoMerge pull request #225 from pwpiwi/armsrc_header_fixes
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

7 years agoFix some #defines 226/head
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

7 years agoRemove local armsrc/stdint.h and fix some other #includes 225/head
pwpiwi [Mon, 6 Mar 2017 18:22:35 +0000 (19:22 +0100)]
Remove local armsrc/stdint.h and fix some other #includes

7 years agoMerge pull request #223 from 4m4rOk/master
Iceman [Sat, 4 Mar 2017 12:54:44 +0000 (13:54 +0100)]
Merge pull request #223 from 4m4rOk/master

Typo fix for CmdPing

7 years agoTypo fix for CmdPing 223/head
Luca [Sat, 4 Mar 2017 12:38:57 +0000 (13:38 +0100)]
Typo fix for CmdPing

Ping successfull -> Ping successful

7 years agoMerge pull request #221 from jamchamb/clean-mfu-dump
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

7 years agomake clean_ascii a util function 221/head
James Chambers [Fri, 3 Mar 2017 23:04:58 +0000 (18:04 -0500)]
make clean_ascii a util function

7 years agoclean up unprintable characters in MFU dump output
James Chambers [Fri, 3 Mar 2017 22:38:51 +0000 (17:38 -0500)]
clean up unprintable characters in MFU dump output

7 years agoMerge pull request #220 from marshmellow42/master
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:

7 years agoupdate changelog 220/head
marshmellow42 [Tue, 28 Feb 2017 22:44:19 +0000 (17:44 -0500)]
update changelog

7 years agofix stt mark location bug
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.

7 years agoimplement marking the second STT when detected
marshmellow42 [Tue, 28 Feb 2017 21:35:01 +0000 (16:35 -0500)]
implement marking the second STT when detected

on the graph window

7 years agoAdd 2 pre-setable markers for the graph
marshmellow42 [Tue, 28 Feb 2017 20:53:33 +0000 (15:53 -0500)]
Add 2 pre-setable markers for the graph

7 years agofix em410x XL bug
marshmellow42 [Tue, 28 Feb 2017 18:32:23 +0000 (13:32 -0500)]
fix em410x XL bug

and make it rule out more false positives.

7 years agoadjust em4x05/em4x69 command timings to...
marshmellow42 [Tue, 28 Feb 2017 18:18:52 +0000 (13:18 -0500)]
adjust em4x05/em4x69 command timings to...

better conform to datasheet.

7 years agofix STT bug for strong waves (or cleaned ones)
marshmellow42 [Tue, 28 Feb 2017 16:53:55 +0000 (11:53 -0500)]
fix STT bug for strong waves (or cleaned ones)

7 years agoAdd a retry loop to hf mf dump
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.

7 years agoMerge pull request #219 from marshmellow42/master
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...

7 years agoAdjust global variable name 219/head
marshmellow42 [Tue, 28 Feb 2017 04:03:55 +0000 (23:03 -0500)]
Adjust global variable name

7 years agofix for Kali Linux users (Issue #218)
pwpiwi [Mon, 27 Feb 2017 07:39:12 +0000 (08:39 +0100)]
fix for Kali Linux users (Issue #218)

7 years agoadjust timeouts on lf read/lf search to no timeout if threshold was set.
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

7 years agoFix issues with commit 4197a3f on some linux distributions and old mingw environments...
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)

7 years agothe timeout on lf read makes the threshold ...
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..

7 years agoMerge remote-tracking branch 'upstream/master'
Jeff Morsch [Fri, 24 Feb 2017 05:45:57 +0000 (00:45 -0500)]
Merge remote-tracking branch 'upstream/master'

7 years agoMerge 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

7 years agocleanup
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

7 years agoMake LUA scripting work even if proxmark3 is called from arbitrary working directory
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

7 years agoCode cleanup:
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

7 years agoCode cleanup:
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

7 years agoMerge pull request #216 from marshmellow42/master
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

7 years agosmall text adjustments plus... 216/head
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...

7 years agofix false positive psk demod with fsk wave
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.

7 years agoupdate changelog
marshmellow42 [Tue, 21 Feb 2017 21:57:32 +0000 (16:57 -0500)]
update changelog

7 years agoMerge pull request #215 from AdamLaurie/master
Iceman [Tue, 21 Feb 2017 18:53:52 +0000 (19:53 +0100)]
Merge pull request #215 from AdamLaurie/master

buspirate config for debricking.

7 years agobuspirate config for debricking 215/head
Adam Laurie [Tue, 21 Feb 2017 17:53:56 +0000 (17:53 +0000)]
buspirate config for debricking

7 years agosimplified lf em command structure
marshmellow42 [Tue, 21 Feb 2017 17:00:09 +0000 (12:00 -0500)]
simplified lf em command structure

WARNING changes command calling!

7 years agocleanup cmdlfem4x.h - add chip detection to ...
marshmellow42 [Tue, 21 Feb 2017 16:46:13 +0000 (11:46 -0500)]
cleanup cmdlfem4x.h - add chip detection to ...

... lf search

7 years agoadd em4x05 config printout
marshmellow42 [Tue, 21 Feb 2017 16:06:19 +0000 (11:06 -0500)]
add em4x05 config printout

7 years agoshorten em4x05 capture samples
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

7 years agospeed up the em4x05 cmds by only getting 6k...
marshmellow42 [Mon, 20 Feb 2017 20:06:22 +0000 (15:06 -0500)]
speed up the em4x05 cmds by only getting 6k...

samples back

7 years agoMerge pull request #214 from jamchamb/fix-hf-reader
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

7 years agofix recvLen variable name in hf_reader 214/head
James Chambers [Mon, 20 Feb 2017 19:31:21 +0000 (14:31 -0500)]
fix recvLen variable name in hf_reader

7 years agoadd em4x05 info command
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...

7 years agofix dump output
marshmellow42 [Mon, 20 Feb 2017 02:31:46 +0000 (21:31 -0500)]
fix dump output

7 years agoa little cleanup
marshmellow42 [Mon, 20 Feb 2017 01:47:45 +0000 (20:47 -0500)]
a little cleanup

7 years ago@iceman1001 s idea to output failure report
marshmellow42 [Fri, 17 Feb 2017 19:48:19 +0000 (14:48 -0500)]
@iceman1001 s idea to output failure report

7 years agoadd psk to em4x05 reads and tweak psk demod
marshmellow42 [Fri, 17 Feb 2017 19:40:40 +0000 (14:40 -0500)]
add psk to em4x05 reads and tweak psk demod

7 years agominor fixes for FSK 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)...

7 years agoem4x05 getting better
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.

7 years agoa couple em4x05 fixes.
marshmellow42 [Thu, 16 Feb 2017 18:57:14 +0000 (13:57 -0500)]
a couple em4x05 fixes.

7 years agoEM4x05/EM4x69 continued + a couple of icemans utils.
marshmellow42 [Thu, 16 Feb 2017 04:27:15 +0000 (23:27 -0500)]
EM4x05/EM4x69 continued  + a couple of icemans utils.

7 years agocouple q5 fixes + continue with em4x05 em4x69..
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

7 years agoupdate em4x05/em4x69 cmds
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

7 years agoMerge pull request #211 from marshmellow42/master
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

Impressum, Datenschutz