]> git.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
8 years agoMerge pull request #158 from marshmellow42/master
Martin Holst Swende [Tue, 9 Feb 2016 11:55:36 +0000 (12:55 +0100)]
Merge pull request #158 from marshmellow42/master

q5 fixes plus a couple coverity scan fixes from @iceman1001

8 years agofix print clock as decimal instead of uint8_t 158/head
marshmellow42 [Thu, 28 Jan 2016 05:27:53 +0000 (00:27 -0500)]
fix print clock as decimal instead of uint8_t

8 years agosome @iceman1001 s coverty scan fixes
marshmellow42 [Fri, 8 Jan 2016 23:26:56 +0000 (18:26 -0500)]
some @iceman1001 s coverty scan fixes

great work!

8 years agocomment out unused includes and defines
marshmellow42 [Fri, 8 Jan 2016 02:54:32 +0000 (21:54 -0500)]
comment out unused includes and defines

prep for permanent removal.

8 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Wed, 6 Jan 2016 02:36:16 +0000 (21:36 -0500)]
Merge remote-tracking branch 'upstream/master'

8 years agoadd broken_bad and @iceman1001 s q5 trace and ...
marshmellow42 [Wed, 6 Jan 2016 02:21:06 +0000 (21:21 -0500)]
add broken_bad and @iceman1001 s q5 trace and ...

wipe adjustments

8 years agoRemove include statement that causes trouble (fix #151).
ikarus [Wed, 23 Dec 2015 22:51:49 +0000 (23:51 +0100)]
Remove include statement that causes trouble (fix #151).

See: https://github.com/Proxmark/proxmark3/issues/151

8 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Tue, 22 Dec 2015 04:56:55 +0000 (23:56 -0500)]
Merge remote-tracking branch 'upstream/master'

9 years agoMerge pull request #153 from AdamLaurie/master
Martin Holst Swende [Sun, 20 Dec 2015 20:13:51 +0000 (21:13 +0100)]
Merge pull request #153 from AdamLaurie/master

add support for raw block 3/4 iclass keys

9 years agodocument iclass raw key changes 153/head
Adam Laurie [Sun, 20 Dec 2015 12:37:22 +0000 (12:37 +0000)]
document iclass raw key changes

9 years agoadd support for raw block 3/4 iclass keys
Adam Laurie [Sat, 19 Dec 2015 16:37:32 +0000 (16:37 +0000)]
add support for raw block 3/4 iclass keys

9 years agoadditional Q5 `lf t55xx` fixes
marshmellow42 [Mon, 14 Dec 2015 22:36:08 +0000 (17:36 -0500)]
additional Q5 `lf t55xx` fixes

9 years agofix occasional strange printed clock value with...
marshmellow42 [Mon, 14 Dec 2015 21:51:11 +0000 (16:51 -0500)]
fix occasional strange printed clock value with...

...fskdemod
Fix Q5 tag detection in lf t55xx detect
Fix param_get8 reversed parameters

9 years agoMerge pull request #149 from marshmellow42/T55xx_tests
Martin Holst Swende [Thu, 10 Dec 2015 09:44:44 +0000 (10:44 +0100)]
Merge pull request #149 from marshmellow42/T55xx_tests

Add lf viking, lf demod/clock detection improvements

9 years agoFix incorrect memset parameters in lf t55xx wipe 149/head
marshmellow42 [Thu, 10 Dec 2015 03:44:01 +0000 (22:44 -0500)]
Fix incorrect memset parameters in lf t55xx wipe

thanks @iceman1001 for the catch

add added a restore graphbuffer after lf t55xx psk demodulation

9 years agofix sprint_bin bug i made :(
marshmellow42 [Thu, 10 Dec 2015 01:40:12 +0000 (20:40 -0500)]
fix sprint_bin bug i made :(

9 years agoupdate changelog
marshmellow42 [Wed, 9 Dec 2015 03:26:55 +0000 (22:26 -0500)]
update changelog

9 years agoFix printdemodbuffer length tests + add length...
marshmellow42 [Tue, 8 Dec 2015 02:18:30 +0000 (21:18 -0500)]
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)

9 years agominor help text changes
marshmellow42 [Fri, 4 Dec 2015 17:09:26 +0000 (12:09 -0500)]
minor help text changes

9 years agoinclude default password dictionary for lf t55xx...
marshmellow42 [Thu, 3 Dec 2015 21:44:06 +0000 (16:44 -0500)]
include default password dictionary for lf t55xx...

...bruteforce

9 years agoicemans lf fixes & adjustments + lf t55xx bruteforce
marshmellow42 [Wed, 2 Dec 2015 22:27:12 +0000 (17:27 -0500)]
icemans lf fixes & adjustments + lf t55xx bruteforce

Fix small fskdemod clock bug

9 years agoinclude cmdlfviking.c in makefile and cmdlf
marshmellow42 [Fri, 27 Nov 2015 02:05:46 +0000 (21:05 -0500)]
include cmdlfviking.c in makefile and cmdlf

fix minor typos

9 years agoiceman's finished t55xx detect parameter adjustments
marshmellow42 [Fri, 27 Nov 2015 01:30:58 +0000 (20:30 -0500)]
iceman's finished t55xx detect parameter adjustments

9 years agofix const vs static...
marshmellow42 [Sun, 22 Nov 2015 21:42:13 +0000 (16:42 -0500)]
fix const vs static...

9 years agoMerge pull request #147 from ha7dcd/pcb
Martin Holst Swende [Sun, 22 Nov 2015 14:05:47 +0000 (15:05 +0100)]
Merge pull request #147 from ha7dcd/pcb

Updates and fixes to the PCB schematics

9 years agolf viking build / lf awid refactor / lfdemod.c debugMode==2
marshmellow42 [Sun, 22 Nov 2015 05:00:32 +0000 (00:00 -0500)]
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)

9 years agolf demod cleanup nrz clock detect fixes
marshmellow42 [Wed, 18 Nov 2015 05:10:11 +0000 (00:10 -0500)]
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).

9 years agoremove old comment 148/head
marshmellow42 [Mon, 16 Nov 2015 23:55:46 +0000 (18:55 -0500)]
remove old comment

9 years agolf t55xx and some lf demod fixes/adjustments
marshmellow42 [Mon, 16 Nov 2015 23:49:20 +0000 (18:49 -0500)]
lf t55xx and some lf demod fixes/adjustments

finally think I like the lf t55xx detect and read cmds.  pretty reliable
now.

9 years agoMerge pull request #143 from marshmellow42/master
Martin Holst Swende [Sun, 15 Nov 2015 12:22:26 +0000 (13:22 +0100)]
Merge pull request #143 from marshmellow42/master

lfops cleanup, t55xx additions/fixes, PCF7931 input cleanup

9 years agoMerge pull request #144 from dnet/makefile-paren-fix
Martin Holst Swende [Sun, 15 Nov 2015 12:20:51 +0000 (13:20 +0100)]
Merge pull request #144 from dnet/makefile-paren-fix

fixed target "help" in Makefile

9 years agoMerge pull request #146 from dnet/patch-1
Martin Holst Swende [Sun, 15 Nov 2015 12:20:25 +0000 (13:20 +0100)]
Merge pull request #146 from dnet/patch-1

Fixed copypasted hex output to match input

9 years agocorrected Eagle files 147/head
Zoltan Doczi [Fri, 13 Nov 2015 16:24:26 +0000 (17:24 +0100)]
corrected Eagle files

check change_log.txt

9 years agocad, cam file commit
Zoltan Doczi [Fri, 13 Nov 2015 16:13:51 +0000 (17:13 +0100)]
cad, cam file commit

adding modified CAD and CAM file sets. Checked against DRC issues, all
looks okay, ready to manufacturing!

9 years agoadd some Q5 functionality - add t55xx wipe cmd
marshmellow42 [Thu, 12 Nov 2015 05:27:24 +0000 (00:27 -0500)]
add some Q5 functionality - add t55xx wipe cmd

not fully tested yet

9 years agoFix viking demod bug - clean my indala demod code 143/head
marshmellow42 [Tue, 10 Nov 2015 16:59:41 +0000 (11:59 -0500)]
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).

9 years agoadd checksum to viking demod
marshmellow42 [Tue, 10 Nov 2015 04:48:39 +0000 (23:48 -0500)]
add checksum to viking demod

9 years agoAdd Viking demod,
marshmellow42 [Tue, 10 Nov 2015 04:09:26 +0000 (23:09 -0500)]
Add Viking demod,

fix compiler warning for int vs uint8_t for em410x sim clock variable

9 years agoFixed copypasted hex output to match input 146/head
András Veres-Szentkirályi [Mon, 9 Nov 2015 20:06:58 +0000 (21:06 +0100)]
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.

9 years agofixed target "help" in Makefile 144/head
András Veres-Szentkirályi [Mon, 9 Nov 2015 18:32:50 +0000 (19:32 +0100)]
fixed target "help" in Makefile

Without this commit, running `make help` produced the below output.

    $ make help
    Multi-OS Makefile, you are running on Linux
    Possible targets:
    + all - Make bootrom, armsrc and the OS-specific host directory
    + client - Make only the OS-specific host directory
    + flash-bootrom - Make bootrom and flash it
    /bin/sh: 1: Syntax error: "(" unexpected
    Makefile:20: recipe for target 'help' failed
    make: *** [help] Error 2

This issue was introduced in e335ca2846d57f660ab7f4c75b58226cca264e0e
six months ago, the above output was produced on Debian GNU/Linux, where
`/bin/sh` is usually a symbolic link to `/bin/dash`.

9 years agofix em410xsim help - add clock input to em410xsim
marshmellow42 [Sun, 8 Nov 2015 02:02:30 +0000 (21:02 -0500)]
fix em410xsim help - add clock input to em410xsim

9 years agofix: .history was never written
pwpiwi [Fri, 6 Nov 2015 10:34:43 +0000 (11:34 +0100)]
fix: .history was never written

9 years agofixing hf snoop:
pwpiwi [Fri, 6 Nov 2015 07:55:09 +0000 (08:55 +0100)]
fixing hf snoop:
- add: clear the trace buffer before snooping
- fix: allow trigger on odd samples as well
- fix: don't use Dbprintf() in timing tight loops

9 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Wed, 4 Nov 2015 01:19:46 +0000 (20:19 -0500)]
Merge remote-tracking branch 'upstream/master'

9 years agominor lf updates/cleanup
marshmellow42 [Wed, 4 Nov 2015 01:18:16 +0000 (20:18 -0500)]
minor lf updates/cleanup

9 years agoMerge branch 'topaz'
pwpiwi [Tue, 3 Nov 2015 20:06:59 +0000 (21:06 +0100)]
Merge branch 'topaz'

Conflicts:
CHANGELOG.md
client/cmdhf.c

9 years agoMerge pull request #141 from etmatrix/tosubmit
pwpiwi [Tue, 3 Nov 2015 06:44:01 +0000 (07:44 +0100)]
Merge pull request #141 from etmatrix/tosubmit

HF snoop ported by enio's repository

9 years ago- Little change to description in client 141/head
etmatrix [Tue, 3 Nov 2015 06:15:56 +0000 (07:15 +0100)]
- Little change to description in client
- Added description to CHANGELOG.md

9 years ago- Correct little distraction on fpga/Makefile
etmatrix [Mon, 2 Nov 2015 08:08:21 +0000 (09:08 +0100)]
- Correct little distraction on fpga/Makefile
- New patch from pwpiwi works very well for hi_sniffer.v
- Restored previous fpga_lf.bit

9 years agominor cleanups
marshmellow42 [Sun, 1 Nov 2015 03:12:42 +0000 (23:12 -0400)]
minor cleanups

9 years agoupdate changelog
marshmellow42 [Sat, 31 Oct 2015 03:30:12 +0000 (23:30 -0400)]
update changelog

9 years agoAdd lf t55xx resetread cmd + fix clone cmds
marshmellow42 [Sat, 31 Oct 2015 03:23:27 +0000 (23:23 -0400)]
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...

9 years agoMerge branch 'master' into topaz. Update Changelog. 142/head
pwpiwi [Tue, 27 Oct 2015 19:44:48 +0000 (20:44 +0100)]
Merge branch 'master' into topaz. Update Changelog.

9 years agoLED D is on while snoop, when user button is pressed snoop is stopped
etmatrix [Sun, 25 Oct 2015 07:10:17 +0000 (08:10 +0100)]
LED D is on while snoop, when user button is pressed snoop is stopped

9 years agorefactor lfops t55xx functions
marshmellow42 [Sat, 24 Oct 2015 13:54:04 +0000 (09:54 -0400)]
refactor lfops t55xx functions

share t55xx configuration register definitions with client for later use
(warning - compiled but not fully tested yet)

9 years agoupdate changelog
marshmellow42 [Fri, 23 Oct 2015 17:13:29 +0000 (13:13 -0400)]
update changelog

9 years agotext cleanup t55xx cmds
marshmellow42 [Fri, 23 Oct 2015 17:05:40 +0000 (13:05 -0400)]
text cleanup t55xx cmds

9 years agoThe great work of Enio hf snoop is now ported into latest version in git
etmatrix [Fri, 23 Oct 2015 13:29:12 +0000 (15:29 +0200)]
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

9 years agoupdates to lf t55xx commands
marshmellow42 [Thu, 22 Oct 2015 20:19:23 +0000 (16:19 -0400)]
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

9 years agoadd wake option to t55xx read command
marshmellow42 [Sat, 17 Oct 2015 19:01:26 +0000 (15:01 -0400)]
add wake option to t55xx read command

9 years agobegin update lf commands with help text and
marshmellow42 [Sat, 17 Oct 2015 14:48:54 +0000 (10:48 -0400)]
begin update lf commands with help text and

cmd structure.
update changelog for recent changes

9 years agoadd lf t5 read w/pwd warning and checks
marshmellow42 [Fri, 16 Oct 2015 01:26:23 +0000 (21:26 -0400)]
add lf t5 read w/pwd warning and checks

ideas from @iceman1001 for issue #136

9 years agolf t55xx code cleanup +
marshmellow42 [Thu, 15 Oct 2015 18:53:49 +0000 (14:53 -0400)]
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.

9 years agoPCF-fix bytepos range from 0-3 to 0-15
marshmellow42 [Thu, 15 Oct 2015 05:31:52 +0000 (01:31 -0400)]
PCF-fix bytepos range from 0-3 to 0-15

9 years agoadjust lf t55xx read commands
marshmellow42 [Thu, 15 Oct 2015 05:09:49 +0000 (01:09 -0400)]
adjust lf t55xx read commands

seems to make them a lot more accurate for me

9 years agoClean up pcf7931
marshmellow42 [Wed, 14 Oct 2015 20:17:56 +0000 (16:17 -0400)]
Clean up pcf7931

@iceman1001 s cleanup of pcf7931 commands on client side
and split out pcf7931 from lfops.c as it is getting large

9 years agoMerge pull request #140 from marshmellow42/iclass
Martin Holst Swende [Tue, 13 Oct 2015 07:39:04 +0000 (09:39 +0200)]
Merge pull request #140 from marshmellow42/iclass

iClass major updates

9 years agohf mf mifare: (finally) fix watchdog reset
pwpiwi [Fri, 9 Oct 2015 05:49:06 +0000 (07:49 +0200)]
hf mf mifare: (finally) fix watchdog reset
- minor changes to sync
- try alternative strategies when debugging

9 years agofix changelog conflict 140/head
marshmellow42 [Wed, 7 Oct 2015 13:38:07 +0000 (09:38 -0400)]
fix changelog conflict

9 years agoMerge remote-tracking branch 'Proxmark/master' into iclass
marshmellow42 [Wed, 7 Oct 2015 13:34:47 +0000 (09:34 -0400)]
Merge remote-tracking branch 'Proxmark/master' into iclass

Conflicts:
CHANGELOG.md

9 years agofix help typo
marshmellow42 [Wed, 7 Oct 2015 13:32:50 +0000 (09:32 -0400)]
fix help typo

9 years agoAdd mifare crypto trace decryption utility
marshmellow42 [Wed, 7 Oct 2015 04:24:55 +0000 (00:24 -0400)]
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...

9 years agohf mf mifare:
pwpiwi [Wed, 30 Sep 2015 18:59:50 +0000 (20:59 +0200)]
hf mf mifare:
- gracefully exit on unsuccessful syncs instead of hard watchdog reset

9 years agohf topaz reader implementation:
pwpiwi [Mon, 28 Sep 2015 06:26:00 +0000 (08:26 +0200)]
hf topaz reader implementation:
- read and display dynamic memory as well
- display "locked" status per byte instead per block

9 years agoMerge pull request #138 from Dake01/master
Martin Holst Swende [Tue, 8 Sep 2015 19:04:24 +0000 (21:04 +0200)]
Merge pull request #138 from Dake01/master

Add : writing on PCF7931 tags

9 years agoremove debug 138/head
Dake [Thu, 27 Aug 2015 06:58:15 +0000 (08:58 +0200)]
remove debug

9 years agosyntax corrective
Dake [Wed, 26 Aug 2015 14:01:08 +0000 (16:01 +0200)]
syntax corrective

9 years agocorrective values
Dake [Wed, 26 Aug 2015 13:57:41 +0000 (15:57 +0200)]
corrective values

9 years agoadd : writing on PCF7931 tags
Dake [Wed, 26 Aug 2015 13:53:49 +0000 (15:53 +0200)]
add : writing on PCF7931 tags

9 years agoMerge branch 'master' into topaz
pwpiwi [Tue, 25 Aug 2015 05:53:00 +0000 (07:53 +0200)]
Merge branch 'master' into topaz

9 years agoMinor corrections
Martin Holst Swende [Fri, 31 Jul 2015 21:30:48 +0000 (23:30 +0200)]
Minor corrections

9 years agoImplemented `data hex2bin` and `data bin2hex` as per suggestion in http://www.proxmar...
Martin Holst Swende [Fri, 31 Jul 2015 21:27:09 +0000 (23:27 +0200)]
Implemented `data hex2bin` and `data bin2hex` as per suggestion in http://www.proxmark.org/forum/viewtopic.php?pid=17504

9 years agofix: avoid USB Speed Test timeout in case of slow transfer speeds
pwpiwi [Fri, 31 Jul 2015 18:05:30 +0000 (20:05 +0200)]
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

9 years agoadd: USB Speed Test to hw status
pwpiwi [Wed, 29 Jul 2015 16:52:43 +0000 (18:52 +0200)]
add: USB Speed Test to hw status
fix: choose Real Time Clock divider based on actual slow clock frequency

9 years agoiclass Write doMAC_N - rename variables to correct descriptions.
marshmellow42 [Tue, 28 Jul 2015 19:20:19 +0000 (15:20 -0400)]
iclass Write doMAC_N - rename variables to correct descriptions.

9 years agoMerge pull request #134 from VERTCraig/master
Martin Holst Swende [Tue, 28 Jul 2015 17:00:19 +0000 (19:00 +0200)]
Merge pull request #134 from VERTCraig/master

Updating StandAloneMode14a

9 years agoAdding STL files for 3D printed coil forms 134/head
Craig Young [Sun, 26 Jul 2015 15:55:50 +0000 (11:55 -0400)]
Adding STL files for 3D printed coil forms

9 years agoupdate books to app_areas. clearer.
marshmellow42 [Sun, 26 Jul 2015 03:24:53 +0000 (23:24 -0400)]
update books to app_areas.  clearer.

9 years agoupdate iClass chip identification
marshmellow42 [Sun, 26 Jul 2015 03:09:07 +0000 (23:09 -0400)]
update iClass chip identification

9 years agofix typo
marshmellow42 [Sun, 26 Jul 2015 02:22:19 +0000 (22:22 -0400)]
fix typo

9 years agodocument iclass additions
marshmellow42 [Sun, 26 Jul 2015 02:11:54 +0000 (22:11 -0400)]
document iclass additions

9 years agoMerging changes from main repo
Craig Young [Sat, 25 Jul 2015 18:38:57 +0000 (14:38 -0400)]
Merging changes from main repo

9 years agoStand Alone Mode changes for NFC (part 2)
Craig Young [Sat, 25 Jul 2015 18:35:14 +0000 (14:35 -0400)]
Stand Alone Mode changes for NFC (part 2)

9 years agouse read instead of readcheck except to auth
marshmellow42 [Thu, 23 Jul 2015 05:12:02 +0000 (01:12 -0400)]
use read instead of readcheck except to auth

9 years agochangelog docs
Martin Holst Swende [Tue, 21 Jul 2015 21:21:16 +0000 (23:21 +0200)]
changelog docs

9 years agoImplemented 'hw status' and 'hw ping', put back client-side cacheing of 'hw version'
Martin Holst Swende [Tue, 21 Jul 2015 21:18:51 +0000 (23:18 +0200)]
Implemented 'hw status' and 'hw ping', put back client-side cacheing of 'hw version'

9 years agoiclass refactor/cleanup
marshmellow42 [Tue, 21 Jul 2015 18:26:46 +0000 (14:26 -0400)]
iclass refactor/cleanup

9 years agoMerge remote-tracking branch 'upstream/master' into iclass
marshmellow42 [Tue, 21 Jul 2015 01:26:35 +0000 (21:26 -0400)]
Merge remote-tracking branch 'upstream/master' into iclass

9 years agoMerge pull request #133 from marshmellow42/master
Martin Holst Swende [Mon, 20 Jul 2015 22:27:09 +0000 (00:27 +0200)]
Merge pull request #133 from marshmellow42/master

14b additions + some bug fixes

9 years agoMinor changes in iso1443-standalone mode
Martin Holst Swende [Mon, 20 Jul 2015 22:13:06 +0000 (00:13 +0200)]
Minor changes in iso1443-standalone mode

Impressum, Datenschutz