]>
git.zerfleddert.de Git - proxmark3-svn/log
marshmellow42 [Wed, 29 Apr 2015 22:27:31 +0000 (18:27 -0400)]
MF Ultralight - Iceman's updates + mine
Beginning of Ultralight additions.
detection of Ultralight Types added
dump command now auto detects type
can authenticate Ultralight C
iceman1001 [Wed, 29 Apr 2015 18:24:37 +0000 (20:24 +0200)]
CHG: re-factored the "HF MFU CAUTH" command to be simpler.
ADD: "HF MFU INFO", added detection of MAGIC UL-C tags and a simple loop test 5 default 3des keys.
Martin Holst Swende [Wed, 29 Apr 2015 06:00:25 +0000 (08:00 +0200)]
Merge pull request #99 from Drewgoo/patch-1
Update README.txt
Drewgoo [Wed, 29 Apr 2015 04:47:49 +0000 (22:47 -0600)]
Update README.txt
typo
iceman1001 [Tue, 28 Apr 2015 21:34:16 +0000 (23:34 +0200)]
REM: Removed the CSETUID stub. Its implemented on the client side instead.
iceman1001 [Tue, 28 Apr 2015 21:32:45 +0000 (23:32 +0200)]
REM: Removed the GetVendorStr, and used the getTagInfo() instead.
iceman1001 [Tue, 28 Apr 2015 21:31:22 +0000 (23:31 +0200)]
ADD: HF MFU SETUID, this commands helps changing the UID on a magic UL, UL-C tag.
It reads block2, since only one byte is going to change. Then it proceds to write block 0,1,2 with recalc BCC1, BCC2 bytes.
CHG: HF MFU INFO, got some love in the form of detection of UL/UL-C/UL-EV1. Took same idea from HF 14A READER.
Martin Holst Swende [Tue, 28 Apr 2015 21:08:28 +0000 (23:08 +0200)]
Merge pull request #98 from marshmellow42/master
Iceman's fixes for #93, #96, #97
marshmellow42 [Tue, 28 Apr 2015 19:53:07 +0000 (15:53 -0400)]
Iceman's script aes fix #93
Thanks Iceman (note I did not have a tag to double test this one. :)
marshmellow42 [Tue, 28 Apr 2015 19:43:58 +0000 (15:43 -0400)]
Iceman's mf sim 7bt UID fix from #97
marshmellow42 [Tue, 28 Apr 2015 19:35:23 +0000 (15:35 -0400)]
Iceman's Issue #96 fix
iceman1001 [Tue, 28 Apr 2015 18:59:20 +0000 (20:59 +0200)]
CHG: added some sanity checks for the Ultralight-EV1 annotations, to make less false positives in the tracelog
iceman1001 [Tue, 28 Apr 2015 18:58:18 +0000 (20:58 +0200)]
CHG: fixed a better detection for Ultralight, Ultralight-C, Ultralight-EV1 tags.
--see https://github.com/Proxmark/proxmark3/issues/96
-- still todo, finding a good way of detecting Magic Ultralight-C tags.
-- thanks @marshmellow for pointing out proper UL-C tags responses is different.
iceman1001 [Sun, 26 Apr 2015 16:06:36 +0000 (18:06 +0200)]
FIX: forgot an argument.
iceman1001 [Sun, 26 Apr 2015 16:05:45 +0000 (18:05 +0200)]
CHG: removed linebreak in string.
iceman1001 [Sun, 26 Apr 2015 16:05:06 +0000 (18:05 +0200)]
ADD: some more default keys.
iceman1001 [Sun, 26 Apr 2015 16:03:57 +0000 (18:03 +0200)]
CHG: added some linebreaks for the help output in LF.
iceman1001 [Sun, 26 Apr 2015 16:03:21 +0000 (18:03 +0200)]
ADD: "HF 14A READ", got ULTRALIGHT C / EV1 annotation
iceman1001 [Fri, 24 Apr 2015 17:04:01 +0000 (19:04 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
client/cmddata.c
client/cmddata.h
client/cmdhfmf.c
client/cmdlf.c
client/cmdlfem4x.h
client/cmdlft55xx.c
client/lualibs/default_toys.lua
client/scripts/tnp3clone.lua
client/scripts/tnp3dump.lua
client/scripts/tnp3sim.lua
iceman1001 [Fri, 24 Apr 2015 16:41:49 +0000 (18:41 +0200)]
ADD: Started a "collect nonces" concept to be able to analyse the tag generated nonces.
iceman1001 [Fri, 24 Apr 2015 16:38:24 +0000 (18:38 +0200)]
ADD: changes to the Ultralight diviersification algo.
iceman1001 [Fri, 24 Apr 2015 16:37:40 +0000 (18:37 +0200)]
ADD: charatect name, level, sequence number,
CHG: minor code clean up.
iceman1001 [Fri, 24 Apr 2015 16:36:11 +0000 (18:36 +0200)]
CHG: some minor code cleanup.
iceman1001 [Fri, 24 Apr 2015 16:35:09 +0000 (18:35 +0200)]
ADD: found another sub-type,
iceman1001 [Fri, 24 Apr 2015 16:34:24 +0000 (18:34 +0200)]
ADD: more toy-tokens, among others some missing swapforce.
iceman1001 [Fri, 24 Apr 2015 16:33:31 +0000 (18:33 +0200)]
ADD: some missing enums:
ISO14A_SET_TIMEOUT = 0x40,
ISO14A_NO_SELECT = 0x80,
ISO14A_TOPAZMODE = 0x100
iceman1001 [Fri, 24 Apr 2015 16:19:51 +0000 (18:19 +0200)]
ADD: a minor modification to "HF 14A READ" to enable the correct identification between ULTRALIGHT / ULTRALIGHT-C / ULTRALIGHT EV1 tags.
Martin Holst Swende [Thu, 23 Apr 2015 07:51:04 +0000 (09:51 +0200)]
Merge branch 'master' of github.com:Proxmark/proxmark3
Martin Holst Swende [Thu, 23 Apr 2015 07:50:44 +0000 (09:50 +0200)]
Fixed issue with dumping iclass tags > 2KB in size
Martin Holst Swende [Tue, 14 Apr 2015 18:36:10 +0000 (20:36 +0200)]
Merge pull request #92 from marshmellow42/master
lf cleanup, dedup & minor additions
marshmellow42 [Fri, 10 Apr 2015 04:06:59 +0000 (00:06 -0400)]
minor change to lf em4x menu & iceman script...
...updates
iceman1001 [Thu, 9 Apr 2015 18:38:38 +0000 (20:38 +0200)]
CHG: removed unused code.
FIX: moved some checks to make the script run a tad bit faster.
iceman1001 [Thu, 9 Apr 2015 18:36:12 +0000 (20:36 +0200)]
CHG: changed some help texts.
iceman1001 [Thu, 9 Apr 2015 18:35:04 +0000 (20:35 +0200)]
FIX: some minor corrections to identify more tokens.
iceman1001 [Thu, 9 Apr 2015 18:34:34 +0000 (20:34 +0200)]
FIX: fixed a minor bug introduced when changing from OpenSSL -> PolarSSL.
ADD: changed code to handle both encrypt and decrypt AES 128.
iceman1001 [Wed, 8 Apr 2015 19:24:08 +0000 (21:24 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
marshmellow42 [Wed, 8 Apr 2015 19:08:05 +0000 (15:08 -0400)]
nexwatch fix .h file + icemans mf csetblk w arg
forgot to include the new nexwatch command in the header...
added icemans hf mf csetblk w parameter fix
marshmellow42 [Wed, 8 Apr 2015 18:19:19 +0000 (14:19 -0400)]
Merge remote-tracking branch 'upstream/master'
marshmellow42 [Wed, 8 Apr 2015 18:19:03 +0000 (14:19 -0400)]
added nexwatch demod & iceman lua
added nexwatch demod (also added to lf search)
added iceman's lua script adjustments
marshmellow42 [Wed, 8 Apr 2015 15:18:29 +0000 (11:18 -0400)]
fix to lf t5 detect/read cmds
i think this functions fairly well...
still some issues with demod positioning for various reasons.
ASK/Biph/FSK work pretty well
the PSK Demod still needs a little attention to help it better demod
various carriers...
marshmellow42 [Wed, 8 Apr 2015 14:12:24 +0000 (10:12 -0400)]
update t5 detection test()
missed this file in last commit... sorry.
Martin Holst Swende [Wed, 8 Apr 2015 11:31:04 +0000 (13:31 +0200)]
Fixed buffer initialization errors, as reported in http://www.proxmark.org/forum/viewtopic.php?pid=15337#p15337
marshmellow42 [Wed, 8 Apr 2015 05:07:39 +0000 (01:07 -0400)]
lf ask consolidation
backend:
askman and askraw demods merged into askdemod (args adjusted
accordingly)
re-arranged lfdemod.h in alphabetical order and by category
front end:
data detectclock a (ask) now also reports the selected best start
position for demod
data manrawdecode takes an invert arg now
iceman1001 [Tue, 7 Apr 2015 16:05:35 +0000 (18:05 +0200)]
FIX: two parentheses were missing.
FIX: setting the default key to Oxff bug. (http://www.proxmark.org/forum/viewtopic.php?pid15325#p15325)
FIX: proper initialisation of variables ;)
iceman1001 [Tue, 7 Apr 2015 16:02:29 +0000 (18:02 +0200)]
FIX: a wrong comment inside default_toys.lua
FIX: a wrong linking to default_toys.lua in tnp3 scripts.
marshmellow42 [Tue, 7 Apr 2015 04:53:06 +0000 (00:53 -0400)]
lf cleaning++
data askedgedetect - removed unneeded code
lf em em4x50read bug fix / error checking
graph-save/restore auto repaint after restore.
marshmellow42 [Tue, 7 Apr 2015 03:17:30 +0000 (23:17 -0400)]
lf cleanup - fixes
more lf em em4x50read fixes
adjust heavy clipping ask clock detection
clean up t55xx minor items
Martin Holst Swende [Mon, 6 Apr 2015 19:47:09 +0000 (21:47 +0200)]
Added info to changelog about bootroom update
iceman1001 [Mon, 6 Apr 2015 16:52:20 +0000 (18:52 +0200)]
FIX: fixed a bug in "hf mf csetblock" where it didn't used the "w" wipe parameter before.
CHG: minor textual changes.
iceman1001 [Mon, 6 Apr 2015 16:49:44 +0000 (18:49 +0200)]
CHG: default_toys.lua is now able to correct identify over 200 different types.
iceman1001 [Mon, 6 Apr 2015 16:47:53 +0000 (18:47 +0200)]
CHG: fix the default_toys.lua file to handle more aspects of information for a given tag.
CHG: corrected a bug in tnp3clone.lua that made the script fail to "wipe" a magic tag.
CHG: minor textual change in ndef_dump.lua
marshmellow42 [Mon, 6 Apr 2015 01:59:36 +0000 (21:59 -0400)]
add maxErr to data manrawdecode
marshmellow42 [Sun, 5 Apr 2015 20:37:41 +0000 (16:37 -0400)]
lf t5xx - icemans update
iceman1001 [Sun, 5 Apr 2015 15:02:13 +0000 (17:02 +0200)]
FIX: the test scripts hade a problem when sending the new configuration block.
iceman1001 [Sun, 5 Apr 2015 12:28:29 +0000 (14:28 +0200)]
CHG: change the snprint call in GetModelStrFromCID.
CHG: tighten up the maxium allowed errors in Biphase (from 1 to zero allowed errors)
iceman1001 [Sun, 5 Apr 2015 12:27:12 +0000 (14:27 +0200)]
CHG: the default_toys.lua has the index bytes in mix endiansness. I tried to clean it up and verify them.
CHG: The tnp3clone.lua is now faster, and uses the "wipe" parameter to clean the tag before writing all data.
marshmellow42 [Sun, 5 Apr 2015 04:58:57 +0000 (00:58 -0400)]
lf cleaning
remove unneeded code/functions
fix lfdemod askmandemod bug with maxErr=0
silence output for getting samples in lf search
marshmellow42 [Sun, 5 Apr 2015 01:29:16 +0000 (21:29 -0400)]
Merge remote-tracking branch 'upstream/master'
marshmellow42 [Fri, 3 Apr 2015 04:40:38 +0000 (00:40 -0400)]
update changelog
marshmellow42 [Fri, 3 Apr 2015 03:55:12 +0000 (23:55 -0400)]
lfdemod reduce duplicate code
remove check for best start position in demods and adjust the clock
detect to always return best start position to the demods
also small bug fix in lf em em4x50read
marshmellow42 [Thu, 2 Apr 2015 16:48:52 +0000 (12:48 -0400)]
lfem4x cleanup/add/fix
changed spacing to tabs for cmdlfem4x.c
finished the partially built lf em em4x50read function
added save/restore GraphBuffer function in graph.c
adjusted some tolerances in lfdemod.c
added a maxLen argument to the askmandemod
iceman1001 [Thu, 2 Apr 2015 10:08:57 +0000 (12:08 +0200)]
CHG: minor text changes.
CHG: cmd+2, to skip first inparameter in string.
iceman1001 [Thu, 2 Apr 2015 10:07:51 +0000 (12:07 +0200)]
CHG: Script now also test to read block 0 via the chinese magic command if the normal read fails.
iceman1001 [Wed, 1 Apr 2015 16:02:10 +0000 (18:02 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
armsrc/Makefile
armsrc/lfops.c
client/cmdlft55xx.c
common/ldscript.common
common/lfdemod.c
iceman1001 [Wed, 1 Apr 2015 15:58:35 +0000 (17:58 +0200)]
ADD: added some changes from Marshmellow
CHG: minor change to the help text for "LF HITAG WRITE"
iceman1001 [Wed, 1 Apr 2015 15:57:07 +0000 (17:57 +0200)]
ADD: added some changes from Marshmellow
CHG: some minor changes to decode output for EM..
iceman1001 [Wed, 1 Apr 2015 15:55:44 +0000 (17:55 +0200)]
CHG: code cleanup , added the year control to t55xx trace command.
iceman1001 [Wed, 1 Apr 2015 15:54:19 +0000 (17:54 +0200)]
ADD: some changes from Marshmellow
iceman1001 [Wed, 1 Apr 2015 15:53:33 +0000 (17:53 +0200)]
CHG: minor comments.
iceman1001 [Wed, 1 Apr 2015 15:52:24 +0000 (17:52 +0200)]
CHG: revert -O2 -> -Os compile
Martin Holst Swende [Wed, 1 Apr 2015 07:24:29 +0000 (09:24 +0200)]
Compiler correctly identified a buffer overflow, fixed that and made the code use snprintf instead of unsafe sprintf
pwpiwi [Tue, 31 Mar 2015 20:57:33 +0000 (22:57 +0200)]
Merge pull request #89 from pwpiwi/image_shrink
Reclaim more than 19K of ARM flash memory.
Martin Holst Swende [Tue, 31 Mar 2015 20:11:19 +0000 (22:11 +0200)]
Merge pull request #91 from marshmellow42/master
lfdemod.c refactoring (+ bug fixes)
pwpiwi [Tue, 31 Mar 2015 19:38:58 +0000 (21:38 +0200)]
temporarily revert lfdemod float removal
marshmellow42 [Tue, 31 Mar 2015 15:30:16 +0000 (11:30 -0400)]
small fix in t5 trace data
marshmellow42 [Tue, 31 Mar 2015 14:49:06 +0000 (10:49 -0400)]
remove floats per piwi
pwpiwi [Tue, 31 Mar 2015 06:01:23 +0000 (08:01 +0200)]
Reclaim more than 19K of ARM flash memory.
- added compiler options -fdata-sections and -ffunction-sections (thanks to iceman for the hint)
- removed float operations from common/lfdemod.c to avoid adding float libraries to the ARM os image
- moved the fpga images to the data section to avoid reserving unused space for a separate section
iceman1001 [Mon, 30 Mar 2015 19:11:37 +0000 (21:11 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
armsrc/iclass.c
armsrc/lfops.c
client/cmdlf.c
common/lfdemod.c
include/usb_cmd.h
iceman1001 [Mon, 30 Mar 2015 14:32:04 +0000 (16:32 +0200)]
CHG: removed some commented code.
iceman1001 [Mon, 30 Mar 2015 14:31:13 +0000 (16:31 +0200)]
CHG: minor correction to the em410xsim help text.
iceman1001 [Mon, 30 Mar 2015 14:29:30 +0000 (16:29 +0200)]
CHG: adding some variable initalisation to the Uart.
iceman1001 [Mon, 30 Mar 2015 14:27:07 +0000 (16:27 +0200)]
CHG: Added the parameters -fdata-sections -ffunction-sections to common/Makefile.common for making the .elf filesize smaller.
REF: https://github.com/Proxmark/proxmark3/issues/83
iceman1001 [Mon, 30 Mar 2015 14:24:03 +0000 (16:24 +0200)]
NEW: HF MFU SETPWD - set password to a Ultralight C tag.
NEW: HF MFU SETUID - set UID to a magic UL / UL-C tag. *not implemented*
CHG: minor alignment for "Hf list" output.
CHG: removed unneeded function parameters to the ultralight commands
CHG: the const MAX_MIFARE_FRAME_SIZE is changed to MAX_FRAME_SIZE in the ultralight commands since the UL-Ev1 can have bigger frames than 18bytes.
CHG: adding DES support for the Ultralight-c read commands on deviceside.
iceman1001 [Mon, 30 Mar 2015 14:15:53 +0000 (16:15 +0200)]
CHG: minor fixes to some tnp luascripts
ADD: a script to make a barebone clone for tnp3 on a chinese magic s50 generation 1 tag.
Martin Holst Swende [Mon, 30 Mar 2015 05:51:45 +0000 (07:51 +0200)]
Created a changelog, to be used in accordance with http://keepachangelog.com
Martin Holst Swende [Sun, 29 Mar 2015 19:49:58 +0000 (21:49 +0200)]
Minor mod to 'hf iclass read', it now also reads and prints the configuration of the tag found
marshmellow42 [Sat, 28 Mar 2015 03:49:14 +0000 (23:49 -0400)]
Merge remote-tracking branch 'upstream/master'
marshmellow42 [Sat, 28 Mar 2015 03:47:31 +0000 (23:47 -0400)]
rawdemod param cleanup
plus lfdemod.h cleanup
marshmellow42 [Fri, 27 Mar 2015 04:02:30 +0000 (00:02 -0400)]
lfdemods streamline & bug fixes
removed duplicate code countPSK_FC - adjusted countFC to work.
bug fixes & streamlined code in:
lf hid fskdemod
lf em em410xdemod
cleaned up lfdemod.c some
Martin Holst Swende [Wed, 25 Mar 2015 19:23:41 +0000 (20:23 +0100)]
Merge pull request #86 from marshmellow42/master
Fixed indents to Tabs from Spaces
marshmellow42 [Wed, 25 Mar 2015 18:24:36 +0000 (14:24 -0400)]
Fixed indents to Tabs from Spaces
Spacing changes ONLY - no code changes
Martin Holst Swende [Wed, 25 Mar 2015 10:10:51 +0000 (11:10 +0100)]
Merge pull request #84 from marshmellow42/master
EM410x bug fix
marshmellow42 [Wed, 25 Mar 2015 03:05:46 +0000 (23:05 -0400)]
EM410x bug fix
marshmellow42 [Wed, 25 Mar 2015 02:11:32 +0000 (22:11 -0400)]
clean up em410x output
marshmellow42 [Wed, 25 Mar 2015 00:26:14 +0000 (20:26 -0400)]
EM410x bug fix
iceman1001 [Tue, 24 Mar 2015 10:45:31 +0000 (11:45 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
armsrc/lfops.c
client/cmddata.c
client/cmdlf.c
client/cmdlft55xx.c
client/cmdlft55xx.h
client/scripts/test_t55x7_bi.lua
Martin Holst Swende [Tue, 24 Mar 2015 10:10:16 +0000 (11:10 +0100)]
Merge pull request #82 from marshmellow42/master
lf ata55x7 commands and more
marshmellow42 [Tue, 24 Mar 2015 00:25:54 +0000 (20:25 -0400)]
remove debugging print calls
marshmellow42 [Mon, 23 Mar 2015 20:29:50 +0000 (16:29 -0400)]
lf updates
applies icemans full ata55x7 read/write settings
adds checksum to ioprox (thanks to iceman)
adds silent mode for lf read and getSamples
fix lf em em410xwatch and lf em410xspoof
improve data rawdemod ar - for biphase demods
improve detectclock a for strong antennas
iceman1001 [Mon, 23 Mar 2015 16:11:45 +0000 (17:11 +0100)]
ADD: added the ioprox checksum test to IOdemodFSK
MENTIONED HERE: http://www.proxmark.org/forum/viewtopic.php?id=364&p=6
ADD: changed the layout of the HID descramble patterns a bit, and rearranged some hex/dec outputs.