]> git.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
8 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

8 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

8 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

8 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

8 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

8 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!

8 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).

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

8 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

8 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.

8 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`.

8 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

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

8 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

8 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'

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

8 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

8 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

8 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

8 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

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

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

8 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...

8 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.

8 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

8 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)

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

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

8 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

8 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

8 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

8 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

8 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

8 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.

8 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

8 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

8 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

8 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

8 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

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

8 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

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

8 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...

8 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

8 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

8 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

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

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

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

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

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

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

8 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

8 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

8 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

8 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.

8 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

8 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

8 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.

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

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

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

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

8 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)

8 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

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

8 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'

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

8 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

8 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

8 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

8 years agoMerge remote-tracking branch 'upstream/master' 133/head
marshmellow42 [Mon, 20 Jul 2015 21:29:52 +0000 (17:29 -0400)]
Merge remote-tracking branch 'upstream/master'

8 years agoMerge pull request #130 from VERTCraig/StandAlone14a
Martin Holst Swende [Mon, 20 Jul 2015 21:23:44 +0000 (23:23 +0200)]
Merge pull request #130 from VERTCraig/StandAlone14a

ISO14443a Stand-Alone Mode

8 years agoMerge pull request #131 from holiman/master
Martin Holst Swende [Mon, 20 Jul 2015 21:22:53 +0000 (23:22 +0200)]
Merge pull request #131 from holiman/master

Fixes to PR #129

8 years agoMinor fix with previous cache-removal 131/head
Martin Holst Swende [Mon, 20 Jul 2015 21:22:33 +0000 (23:22 +0200)]
Minor fix with previous cache-removal

8 years agoFixed some indentation
Martin Holst Swende [Mon, 20 Jul 2015 21:18:46 +0000 (23:18 +0200)]
Fixed some indentation

8 years agoReverted previous change to , I made it no longer cache previous results
Martin Holst Swende [Mon, 20 Jul 2015 21:17:55 +0000 (23:17 +0200)]
Reverted previous change to , I made it no longer cache previous results

8 years agoiclass additions
marshmellow42 [Mon, 20 Jul 2015 17:41:40 +0000 (13:41 -0400)]
iclass additions

multiple contributors - thanks!

8 years agoClear command buffer
Martin Holst Swende [Fri, 17 Jul 2015 19:49:27 +0000 (21:49 +0200)]
Clear command buffer

8 years agoPotential fix for 0-length usb packets seen on OSX
Martin Holst Swende [Thu, 16 Jul 2015 22:01:58 +0000 (00:01 +0200)]
Potential fix for 0-length usb packets seen on OSX

8 years agoFixed (?) issues from PR #129
Martin Holst Swende [Thu, 16 Jul 2015 21:50:41 +0000 (23:50 +0200)]
Fixed (?) issues from PR #129

8 years agoChanged indentation to tabs
Martin Holst Swende [Thu, 16 Jul 2015 20:47:14 +0000 (22:47 +0200)]
Changed indentation to tabs

8 years agoMerge pull request #129 from VERTCraig/master
Martin Holst Swende [Thu, 16 Jul 2015 20:41:22 +0000 (22:41 +0200)]
Merge pull request #129 from VERTCraig/master

AWID26 Extended Support

8 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Thu, 16 Jul 2015 02:25:11 +0000 (22:25 -0400)]
Merge remote-tracking branch 'upstream/master'

Conflicts:
armsrc/iso14443b.c

8 years agoIntroducing a stand-alone mode for working with NFC (ISO14443a) tag UIDs. 130/head
Craig Young [Mon, 13 Jul 2015 22:46:42 +0000 (18:46 -0400)]
Introducing a stand-alone mode for working with NFC (ISO14443a) tag UIDs.

8 years agoAdding usage information to 'lf awid' commands 129/head
Craig Young [Mon, 13 Jul 2015 22:14:12 +0000 (18:14 -0400)]
Adding usage information to 'lf awid' commands

8 years agoAdding 'lf awid' context to cmdlf.c
Craig Young [Mon, 13 Jul 2015 20:47:11 +0000 (16:47 -0400)]
Adding 'lf awid' context to cmdlf.c

8 years agoUpdated CHANGELOG.md
Craig Young [Mon, 13 Jul 2015 20:41:50 +0000 (16:41 -0400)]
Updated CHANGELOG.md

8 years agoAdding CMD_AWID_DEMOD_FSK to commands.lua
Craig Young [Mon, 13 Jul 2015 20:18:59 +0000 (16:18 -0400)]
Adding CMD_AWID_DEMOD_FSK to commands.lua

8 years agoAdding support for AWID26 realtime demodulation as well as cloning and simulation...
Craig Young [Mon, 13 Jul 2015 19:45:28 +0000 (15:45 -0400)]
Adding support for AWID26 realtime demodulation as well as cloning and simulation from facility code and card number

8 years agoMerge pull request #127 from frederikmoellers/master
Martin Holst Swende [Mon, 13 Jul 2015 10:22:10 +0000 (12:22 +0200)]
Merge pull request #127 from frederikmoellers/master

ISO 14443 type B support for (German) electronic ID cards

8 years agoMention EPA Type A/B support in CHANGELOG.md 127/head
Frederik Möllers [Mon, 13 Jul 2015 09:37:28 +0000 (11:37 +0200)]
Mention EPA Type A/B support in CHANGELOG.md

8 years agoMerge upstream/master
Frederik Möllers [Mon, 13 Jul 2015 09:29:33 +0000 (11:29 +0200)]
Merge upstream/master

A new release has been pushed in the meantime and the changelog reflects
this. Things to be added to the changelog should thus go into the new
unreleased block.

8 years agoNew release with FPGA compression v2.2.0
Martin Holst Swende [Sun, 12 Jul 2015 21:44:34 +0000 (23:44 +0200)]
New release with FPGA compression

8 years agoSome info in the changelog
Martin Holst Swende [Sun, 12 Jul 2015 21:39:27 +0000 (23:39 +0200)]
Some info in the changelog

8 years agoFixed issue #94, so lua-script 'mifare_autopwn' reacts correctly to card that are...
Martin Holst Swende [Sun, 12 Jul 2015 21:38:52 +0000 (23:38 +0200)]
Fixed issue #94, so lua-script 'mifare_autopwn' reacts correctly to card that are not vulnerable to darkside-attacks

8 years agoinitialize global variables.
marshmellow42 [Sat, 11 Jul 2015 04:35:27 +0000 (00:35 -0400)]
initialize global variables.

8 years ago- fix: trace of hf mf mifare had always been cleared by mfCheckKeys() in nonce2key()
pwpiwi [Thu, 2 Jul 2015 06:49:34 +0000 (08:49 +0200)]
- 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

8 years agofix white spaces
marshmellow42 [Mon, 6 Jul 2015 19:47:03 +0000 (15:47 -0400)]
fix white spaces

8 years agoISO 14443 type B support for EPA functionality
Frederik Möllers [Mon, 6 Jul 2015 16:01:34 +0000 (18:01 +0200)]
ISO 14443 type B support for EPA functionality

Added iso14443b_setup and iso14443b_apdu for general setup and
communication with ISO 14443 type B tags.
Updated EPA (German electronic ID card) functionality to support both
card types.

Impressum, Datenschutz