proxmark3-svn
7 years agoUpdate README.txt 99/head
Drewgoo [Wed, 29 Apr 2015 04:47:49 +0000 (22:47 -0600)]
Update README.txt

typo

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

7 years agoIceman's script aes fix #93 98/head
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. :)

7 years agoIceman's mf sim 7bt UID fix from #97
marshmellow42 [Tue, 28 Apr 2015 19:43:58 +0000 (15:43 -0400)]
Iceman's mf sim 7bt UID fix from #97

7 years agoIceman's Issue #96 fix
marshmellow42 [Tue, 28 Apr 2015 19:35:23 +0000 (15:35 -0400)]
Iceman's Issue #96 fix

7 years agoMerge branch 'master' of github.com:Proxmark/proxmark3
Martin Holst Swende [Thu, 23 Apr 2015 07:51:04 +0000 (09:51 +0200)]
Merge branch 'master' of github.com:Proxmark/proxmark3

7 years agoFixed issue with dumping iclass tags > 2KB in size
Martin Holst Swende [Thu, 23 Apr 2015 07:50:44 +0000 (09:50 +0200)]
Fixed issue with dumping iclass tags > 2KB in size

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

7 years agominor change to lf em4x menu & iceman script... 92/head
marshmellow42 [Fri, 10 Apr 2015 04:06:59 +0000 (00:06 -0400)]
minor change to lf em4x menu & iceman script...

...updates

7 years agonexwatch fix .h file + icemans mf csetblk w arg
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

7 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Wed, 8 Apr 2015 18:19:19 +0000 (14:19 -0400)]
Merge remote-tracking branch 'upstream/master'

7 years agoadded nexwatch demod & iceman lua
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

7 years agofix to lf t5 detect/read cmds
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...

7 years agoupdate t5 detection test()
marshmellow42 [Wed, 8 Apr 2015 14:12:24 +0000 (10:12 -0400)]
update t5 detection test()

missed this file in last commit... sorry.

7 years agoFixed buffer initialization errors, as reported in http://www.proxmark.org/forum...
Martin Holst Swende [Wed, 8 Apr 2015 11:31:04 +0000 (13:31 +0200)]
Fixed buffer initialization errors, as reported in proxmark.org/forum/viewtopic.php?pid=15337#p15337

7 years agolf ask consolidation
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

7 years agolf cleaning++
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.

7 years agolf cleanup - fixes
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

7 years agoAdded info to changelog about bootroom update
Martin Holst Swende [Mon, 6 Apr 2015 19:47:09 +0000 (21:47 +0200)]
Added info to changelog about bootroom update

7 years agoadd maxErr to data manrawdecode
marshmellow42 [Mon, 6 Apr 2015 01:59:36 +0000 (21:59 -0400)]
add maxErr to data manrawdecode

7 years agolf t5xx - icemans update
marshmellow42 [Sun, 5 Apr 2015 20:37:41 +0000 (16:37 -0400)]
lf t5xx - icemans update

7 years agolf cleaning
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

7 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Sun, 5 Apr 2015 01:29:16 +0000 (21:29 -0400)]
Merge remote-tracking branch 'upstream/master'

7 years agoupdate changelog
marshmellow42 [Fri, 3 Apr 2015 04:40:38 +0000 (00:40 -0400)]
update changelog

7 years agolfdemod reduce duplicate code
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

7 years agolfem4x cleanup/add/fix
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

7 years agoCompiler correctly identified a buffer overflow, fixed that and made the code use...
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

7 years agoMerge pull request #89 from pwpiwi/image_shrink
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.

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

7 years agotemporarily revert lfdemod float removal 89/head
pwpiwi [Tue, 31 Mar 2015 19:38:58 +0000 (21:38 +0200)]
temporarily revert lfdemod float removal

7 years agosmall fix in t5 trace data 91/head
marshmellow42 [Tue, 31 Mar 2015 15:30:16 +0000 (11:30 -0400)]
small fix in t5 trace data

7 years agoremove floats per piwi
marshmellow42 [Tue, 31 Mar 2015 14:49:06 +0000 (10:49 -0400)]
remove floats per piwi

7 years agoReclaim more than 19K of ARM flash memory.
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

7 years agoCreated a changelog, to be used in accordance with http://keepachangelog.com
Martin Holst Swende [Mon, 30 Mar 2015 05:51:45 +0000 (07:51 +0200)]
Created a changelog, to be used in accordance with keepachangelog.com

7 years agoMinor mod to 'hf iclass read', it now also reads and prints the configuration of...
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

7 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Sat, 28 Mar 2015 03:49:14 +0000 (23:49 -0400)]
Merge remote-tracking branch 'upstream/master'

7 years agorawdemod param cleanup
marshmellow42 [Sat, 28 Mar 2015 03:47:31 +0000 (23:47 -0400)]
rawdemod param cleanup

plus lfdemod.h cleanup

7 years agolfdemods streamline & bug fixes
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

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

7 years agoFixed indents to Tabs from Spaces 86/head
marshmellow42 [Wed, 25 Mar 2015 18:24:36 +0000 (14:24 -0400)]
Fixed indents to Tabs from Spaces

Spacing changes ONLY - no code changes

7 years agoMerge pull request #84 from marshmellow42/master
Martin Holst Swende [Wed, 25 Mar 2015 10:10:51 +0000 (11:10 +0100)]
Merge pull request #84 from marshmellow42/master

EM410x bug fix

7 years agoEM410x bug fix 84/head
marshmellow42 [Wed, 25 Mar 2015 03:05:46 +0000 (23:05 -0400)]
EM410x bug fix

7 years agoclean up em410x output
marshmellow42 [Wed, 25 Mar 2015 02:11:32 +0000 (22:11 -0400)]
clean up em410x output

7 years agoEM410x bug fix
marshmellow42 [Wed, 25 Mar 2015 00:26:14 +0000 (20:26 -0400)]
EM410x bug fix

7 years agoMerge pull request #82 from marshmellow42/master show v2.0.0
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

7 years agoremove debugging print calls 82/head
marshmellow42 [Tue, 24 Mar 2015 00:25:54 +0000 (20:25 -0400)]
remove debugging print calls

7 years agolf updates
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

7 years agolf t5 read plus lf demod adjustments
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

7 years agoMerge pull request #80 from marshmellow42/master
Martin Holst Swende [Mon, 16 Mar 2015 13:03:48 +0000 (14:03 +0100)]
Merge pull request #80 from marshmellow42/master

FIX EM Error

7 years agoFIX EM Error 80/head
marshmellow42 [Mon, 16 Mar 2015 12:39:18 +0000 (08:39 -0400)]
FIX EM Error

missed two files for last push..  sorry

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

7 years agoadjust ask/biphase handling - more complete 78/head
marshmellow42 [Mon, 16 Mar 2015 02:03:50 +0000 (22:03 -0400)]
adjust ask/biphase handling - more complete

also added XL EM410x formats

7 years agoadjust pskdemod
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

7 years agogive credit where credit is due
marshmellow42 [Fri, 13 Mar 2015 18:00:11 +0000 (14:00 -0400)]
give credit where credit is due

thanks iceman for the crc :)

7 years agodata autocorr additions
marshmellow42 [Fri, 13 Mar 2015 16:23:26 +0000 (12:23 -0400)]
data autocorr additions

7 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Fri, 13 Mar 2015 15:20:00 +0000 (11:20 -0400)]
Merge remote-tracking branch 'upstream/master'

7 years agominor g-prox-ii demod fix
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.

7 years agodata psk demod minor fixes, pyramid demod add CS
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

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

7 years agoMerge pull request #77 from Proxmark/usb_check
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.

7 years agoImplemented usb_poll() within LF sim. This means the LF sim will be aborted whenever... 77/head
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

7 years agofix: hf 14a raw was broken
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)

7 years ago(issue #47) use Qt5 includes and libraries, if present 75/head
pwpiwi [Tue, 10 Mar 2015 18:00:39 +0000 (19:00 +0100)]
(issue #47) use Qt5 includes and libraries, if present

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

7 years agofinish data printdemodbuffer command 74/head
marshmellow42 [Mon, 9 Mar 2015 20:56:00 +0000 (16:56 -0400)]
finish data printdemodbuffer command

7 years agofix: (issue #73) hf mf cload didn't work. Add more annotations for Magic Cards operation.
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.

7 years agosim buffer max settings tests
marshmellow42 [Mon, 9 Mar 2015 19:58:06 +0000 (15:58 -0400)]
sim buffer max settings tests

7 years agobiphase bug fixes
marshmellow42 [Mon, 9 Mar 2015 19:27:20 +0000 (15:27 -0400)]
biphase bug fixes

7 years agofix: broken edge detector implementation in hi_iso14443a.v resulted in decreased...
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

7 years agofixed rawdemod help options
marshmellow42 [Sun, 8 Mar 2015 22:07:01 +0000 (18:07 -0400)]
fixed rawdemod help options

7 years ago1 bug fix + code trimming
marshmellow42 [Sun, 8 Mar 2015 04:31:23 +0000 (23:31 -0500)]
1 bug fix + code trimming

7 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Fri, 6 Mar 2015 17:30:16 +0000 (12:30 -0500)]
Merge remote-tracking branch 'upstream/master'

7 years agolf sim fixes/creations correct now
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)

7 years agoRevert "lf sim fixes/creations"
marshmellow42 [Fri, 6 Mar 2015 17:26:33 +0000 (12:26 -0500)]
Revert "lf sim fixes/creations"

This reverts commit 293de1bad7bbea39eb285b2297760d51cccf07b3.

7 years agolf sim fixes/creations
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)

7 years agofix: (issue #72) LF simulation didn't work with lo_edge_detect.v v2.0.0-rc2
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

7 years agoFixed issue #36 & improved file consistency.
ikarus [Wed, 4 Mar 2015 10:00:39 +0000 (11:00 +0100)]
Fixed issue #36 & improved file consistency.

7 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Wed, 4 Mar 2015 01:44:37 +0000 (20:44 -0500)]
Merge remote-tracking branch 'upstream/master'

7 years agofinish gProxII_Demod
marshmellow42 [Tue, 3 Mar 2015 21:20:18 +0000 (16:20 -0500)]
finish gProxII_Demod

7 years agoiClass full simulation of tags now officially works, with some cheating regarding... v2.0.0-rc1
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

7 years agoAdded brackets around crc field in protocol listings
Martin Holst Swende [Mon, 2 Mar 2015 20:05:44 +0000 (21:05 +0100)]
Added brackets around crc field in protocol listings

7 years agooops... should this file should not have been there
marshmellow42 [Mon, 2 Mar 2015 19:44:05 +0000 (14:44 -0500)]
oops... should this file should not have been there

7 years agolf cmds fix, add, show
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

7 years agoTag MAC finally works! (Full sim not yet, though)
Martin Holst Swende [Mon, 2 Mar 2015 19:14:35 +0000 (20:14 +0100)]
Tag MAC finally works! (Full sim not yet, though)

7 years agoImplemented the correct way to calculate MAC from a tag, feeding it an extra 32 zeroe...
Martin Holst Swende [Sun, 1 Mar 2015 23:38:36 +0000 (00:38 +0100)]
Implemented the correct way to calculate MAC from a tag, feeding it an extra 32 zeroes. Also divided it up into two parts, one of which can be precalculated by the device before the simulation begins

7 years agolf simulation tests
marshmellow42 [Sat, 28 Feb 2015 19:33:05 +0000 (14:33 -0500)]
lf simulation tests

added SimulateTagLowFrequencyTest function
with some adjustments that help ASK simulations
FSK and PSK still need help.  Left original HID sim alone as for some it
may partially work.

7 years agoAdded the ciphers also.. doh
Martin Holst Swende [Fri, 27 Feb 2015 19:19:10 +0000 (20:19 +0100)]
Added the ciphers also.. doh

7 years agoMerge branch 'master' of github.com:Proxmark/proxmark3
Martin Holst Swende [Thu, 26 Feb 2015 19:35:54 +0000 (20:35 +0100)]
Merge branch 'master' of github.com:Proxmark/proxmark3

7 years agoImplemented new optimized version of MAC-calculation for iclass
Martin Holst Swende [Thu, 26 Feb 2015 19:35:35 +0000 (20:35 +0100)]
Implemented new optimized version of MAC-calculation for iclass

7 years agoPSKDemod Bug Fix
marshmellow42 [Mon, 23 Feb 2015 02:11:25 +0000 (21:11 -0500)]
PSKDemod Bug Fix

7 years agoPSK demod adjustment
marshmellow42 [Mon, 23 Feb 2015 01:09:58 +0000 (20:09 -0500)]
PSK demod adjustment

add carrier length test to weed out false positive demods

7 years agoadded PSK2 to lf simpsk
marshmellow42 [Sun, 22 Feb 2015 03:54:52 +0000 (22:54 -0500)]
added PSK2 to lf simpsk

testing still ongoing.

7 years agoNEW lf simpsk
marshmellow42 [Sun, 22 Feb 2015 02:36:02 +0000 (21:36 -0500)]
NEW lf simpsk

7 years agoSplit output from nrz raw demod function
marshmellow42 [Sat, 21 Feb 2015 23:37:15 +0000 (18:37 -0500)]
Split output from nrz raw demod function

missed this one last time

7 years agoFixed minor bugs in iclass fullsim, does not work yet though
Martin Holst Swende [Sat, 21 Feb 2015 19:47:40 +0000 (20:47 +0100)]
Fixed minor bugs in iclass fullsim, does not work yet though

7 years agosplit output from rawdemod functions
marshmellow42 [Sat, 21 Feb 2015 05:27:48 +0000 (00:27 -0500)]
split output from rawdemod functions

now allows for non-verbose calling:
ASKmanDemod
ASKrawDemod
FSKrawDemod
PSKDemod

7 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Fri, 20 Feb 2015 02:38:17 +0000 (21:38 -0500)]
Merge remote-tracking branch 'upstream/master'

7 years agoRevert "Revert "lf simask, lf simfsk and bug fixes""
marshmellow42 [Fri, 20 Feb 2015 02:35:34 +0000 (21:35 -0500)]
Revert "Revert "lf simask, lf simfsk and bug fixes""

This reverts commit e396001c47364fd52177960ef3b9ca3bef7adc3f.

7 years agoRevert "lf simask, lf simfsk and bug fixes"
marshmellow42 [Fri, 20 Feb 2015 02:22:05 +0000 (21:22 -0500)]
Revert "lf simask, lf simfsk and bug fixes"

This reverts commit fb0c84c3df8bb19bcefb5d2124d61ff2ac3d0af7.

7 years agolf simask, lf simfsk and bug fixes
marshmellow42 [Fri, 20 Feb 2015 02:21:11 +0000 (21:21 -0500)]
lf simask, lf simfsk and bug fixes

Impressum, Datenschutz