]>
cvs.zerfleddert.de Git - proxmark3-svn/log
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
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
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.
marshmellow42 [Sun, 22 Mar 2015 19:28:48 +0000 (15:28 -0400)]
lf t5 read plus lf demod adjustments
lf t5xx commands updated from ICEMAN
lf em410x commands updated
lf search bug fix for 2 args
test scripts from iceman
lf demod:
better ask clock detection with Strong fully clipped waves
better ask raw demod with strong fully clipped waves
fsk demod add back in skipped bits during demod
nrz demod add back in skipped bits during demod
iceman1001 [Fri, 20 Mar 2015 10:48:47 +0000 (11:48 +0100)]
ADD: Added em410x de-scramble patterns: Paxton, Sebury, Pattern1.
iceman1001 [Thu, 19 Mar 2015 21:50:23 +0000 (22:50 +0100)]
FIX: printEM410x - DEZ 10 was missing highest byte.
ADD: printEM410x - Now prints DEZ 3.5B
ADD: printEM410x - Now prints DEZ 3.5C
iceman1001 [Thu, 19 Mar 2015 21:20:35 +0000 (22:20 +0100)]
ADD: Implemented DEZ-20/ZK for EM410x decoding. Thanks to Asper for docs.
iceman1001 [Wed, 18 Mar 2015 19:34:17 +0000 (20:34 +0100)]
ADD: "HF MFU CRDBL", Started to add the password for reading blocks. Wasn't used before :(
iceman1001 [Wed, 18 Mar 2015 19:32:53 +0000 (20:32 +0100)]
ADD: cmdlf autocorrelations, also gives a hint to how many bytes the possible correlation is.
CHG: "LF SEARCH 1 U" didn't work since the strcmp was too short. Increased length of check.
FIX: @marshmellows fix for faulty em410xdecoding of length less than 64.
iceman1001 [Wed, 18 Mar 2015 19:29:58 +0000 (20:29 +0100)]
ADD: piwi's compiler flags -O2
iceman1001 [Wed, 18 Mar 2015 19:29:18 +0000 (20:29 +0100)]
FIX: test_t55x7_psk.lua now correctly handles bitrate/modulation/clockrate combinations for PSK1.
Uncomment lines in main to test PSK2, PSK3.
iceman1001 [Wed, 18 Mar 2015 16:32:43 +0000 (17:32 +0100)]
ADD: new tests for the T55XX commands.
CHG: minor output messages in cmdlft55xx.c
iceman1001 [Mon, 16 Mar 2015 21:45:06 +0000 (22:45 +0100)]
FIX: narrowed down the detect modulation even further.
FIX: minor adjustment to t55xx inside of lfops.c when waiting for the antenna to settle.
FIX: added the possiblity to use graphbuffer fpr LF T55XX DETECT/TRACE/INFO .
MISSING:
the detect, trace, info, doesn't use a password for those tags with enabled password-mode.
Martin Holst Swende [Mon, 16 Mar 2015 13:03:48 +0000 (14:03 +0100)]
Merge pull request #80 from marshmellow42/master
FIX EM Error
iceman1001 [Mon, 16 Mar 2015 13:02:08 +0000 (14:02 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
marshmellow42 [Mon, 16 Mar 2015 12:39:18 +0000 (08:39 -0400)]
FIX EM Error
missed two files for last push.. sorry
iceman1001 [Mon, 16 Mar 2015 12:13:18 +0000 (13:13 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
armsrc/lfops.c
client/cmddata.c
common/crc.c
common/crc.h
common/lfdemod.c
include/crc.h
include/crc.h.old
iceman1001 [Mon, 16 Mar 2015 10:40:44 +0000 (11:40 +0100)]
CHG: removed an extra space.
iceman1001 [Mon, 16 Mar 2015 10:39:31 +0000 (11:39 +0100)]
CHG: @Marshmellow came up with some nifty nice ideas for the t55xx modulation detection, and some minor corrections regarding the enum,
CHG: @Marshmellow added PSK1, PSK2, PSK3. Almost complete now. Waiting for Biphase.
ADD: @Marshmellows lf- psk demod changes,
CHG: In "lf t55xx info" the manufacturerer name is now identified and printed.
CHG: In "lf t55xx info" the modell name is now identified and printed, however it can only identify two models presently.
Martin Holst Swende [Mon, 16 Mar 2015 10:39:03 +0000 (11:39 +0100)]
Merge pull request #78 from marshmellow42/master
add pyramid CS, minor psk demod fixes, minor g-prox-ii demod fix, autocorrelate improvement
marshmellow42 [Mon, 16 Mar 2015 02:03:50 +0000 (22:03 -0400)]
adjust ask/biphase handling - more complete
also added XL EM410x formats
iceman1001 [Sun, 15 Mar 2015 20:36:38 +0000 (21:36 +0100)]
FIX: lf t55xx config now handles offsets.
FIX: lf t55xx trace now handles offsets.
FIX: lf t55xx info now handles offsets.
iceman1001 [Sat, 14 Mar 2015 07:43:48 +0000 (08:43 +0100)]
ADD: started to add a offset possibility for the LF T55XX.
Ie.
lf t55xx read 0
lf t55xx special
lf t55xx config o 2
lf t55xx read 0
ADD: added @marshmellows latest changes to psk
marshmellow42 [Sat, 14 Mar 2015 00:49:34 +0000 (20:49 -0400)]
adjust pskdemod
add skipped bits before first phase back in
PSKDemod now returns 1 for success or 0 for fail like other demods
iceman1001 [Fri, 13 Mar 2015 20:24:37 +0000 (21:24 +0100)]
CHG: minor output change, when printing found multiple modulations
CHG: PSKDemod should be called like this according @Marshmellow
iceman1001 [Fri, 13 Mar 2015 20:02:04 +0000 (21:02 +0100)]
CHG: now with enums :)
iceman1001 [Fri, 13 Mar 2015 18:12:11 +0000 (19:12 +0100)]
ADD: printConfiguration method for a nice printout of the selected configuration.
marshmellow42 [Fri, 13 Mar 2015 18:00:11 +0000 (14:00 -0400)]
give credit where credit is due
thanks iceman for the crc :)
iceman1001 [Fri, 13 Mar 2015 17:50:30 +0000 (18:50 +0100)]
CHG: Removed an unneccesary parameter for "hf mf sim"
iceman1001 [Fri, 13 Mar 2015 17:49:43 +0000 (18:49 +0100)]
FIX: removed a debug statement
FIX: initialisation of some variables is done correct.
iceman1001 [Fri, 13 Mar 2015 16:36:40 +0000 (17:36 +0100)]
FIX: lf t55xx commands seem to work like they should. Detect now detects between FSK/ASK/NZ/PSK
marshmellow42 [Fri, 13 Mar 2015 16:23:26 +0000 (12:23 -0400)]
data autocorr additions
marshmellow42 [Fri, 13 Mar 2015 15:20:00 +0000 (11:20 -0400)]
Merge remote-tracking branch 'upstream/master'
marshmellow42 [Fri, 13 Mar 2015 15:18:55 +0000 (11:18 -0400)]
minor g-prox-ii demod fix
lf search was occasionally outputting false results.
marshmellow42 [Fri, 13 Mar 2015 15:09:12 +0000 (11:09 -0400)]
data psk demod minor fixes, pyramid demod add CS
also adjusted autocorrelate and added a printout for lf search u
iceman1001 [Fri, 13 Mar 2015 09:05:37 +0000 (10:05 +0100)]
CHG: rename of methods to follow naming convention
CHG: LF T55XX CONFIG now defaults to ASK, non-inverse
iceman1001 [Fri, 13 Mar 2015 08:22:12 +0000 (09:22 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Fri, 13 Mar 2015 08:00:04 +0000 (09:00 +0100)]
FIX: Marshmellow hinted that I should use another fskclock method, which obeys the verbose parameter.
iceman1001 [Fri, 13 Mar 2015 07:59:07 +0000 (08:59 +0100)]
CHG: removed a loop after suggestions that it was unnecessary.
pwpiwi [Fri, 13 Mar 2015 06:24:56 +0000 (07:24 +0100)]
Merge pull request #75 from pwpiwi/qtmakefile
(issue #47) use Qt5 includes and libraries, if present
iceman1001 [Thu, 12 Mar 2015 22:04:02 +0000 (23:04 +0100)]
FIX: adding a test to see if we managed to get the correct demodulation from an unknown t55x7 tag.
By checking if the configuration data (page 0, block 0) has some settings that must be the same. think reserved 7bits, This is a trail and error approach.
But together with setting a manual configuration to read a tag and this automatic verification it will help out alot I think.
iceman1001 [Thu, 12 Mar 2015 19:33:36 +0000 (20:33 +0100)]
FIX: @marshmellow found out that the CRC-8/Maxim was not always giving the right checksum. Change POLY from 0x31 -> 0x8C
iceman1001 [Thu, 12 Mar 2015 18:44:07 +0000 (19:44 +0100)]
ADD: LF T55XX CONFIG, is almost there, Usage: lf t55xx config [d <demodulation>] [i 1]
Options:
h This help
d <FSK|ASK|PSK|NZ|BI> Set demodulation FSK / ASK / PSK / NZ / Biphase
i [1] Inverse data signal, defaults to normal
Examples:
lf t55xx config d FSK - FSK demodulation
lf t55xx config d FSK i 1 - FSK demodulation, inverse data
iceman1001 [Thu, 12 Mar 2015 18:01:09 +0000 (19:01 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Martin Holst Swende [Thu, 12 Mar 2015 17:15:08 +0000 (18:15 +0100)]
Merge pull request #77 from Proxmark/usb_check
Implemented usb_poll() within LF sim.
Martin Holst Swende [Thu, 12 Mar 2015 15:32:01 +0000 (16:32 +0100)]
Implemented usb_poll() within LF sim. This means the LF sim will be aborted whenever something comes over the USB
iceman1001 [Thu, 12 Mar 2015 13:12:14 +0000 (14:12 +0100)]
FIX: move and rename the CRC8Maxim method into crc.c
iceman1001 [Thu, 12 Mar 2015 09:10:22 +0000 (10:10 +0100)]
ADD: added a reference to a generic CRC-8 checksum algo in common/crc.c
iceman1001 [Thu, 12 Mar 2015 08:50:22 +0000 (09:50 +0100)]
add: a experimental lualib, unstable.
fix: Introduced a wrong variable name due to "cut & paste" before, now fixed.
iceman1001 [Thu, 12 Mar 2015 08:46:28 +0000 (09:46 +0100)]
FIX: correct some lookups in tnp3dump.lua, tnp3sim.lua
ADD: added optional parameter (-p) to tnp3dump.lua
iceman1001 [Wed, 11 Mar 2015 21:43:49 +0000 (22:43 +0100)]
FIX: minor correction of the command description for HF 14A RAW.
iceman1001 [Wed, 11 Mar 2015 21:21:01 +0000 (22:21 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Wed, 11 Mar 2015 21:06:23 +0000 (22:06 +0100)]
ADD: added a CRC64_ECMA implementation
pwpiwi [Wed, 11 Mar 2015 19:17:24 +0000 (20:17 +0100)]
fix: hf 14a raw was broken
(see http://www.proxmark.org/forum/viewtopic.php?id=2351)
pwpiwi [Tue, 10 Mar 2015 18:00:39 +0000 (19:00 +0100)]
(issue #47) use Qt5 includes and libraries, if present
iceman1001 [Tue, 10 Mar 2015 08:18:35 +0000 (09:18 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
client/cmddata.c
client/cmddata.h
Martin Holst Swende [Mon, 9 Mar 2015 23:25:51 +0000 (00:25 +0100)]
Merge pull request #74 from marshmellow42/master
new and fixed lf sim commands, lf demod refactoring, data gproxIIdemod
iceman1001 [Mon, 9 Mar 2015 21:03:24 +0000 (22:03 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
marshmellow42 [Mon, 9 Mar 2015 20:56:00 +0000 (16:56 -0400)]
finish data printdemodbuffer command
pwpiwi [Mon, 9 Mar 2015 20:36:27 +0000 (21:36 +0100)]
fix: (issue #73) hf mf cload didn't work. Add more annotations for Magic Cards operation.
marshmellow42 [Mon, 9 Mar 2015 19:58:06 +0000 (15:58 -0400)]
sim buffer max settings tests
marshmellow42 [Mon, 9 Mar 2015 19:27:20 +0000 (15:27 -0400)]
biphase bug fixes
pwpiwi [Mon, 9 Mar 2015 19:01:37 +0000 (20:01 +0100)]
fix: broken edge detector implementation in hi_iso14443a.v resulted in decreased sensitivity
marshmellow42 [Sun, 8 Mar 2015 22:07:01 +0000 (18:07 -0400)]
fixed rawdemod help options
marshmellow42 [Sun, 8 Mar 2015 04:31:23 +0000 (23:31 -0500)]
1 bug fix + code trimming
marshmellow42 [Fri, 6 Mar 2015 17:30:16 +0000 (12:30 -0500)]
Merge remote-tracking branch 'upstream/master'
marshmellow42 [Fri, 6 Mar 2015 17:28:54 +0000 (12:28 -0500)]
lf sim fixes/creations correct now
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
marshmellow42 [Fri, 6 Mar 2015 17:26:33 +0000 (12:26 -0500)]
Revert "lf sim fixes/creations"
This reverts commit
293de1bad7bbea39eb285b2297760d51cccf07b3 .
marshmellow42 [Fri, 6 Mar 2015 17:25:36 +0000 (12:25 -0500)]
lf sim fixes/creations
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
iceman1001 [Fri, 6 Mar 2015 08:02:15 +0000 (09:02 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
armsrc/crapto1.c
armsrc/iclass.c
client/nonce2key/crapto1.c
pwpiwi [Fri, 6 Mar 2015 06:39:34 +0000 (07:39 +0100)]
fix: (issue #72) LF simulation didn't work with lo_edge_detect.v
ikarus [Wed, 4 Mar 2015 10:00:39 +0000 (11:00 +0100)]
Fixed issue #36 & improved file consistency.
marshmellow42 [Wed, 4 Mar 2015 01:44:37 +0000 (20:44 -0500)]
Merge remote-tracking branch 'upstream/master'
marshmellow42 [Tue, 3 Mar 2015 21:20:18 +0000 (16:20 -0500)]
finish gProxII_Demod
Martin Holst Swende [Mon, 2 Mar 2015 20:30:22 +0000 (21:30 +0100)]
iClass full simulation of tags now officially works, with some cheating regarding reader update and write commands
Martin Holst Swende [Mon, 2 Mar 2015 20:05:44 +0000 (21:05 +0100)]
Added brackets around crc field in protocol listings
marshmellow42 [Mon, 2 Mar 2015 19:44:05 +0000 (14:44 -0500)]
oops... should this file should not have been there
marshmellow42 [Mon, 2 Mar 2015 19:42:55 +0000 (14:42 -0500)]
lf cmds fix, add, show
show command to UI:
data printdemodbuffer - allow printing of demod buffer
Add:
data askgproxiidemod - demod a gproxii tag
Fix:
adjust lf simxxx commands further for testing