]> git.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
9 years agoCHG: @Marshmellow came up with some nifty nice ideas for the t55xx modulation detecti...
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.

9 years agoFIX: lf t55xx config now handles offsets.
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.

9 years agoADD: started to add a offset possibility for the LF T55XX.
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

9 years agoCHG: minor output change, when printing found multiple modulations
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

9 years agoCHG: now with enums :)
iceman1001 [Fri, 13 Mar 2015 20:02:04 +0000 (21:02 +0100)]
CHG:  now with enums :)

9 years agoADD: printConfiguration method for a nice printout of the selected configuration.
iceman1001 [Fri, 13 Mar 2015 18:12:11 +0000 (19:12 +0100)]
ADD:  printConfiguration method for a nice printout of the selected configuration.

9 years agoCHG: Removed an unneccesary parameter for "hf mf sim"
iceman1001 [Fri, 13 Mar 2015 17:50:30 +0000 (18:50 +0100)]
CHG:  Removed an unneccesary parameter for  "hf mf sim"

9 years agoFIX: removed a debug statement
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.

9 years agoFIX: lf t55xx commands seem to work like they should. Detect now detects between...
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

9 years agoCHG: rename of methods to follow naming convention
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

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Fri, 13 Mar 2015 08:22:12 +0000 (09:22 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

9 years agoFIX: Marshmellow hinted that I should use another fskclock method, which obeys the...
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.

9 years agoCHG: removed a loop after suggestions that it was unnecessary.
iceman1001 [Fri, 13 Mar 2015 07:59:07 +0000 (08:59 +0100)]
CHG: removed a loop after suggestions that it was unnecessary.

9 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

9 years agoFIX: adding a test to see if we managed to get the correct demodulation from an...
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.

9 years agoFIX: @marshmellow found out that the CRC-8/Maxim was not always giving the right...
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

9 years agoADD: LF T55XX CONFIG, is almost there, Usage: lf t55xx config [d <demodulation...
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

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Thu, 12 Mar 2015 18:01:09 +0000 (19:01 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

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

9 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

9 years agoFIX: move and rename the CRC8Maxim method into crc.c
iceman1001 [Thu, 12 Mar 2015 13:12:14 +0000 (14:12 +0100)]
FIX:  move and rename the CRC8Maxim method into crc.c

9 years agoADD: added a reference to a generic CRC-8 checksum algo in common/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

9 years agoadd: a experimental lualib, unstable.
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.

9 years agoFIX: correct some lookups in tnp3dump.lua, tnp3sim.lua
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

9 years agoFIX: minor correction of the command description for HF 14A RAW.
iceman1001 [Wed, 11 Mar 2015 21:43:49 +0000 (22:43 +0100)]
FIX:  minor correction of the command description for HF 14A RAW.

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Wed, 11 Mar 2015 21:21:01 +0000 (22:21 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

9 years agoADD: added a CRC64_ECMA implementation
iceman1001 [Wed, 11 Mar 2015 21:06:23 +0000 (22:06 +0100)]
ADD: added a CRC64_ECMA implementation

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

9 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

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
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

9 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

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Mon, 9 Mar 2015 21:03:24 +0000 (22:03 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

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

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

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

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

9 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

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

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

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

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

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

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

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
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

9 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

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

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

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

9 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

9 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

9 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

9 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

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

9 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

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

9 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

9 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

9 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

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

9 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

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

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

9 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

9 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

9 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

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

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

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

9 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

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Thu, 19 Feb 2015 10:32:11 +0000 (11:32 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/iclass.c
client/loclass/cipher.c
client/loclass/fileutils.h

9 years agoMerge pull request #68 from iceman1001/feature
Martin Holst Swende [Thu, 19 Feb 2015 09:51:10 +0000 (10:51 +0100)]
Merge pull request #68 from iceman1001/feature

ADD: identifications.

9 years agoMerge pull request #67 from marshmellow42/master
Martin Holst Swende [Thu, 19 Feb 2015 09:50:51 +0000 (10:50 +0100)]
Merge pull request #67 from marshmellow42/master

Small help and command description updates

9 years agoMore work on iclass full simulation, and some work on iclass tag dump parsing
Martin Holst Swende [Thu, 19 Feb 2015 09:48:33 +0000 (10:48 +0100)]
More work on iclass full simulation, and some work on iclass tag dump parsing

9 years agoFurther implementation of iclass 'fullsim'. Moved protocol definitions to shared...
Martin Holst Swende [Wed, 18 Feb 2015 19:02:44 +0000 (20:02 +0100)]
Further implementation of iclass 'fullsim'. Moved protocol definitions to shared file. Had to add some loclass-function to arm-side to support authentication in fullsim mode

9 years agoIclass decrypt error, shouldn't have decrypted block 6 according to Heart of darkness...
Martin Holst Swende [Tue, 17 Feb 2015 22:17:43 +0000 (23:17 +0100)]
Iclass decrypt error, shouldn't have decrypted block 6 according to Heart of darkness-paper

9 years agoImplemented 'hf iclass decrypt <tagdump>'. This performs the 3des decryption of iclas...
Martin Holst Swende [Tue, 17 Feb 2015 21:07:40 +0000 (22:07 +0100)]
Implemented 'hf iclass decrypt <tagdump>'. This performs the 3des decryption of iclass tag dumps, but requires the decryption file to be present on the filesystem

9 years agoADD: added the missing EM identifications. Thanks to Asper for providing the needed... 68/head
iceman1001 [Mon, 16 Feb 2015 18:01:09 +0000 (19:01 +0100)]
ADD:  added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's

9 years agoCHG: added some more token-tags.
iceman1001 [Mon, 16 Feb 2015 18:00:17 +0000 (19:00 +0100)]
CHG:  added some more token-tags.

9 years agoCHG: minor modification to "hf mf csetblk" The usuage of UID array is not needed.
iceman1001 [Mon, 16 Feb 2015 18:01:52 +0000 (19:01 +0100)]
CHG:  minor modification to "hf mf csetblk"  The usuage of UID array is not needed.

9 years agoADD: added the missing EM identifications. Thanks to Asper for providing the needed...
iceman1001 [Mon, 16 Feb 2015 18:01:09 +0000 (19:01 +0100)]
ADD:  added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's

9 years agoCHG: added some more token-tags.
iceman1001 [Mon, 16 Feb 2015 18:00:17 +0000 (19:00 +0100)]
CHG:  added some more token-tags.

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Mon, 16 Feb 2015 17:59:44 +0000 (18:59 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/iclass.c

9 years agoMerge remote-tracking branch 'upstream/master' 67/head
marshmellow42 [Sun, 15 Feb 2015 02:16:27 +0000 (21:16 -0500)]
Merge remote-tracking branch 'upstream/master'

9 years agoClean up Helps and command descriptions
marshmellow42 [Sun, 15 Feb 2015 02:15:13 +0000 (21:15 -0500)]
Clean up Helps and command descriptions

9 years agoStarted iclass emulator support on device side. Not functional yet
Martin Holst Swende [Sat, 14 Feb 2015 20:30:26 +0000 (21:30 +0100)]
Started iclass emulator support on device side. Not functional yet

9 years agoRemoved un-implemented 'hf iclass write', it's confusing to have there since there...
Martin Holst Swende [Sat, 14 Feb 2015 20:18:39 +0000 (21:18 +0100)]
Removed un-implemented 'hf iclass write', it's confusing to have there since there's no actual support for this on the device side

9 years agoReformatted
Martin Holst Swende [Sat, 14 Feb 2015 20:17:08 +0000 (21:17 +0100)]
Reformatted

9 years agoStarted work on 'hf iclass eload' - only client side so far, not yet supported in...
Martin Holst Swende [Sat, 14 Feb 2015 20:15:53 +0000 (21:15 +0100)]
Started work on 'hf iclass eload' - only client side so far, not yet supported in the device

9 years agoFixed bug with iclass dump which prevented saving to file
Martin Holst Swende [Sat, 14 Feb 2015 19:42:23 +0000 (20:42 +0100)]
Fixed bug with iclass dump which prevented saving to file

9 years agoMade 125KHz default sampling, instead of 134KHz for LF
Martin Holst Swende [Sat, 14 Feb 2015 18:55:23 +0000 (19:55 +0100)]
Made 125KHz default sampling, instead of 134KHz for LF

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Sat, 14 Feb 2015 11:30:08 +0000 (12:30 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
client/util.c

9 years agoadd: timeouts for "lf read"
iceman1001 [Sat, 14 Feb 2015 11:29:02 +0000 (12:29 +0100)]
add: timeouts for "lf read"
chg: change command consistency "lf t55xx rd" -> "lf t55xx read"
chg: buffer size used for armside is quite big. maybe to big. takes too long to read.

9 years agofix help on data rawdemod commands
marshmellow42 [Sat, 14 Feb 2015 02:17:15 +0000 (21:17 -0500)]
fix help on data rawdemod commands

9 years agoMerge branch 'master' of github.com:Proxmark/proxmark3
Martin Holst Swende [Fri, 13 Feb 2015 18:59:50 +0000 (19:59 +0100)]
Merge branch 'master' of github.com:Proxmark/proxmark3

9 years agoRemoved some dev- printouts
Martin Holst Swende [Fri, 13 Feb 2015 18:59:28 +0000 (19:59 +0100)]
Removed some dev- printouts

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Fri, 13 Feb 2015 09:16:39 +0000 (10:16 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

9 years agochg: step two for t55xx commnads
iceman1001 [Fri, 13 Feb 2015 09:16:21 +0000 (10:16 +0100)]
chg: step two for t55xx commnads

9 years agoMerge pull request #63 from marshmellow42/master
Martin Holst Swende [Fri, 13 Feb 2015 09:11:40 +0000 (10:11 +0100)]
Merge pull request #63 from marshmellow42/master

lf data combine rawdemods & depreciate cmds

9 years agoMerge pull request #66 from iceman1001/feature
Martin Holst Swende [Fri, 13 Feb 2015 09:11:09 +0000 (10:11 +0100)]
Merge pull request #66 from iceman1001/feature

ADD:  identification of EM4233

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Thu, 12 Feb 2015 08:54:21 +0000 (09:54 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/epa.c

Impressum, Datenschutz