]> cvs.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
9 years agoFIX: "hf 14a sim" fixes to CRC calc.
iceman1001 [Sun, 21 Jun 2015 09:09:54 +0000 (11:09 +0200)]
FIX: "hf 14a sim"  fixes to CRC calc.
ADD: added CHECK_TEARING command support in "hf 14a sim" (EV1/NTAG216 command)
BUGS:  the read range probably will could currupt memory..ref:: http://www.proxmark.org/forum/viewtopic.php?pid=16611#p16611

9 years agoADD: @marshmellow42 fudan detection in hf mfu
iceman1001 [Sun, 21 Jun 2015 09:07:05 +0000 (11:07 +0200)]
ADD: @marshmellow42 fudan detection in hf mfu
ADD: @marshmellow42 14b reader changes.
ADD: @pwpiwi 14b fixes

9 years agoADD: @pwpiwi 's fix https://github.com/Proxmark/proxmark3/commit/50365fedcbaf91ce530c...
iceman1001 [Thu, 18 Jun 2015 11:51:00 +0000 (13:51 +0200)]
ADD: @pwpiwi 's fix https://github.com/Proxmark/proxmark3/commit/50365fedcbaf91ce530ca8507d2f377dc76ffd59

9 years agoadd: @pwpipi 's fixes to 14B
iceman1001 [Thu, 18 Jun 2015 07:52:53 +0000 (09:52 +0200)]
add: @pwpipi 's fixes to 14B

9 years agoADD: @marshmellow42 's help text changes to the reveng
iceman1001 [Thu, 18 Jun 2015 07:52:25 +0000 (09:52 +0200)]
ADD: @marshmellow42 's help text changes to the reveng

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Thu, 18 Jun 2015 07:51:30 +0000 (09:51 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/iso14443a.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
client/Makefile
client/cmddata.c
client/cmdhfmf.c
client/cmdhfmfu.c
client/lualibs/utils.lua
client/scripting.c
client/scripts/didump.lua
client/util.c
client/util.h
common/crc16.c
common/lfdemod.c
common/sha1.c

9 years agoCHG: just made sure it uses a default file name now.
iceman1001 [Mon, 15 Jun 2015 19:02:17 +0000 (21:02 +0200)]
CHG:  just made sure it uses a default file name now.

9 years agoADD: @marshmellow42 's 14b changes.
iceman1001 [Mon, 15 Jun 2015 18:59:01 +0000 (20:59 +0200)]
ADD:  @marshmellow42 's 14b changes.

9 years agoADD: added support for commands. READ_SIGNATURE 0x3C, READ_COUNTER 0x39 for NTAGs...
iceman1001 [Mon, 15 Jun 2015 12:01:34 +0000 (14:01 +0200)]
ADD:  added support for commands.  READ_SIGNATURE 0x3C,  READ_COUNTER 0x39 for NTAGs in  "hf 14a sim"
      the ECC signature is taken from a NTAG 215 tag. Might work.
      Counters always returns 0,  :)

9 years agoFIX: removed width in cmdcrc.c , to get rid of the compiler warning.
iceman1001 [Mon, 15 Jun 2015 11:59:33 +0000 (13:59 +0200)]
FIX: removed width in cmdcrc.c , to get rid of the compiler warning.

9 years agoadd: a .gitignore to be able to add the folder client/obj/reveng.
iceman1001 [Sun, 14 Jun 2015 21:32:20 +0000 (23:32 +0200)]
add: a .gitignore to be able to add the folder client/obj/reveng.

9 years agoadd: a .gitignore to be able to add the folder client/platforms.
iceman1001 [Sun, 14 Jun 2015 21:31:52 +0000 (23:31 +0200)]
add: a .gitignore to be able to add the folder client/platforms.

9 years agofix; stupid fixes for some compiler warnings messages of unused variables..
iceman1001 [Sun, 14 Jun 2015 21:31:05 +0000 (23:31 +0200)]
fix;  stupid fixes for some compiler warnings messages of unused variables..

9 years agoFIX: minor variable fixes when compiling on linux.
iceman1001 [Sun, 14 Jun 2015 21:02:52 +0000 (23:02 +0200)]
FIX:  minor variable fixes when compiling on linux.

cmddata.c: In function ‘Cmdmandecoderaw’:
cmddata.c:420:2: warning: format ‘%i’ expects argument of type ‘int *’, but argument 4 has type ‘size_t *’ [-Wformat=]
  sscanf(Cmd, "%i %i", &invert, &maxErr);
  ^

cmdlfem4x.c: In function ‘CmdEM410xRead’:
cmdlfem4x.c:58:2: warning: format ‘%llx’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘uint64_t’ [-Wformat=]
  sprintf(id, "%010llx",lo);
  ^

9 years agoADD: added support for some NTAG/EV1 commands to "hf 14a sim" on device side.
iceman1001 [Sun, 14 Jun 2015 20:40:18 +0000 (22:40 +0200)]
ADD:   added support for some NTAG/EV1 commands to "hf 14a sim" on device side.
          0x1B (authenticate)
          0x3a (fast read)
          0x60 (get_version)

       This is used in a new mode on client,  "hf 14a sim t 7"

9 years agoMerge pull request #117 from marshmellow42/master
Martin Holst Swende [Sun, 14 Jun 2015 17:32:36 +0000 (19:32 +0200)]
Merge pull request #117 from marshmellow42/master

askbiphase bug fix

9 years agochg: added some more outputs to the reveng-crc script e.lua ... now shows -b ...
iceman1001 [Sun, 14 Jun 2015 15:19:41 +0000 (17:19 +0200)]
chg:  added some more outputs to the reveng-crc script e.lua ...  now shows  -b -B -l -L also in columns.  You'll need to read the reveng -h helptext to understand.

9 years agoFIX: old bug back, and now fixed again. @marshmellow42
iceman1001 [Sun, 14 Jun 2015 15:18:22 +0000 (17:18 +0200)]
FIX: old bug back,  and now fixed again. @marshmellow42

9 years agoadd comment 117/head
marshmellow42 [Sun, 14 Jun 2015 15:11:00 +0000 (11:11 -0400)]
add comment

9 years agobug fix. askdemod edits invert pointer, cannot be 0
marshmellow42 [Sun, 14 Jun 2015 14:54:55 +0000 (10:54 -0400)]
bug fix.  askdemod edits invert pointer, cannot be 0

9 years agoADD: @marshmellow42 's 14b reader changes.
iceman1001 [Sun, 14 Jun 2015 12:39:50 +0000 (14:39 +0200)]
ADD: @marshmellow42 's 14b reader changes.
FIX: @marshmellow42 's ASKbiphaseDemod fixes.
CHG: added a check in ASKbiphaseDemod to make a compiler warning message go away.

9 years agoMerge pull request #115 from marshmellow42/master
Martin Holst Swende [Sun, 14 Jun 2015 07:02:13 +0000 (09:02 +0200)]
Merge pull request #115 from marshmellow42/master

add-ons and bug fixes

9 years agominor textual changes from @marshmellow42
iceman1001 [Sat, 13 Jun 2015 10:14:38 +0000 (12:14 +0200)]
minor textual changes from @marshmellow42

9 years agoFIX: Reverting the t55x7 timings. (@marshmellow42 's fix)
iceman1001 [Sat, 13 Jun 2015 10:13:21 +0000 (12:13 +0200)]
FIX:  Reverting the t55x7 timings. (@marshmellow42 's fix)

9 years agoADD: @marshmellow42 's new "-g" search for crc in a hexstring *great*
iceman1001 [Wed, 10 Jun 2015 06:46:16 +0000 (08:46 +0200)]
ADD: @marshmellow42 's new "-g" search for crc in a hexstring  *great*
ADD: fixes in the reveng calling methods

9 years agofix: nice output..
iceman1001 [Tue, 9 Jun 2015 19:46:22 +0000 (21:46 +0200)]
fix: nice output..

9 years ago@marshmellows memory fixes for reveng1.30 in client..
iceman1001 [Tue, 9 Jun 2015 19:32:22 +0000 (21:32 +0200)]
@marshmellows memory fixes for reveng1.30 in client..

9 years ago@marshmellows memory fix
iceman1001 [Tue, 9 Jun 2015 19:29:24 +0000 (21:29 +0200)]
@marshmellows memory fix

9 years agoCHG: minor layout and call fixes to e.lua (the test script for hooking up reveng1.30)
iceman1001 [Tue, 9 Jun 2015 19:28:06 +0000 (21:28 +0200)]
CHG: minor layout and call fixes to e.lua  (the test script for hooking up reveng1.30)

9 years agoCHG: all @marshmellow42 's changes to make the reveng work.
iceman1001 [Tue, 9 Jun 2015 11:31:53 +0000 (13:31 +0200)]
CHG: all @marshmellow42 's changes to make the reveng work.
ADD: lua script test for using the reveng inside lua.  *prove of concept*
      it implements -h help
                    -d  data in a hexstring
                    -w  width of the crc family. (ie 16 gives all CRC-16 calculations.
     it iterates thru all found crc presets in a crc family based on the width of crc.  It calcs crc and the reverse crc.

9 years agoADD: iso11784/85 FDX-B
iceman1001 [Sun, 7 Jun 2015 09:35:49 +0000 (11:35 +0200)]
ADD: iso11784/85 FDX-B
ADD: the source from RevEng 1.30, got into the PM3 client.

9 years agoadd clock to ask rawdemod outputs 115/head
marshmellow42 [Sun, 7 Jun 2015 04:42:57 +0000 (00:42 -0400)]
add clock to ask rawdemod outputs

fix biphase invert bug (correctly)

9 years agoModified kermit crc to use existing crc calc code
marshmellow42 [Sat, 6 Jun 2015 02:39:56 +0000 (22:39 -0400)]
Modified kermit crc to use existing crc calc code

9 years agofdx-b clean up
marshmellow42 [Thu, 4 Jun 2015 17:10:33 +0000 (13:10 -0400)]
fdx-b clean up

9 years agoAdd CCITT Kermit CRC check for FDX-B demod
marshmellow42 [Thu, 4 Jun 2015 16:53:19 +0000 (12:53 -0400)]
Add CCITT Kermit CRC check for FDX-B demod

9 years agoADD: @marshmellow42 's fixed version of the ISO11784 FDX-B
iceman1001 [Thu, 4 Jun 2015 08:33:55 +0000 (10:33 +0200)]
ADD: @marshmellow42 's fixed version of the ISO11784 FDX-B
ADD: crc16_ccitt_rev  (reverse version of crc16_ccitt 0x0000)

9 years agoadd fdx-b to cmddata.h
marshmellow42 [Thu, 4 Jun 2015 04:05:37 +0000 (00:05 -0400)]
add fdx-b to cmddata.h

9 years agoadd fdx-b to lf search
marshmellow42 [Thu, 4 Jun 2015 04:04:49 +0000 (00:04 -0400)]
add fdx-b to lf search

9 years agobug fix - biphase invert + fdx-b adjustments
marshmellow42 [Thu, 4 Jun 2015 03:59:22 +0000 (23:59 -0400)]
bug fix - biphase invert + fdx-b adjustments

9 years agoaddition animal tags demod info
marshmellow42 [Wed, 3 Jun 2015 22:28:56 +0000 (18:28 -0400)]
addition animal tags demod info

9 years agoTesting animal tags
marshmellow42 [Wed, 3 Jun 2015 20:52:20 +0000 (16:52 -0400)]
Testing animal tags

9 years agoADD: removed the paritythingy, I missunderstood its purpose.
iceman1001 [Wed, 3 Jun 2015 20:38:59 +0000 (22:38 +0200)]
ADD: removed the paritythingy,  I missunderstood its purpose.

9 years agoCHG: trying to get the askdemod / biphasedeocde / finding startmarker / removeparity...
iceman1001 [Wed, 3 Jun 2015 20:19:32 +0000 (22:19 +0200)]
CHG:  trying to get the askdemod / biphasedeocde / finding startmarker / removeparity to work in ISO11784demod

9 years agoADD: next step ISO11784/85
iceman1001 [Wed, 3 Jun 2015 19:35:03 +0000 (21:35 +0200)]
ADD:  next step ISO11784/85

9 years agoADD @pwpiwi 's fixes for "HF 14B" commands.
iceman1001 [Wed, 3 Jun 2015 19:12:55 +0000 (21:12 +0200)]
ADD @pwpiwi 's fixes for "HF 14B" commands.

9 years agoFIX: a minor bug fix from @marshmellow42 in "data raw" and ask/biphase.
iceman1001 [Wed, 3 Jun 2015 19:12:24 +0000 (21:12 +0200)]
FIX: a minor bug fix from @marshmellow42 in "data raw" and ask/biphase.
ADD: started witha  ISO11784/85 demod function.

9 years agoDEL: removed old iso14443.c since @pwpiwi renamed it..
iceman1001 [Tue, 2 Jun 2015 10:23:06 +0000 (12:23 +0200)]
DEL:  removed old iso14443.c since @pwpiwi renamed it..

9 years agoCHG: removed an extra fclose call
iceman1001 [Tue, 2 Jun 2015 10:20:48 +0000 (12:20 +0200)]
CHG: removed an extra fclose call

9 years agoADD: @marshmellow42 's infineon MY D(tm) MOVE LEAN tag identification
iceman1001 [Tue, 2 Jun 2015 10:20:16 +0000 (12:20 +0200)]
ADD: @marshmellow42 's  infineon MY D(tm) MOVE LEAN tag identification

9 years agoCHG: help text output was not aligned because of tabs/spaces
iceman1001 [Tue, 2 Jun 2015 10:18:54 +0000 (12:18 +0200)]
CHG: help text output was not aligned because of tabs/spaces

9 years agoADD: @pwpiwi 's fixes for 14b. Including a rename from iso14443.c -> iso14443b.c
iceman1001 [Tue, 2 Jun 2015 10:17:34 +0000 (12:17 +0200)]
ADD: @pwpiwi 's fixes for 14b.   Including a rename from iso14443.c -> iso14443b.c

9 years agoMerge pull request #113 from pwpiwi/iso14443b_fix
pwpiwi [Mon, 1 Jun 2015 18:02:40 +0000 (20:02 +0200)]
Merge pull request #113 from pwpiwi/iso14443b_fix

Fix issue #103 (hopefully). Quite an old bug which was previously

9 years agoMerge pull request #108 from p-l-/fix-hf-mf-csave
Martin Holst Swende [Mon, 1 Jun 2015 17:57:57 +0000 (19:57 +0200)]
Merge pull request #108 from p-l-/fix-hf-mf-csave

Ported hf mf esave trick for unreadable UIDs to hf mf csave

9 years agoMerge pull request #111 from zhovner/master
Martin Holst Swende [Mon, 1 Jun 2015 17:56:50 +0000 (19:56 +0200)]
Merge pull request #111 from zhovner/master

Compiling manual for MAC OS X

9 years agoFix issue #103 (hopefully). Quite an old bug which was previously 113/head
pwpiwi [Mon, 1 Jun 2015 17:42:50 +0000 (19:42 +0200)]
Fix issue #103 (hopefully). Quite an old bug which was previously
masked by a big DMA_BUFFER_SIZE.

9 years agoadd my_d move lean identification.
marshmellow42 [Mon, 1 Jun 2015 04:18:03 +0000 (00:18 -0400)]
add my_d move lean identification.

9 years agoCHG: remade selftest structure
iceman1001 [Sun, 31 May 2015 20:33:12 +0000 (22:33 +0200)]
CHG: remade selftest structure
CHG: removed debugstatements

9 years agonew lua script from @iceman1001 + bug fix in hf mfu
marshmellow42 [Sun, 31 May 2015 20:08:58 +0000 (16:08 -0400)]
new lua script from @iceman1001 + bug fix in hf mfu

9 years agoFIX: minor fix to the magictest function. It always makes a select tag first, but...
iceman1001 [Sun, 31 May 2015 19:49:00 +0000 (21:49 +0200)]
FIX: minor fix to the magictest function. It always makes a select tag first, but never took in consideration that the tag already could have been selected.

9 years agoADD: @marshmellow42 's changes / fixes.
iceman1001 [Sun, 31 May 2015 19:47:33 +0000 (21:47 +0200)]
ADD: @marshmellow42 's changes / fixes.

9 years agoADD: a script to dump a specific type of Mifare Mini tags.
iceman1001 [Sun, 31 May 2015 19:46:25 +0000 (21:46 +0200)]
ADD: a script to dump a specific type of Mifare Mini tags.

9 years agoMerge pull request #112 from marshmellow42/master
Martin Holst Swende [Sun, 31 May 2015 11:08:36 +0000 (13:08 +0200)]
Merge pull request #112 from marshmellow42/master

combine mfu read/write commands + various bug/typo fixes

9 years agoadd @Iceman1001 s sha1 scripting changes. 112/head
marshmellow42 [Sun, 31 May 2015 01:51:15 +0000 (21:51 -0400)]
add @Iceman1001 s sha1 scripting changes.

9 years agofixed further typo in lf t5 wr help
marshmellow42 [Fri, 29 May 2015 03:14:06 +0000 (23:14 -0400)]
fixed further typo in lf t5 wr help

also fixed offset option char to uint8_t warning in the new offset
option in data printdemodbuffer

9 years agofix help typo
marshmellow42 [Fri, 29 May 2015 02:52:41 +0000 (22:52 -0400)]
fix help typo

9 years agoadd offset option to data printdemodbuffer
marshmellow42 [Thu, 28 May 2015 17:23:31 +0000 (13:23 -0400)]
add offset option to data printdemodbuffer

easily see demod buffer's hex values at different bit offsets by using:
data printdemodbuffer x o <offset>

9 years agoCHG: @marshmellow42 changes on deviceside.
iceman1001 [Wed, 27 May 2015 21:23:46 +0000 (23:23 +0200)]
CHG: @marshmellow42 changes on deviceside.
ADD: increase debuglevel for printing a statment in ul_ev1_auth

9 years agoMFU code cleanup - final ?
marshmellow42 [Wed, 27 May 2015 21:21:42 +0000 (17:21 -0400)]
MFU code cleanup - final ?

fixed bug in debug print in MF 1k sim.

9 years agoclean up mfu device side code
marshmellow42 [Wed, 27 May 2015 16:24:13 +0000 (12:24 -0400)]
clean up mfu device side code

+ add xor calc to util (prep for desfire)
commented out MifareUWriteBlockCompat as it isn't used in client
currently (it is a command we could support..  but why?)
relabeled a few device side mfu functions to be clearer.

9 years agoCompiling manual for MAC OS X 111/head
Pavel Zhovner [Wed, 27 May 2015 08:30:50 +0000 (11:30 +0300)]
Compiling manual for MAC OS X

9 years agoupdate changelog
marshmellow42 [Wed, 27 May 2015 04:32:01 +0000 (00:32 -0400)]
update changelog

9 years ago@iceman1001 s lua script fix
marshmellow42 [Wed, 27 May 2015 00:31:07 +0000 (20:31 -0400)]
@iceman1001 s lua script fix

9 years agoADD: aes128_encrypt ECB in scripting.c
iceman1001 [Tue, 26 May 2015 19:51:18 +0000 (21:51 +0200)]
ADD: aes128_encrypt ECB in scripting.c
ADD: aes128_decrypt ECB in scripting.c
ADD: Sha1Hex method in utils.lua

9 years agoAdd clearCommandBuffer before SendCommand
marshmellow42 [Tue, 26 May 2015 14:40:23 +0000 (10:40 -0400)]
Add clearCommandBuffer before SendCommand

adjust output of mfu rdbl to be consistent
fix output of mfu dump in case startPage was specified. (also was
missing "i" in second print...)

9 years agoADD: SHA1 hashes calculations in sha1.c and LUA
iceman1001 [Tue, 26 May 2015 14:12:33 +0000 (16:12 +0200)]
ADD:  SHA1 hashes calculations in sha1.c and LUA

9 years agoCHG: print up to 20 possible keys.
iceman1001 [Tue, 26 May 2015 09:05:57 +0000 (11:05 +0200)]
CHG: print up to 20 possible keys.

9 years agoCHG: moved a xor function into util.c
iceman1001 [Tue, 26 May 2015 09:04:57 +0000 (11:04 +0200)]
CHG: moved a xor function into util.c
CHG: added some calls to clearCommandBuffer() in /hf mfu/hf 14a sim/hf mf sim/ commands.
CHG: minor adjustments to relative pathing.

9 years agoFIX: one too many parenthesis
iceman1001 [Mon, 25 May 2015 11:16:10 +0000 (13:16 +0200)]
FIX: one too many parenthesis

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Mon, 25 May 2015 11:13:06 +0000 (13:13 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/mifarecmd.c
client/cmdhfmf.c

9 years agoFIX: dumptoemul.lua removed the extra linebreak in the end, making some load commands...
iceman1001 [Mon, 25 May 2015 11:10:55 +0000 (13:10 +0200)]
FIX: dumptoemul.lua removed the extra linebreak in the end, making some load commands complain.
MOV: moved the try32/try64 attacks (mfkey32/mfkey64) into the nonce2key.c file
CHG: added @marshmellow42 changes to hf mfu dump layout.
ADD: an extra call to BigBuf_free in readcard..  just to make sure that it doesn't leak memory.
ADD: expermimental call to "try32" for "hf mf sim x".

9 years agoPorted hf mf esave trick for unreadable UIDs to hf mf csave 108/head
Pierre LALET [Mon, 25 May 2015 09:47:27 +0000 (11:47 +0200)]
Ported hf mf esave trick for unreadable UIDs to hf mf csave

Thanks: iceman1001

9 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Mon, 25 May 2015 02:31:13 +0000 (22:31 -0400)]
Merge remote-tracking branch 'upstream/master'

9 years agoupdated mfu rdbl and wrbl commands
marshmellow42 [Mon, 25 May 2015 02:28:21 +0000 (22:28 -0400)]
updated mfu rdbl and wrbl commands

@iceman1001 s rdbl and wrbl cmd updates.
dump screen output adjusted

9 years agoMerge pull request #107 from p-l-/fix-hfmf
Martin Holst Swende [Sun, 24 May 2015 21:10:21 +0000 (23:10 +0200)]
Merge pull request #107 from p-l-/fix-hfmf

Fix filenames for hf mf cload / csave

9 years agoFix filenames for hf mf cload / csave 107/head
Pierre LALET [Sun, 24 May 2015 20:43:08 +0000 (22:43 +0200)]
Fix filenames for hf mf cload / csave

9 years agoFIX: hf mfu dump, now reads correct memory from device-side.
iceman1001 [Sun, 24 May 2015 19:51:44 +0000 (21:51 +0200)]
FIX: hf mfu dump, now reads correct memory from device-side.
CHG: hf mfu dump - output data styled :)

9 years agoFIX: ELOAD/ESAVE/CLOAD/CSAVE filename bufferoverflow, and filename generation if...
iceman1001 [Sun, 24 May 2015 19:50:15 +0000 (21:50 +0200)]
FIX: ELOAD/ESAVE/CLOAD/CSAVE  filename bufferoverflow,  and filename generation if UID not readable.
Thanks @p-l-
ref: https://github.com/Proxmark/proxmark3/commit/0b14440dce5d879fed70afb455b1f7c56ee85b1e

9 years agoMerge pull request #106 from p-l-/fix-hfmfeload
Martin Holst Swende [Sun, 24 May 2015 19:32:11 +0000 (21:32 +0200)]
Merge pull request #106 from p-l-/fix-hfmfeload

Fix filenames for hf mf esave / eload

9 years agoFix filenames for hf mf esave / eload 106/head
Pierre LALET [Sun, 24 May 2015 18:14:22 +0000 (20:14 +0200)]
Fix filenames for hf mf esave / eload

9 years agoMerge pull request #102 from marshmellow42/master
Martin Holst Swende [Sun, 24 May 2015 05:22:09 +0000 (07:22 +0200)]
Merge pull request #102 from marshmellow42/master

fix mfu dump getbigbuffer bug

9 years agofix mfu dump getbigbuffer bug 102/head
marshmellow42 [Sun, 24 May 2015 02:35:50 +0000 (22:35 -0400)]
fix mfu dump getbigbuffer bug

Thanks @iceman1001 for catching my oops, and fixing it :)

9 years agoAdjustments after the big merge from PM3 master.
iceman1001 [Sat, 23 May 2015 06:38:46 +0000 (08:38 +0200)]
Adjustments after the big merge from PM3 master.

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Sat, 23 May 2015 06:16:40 +0000 (08:16 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
README.txt
armsrc/appmain.c
armsrc/apps.h
armsrc/des.c
armsrc/iclass.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
client/cmddata.c
client/cmdhf.c
client/cmdhf14a.c
client/cmdhficlass.c
client/cmdhfmfu.c
client/cmdhfmfu.h
client/cmdscript.c
client/lualibs/commands.lua
client/lualibs/html_dumplib.lua
client/scripting.c
client/util.c
common/protocols.h
include/usb_cmd.h

9 years agoMerge pull request #101 from marshmellow42/master
Martin Holst Swende [Fri, 22 May 2015 19:55:34 +0000 (21:55 +0200)]
Merge pull request #101 from marshmellow42/master

hf mfu updates + hf search + bug fixes

9 years agohf mfu minor output adjustments 101/head
marshmellow42 [Fri, 22 May 2015 17:17:51 +0000 (13:17 -0400)]
hf mfu minor output adjustments

dump key placed properly for EV1 and NTAGs

config pages for ntags corrected in printout

note on config that PWD and PACK cannot
actually be read from memory  (probably could just delete them (other
than it shows what memory block they are stored in for changing...)

9 years agomfu info authkeyptr fix
marshmellow42 [Fri, 22 May 2015 11:29:18 +0000 (07:29 -0400)]
mfu info authkeyptr fix

didn't follow @iceman1001 s l parameter changes fully...  fixed now..
:)

9 years agoFIX: camelcase on a variable caused some issues.
iceman1001 [Fri, 22 May 2015 06:48:23 +0000 (08:48 +0200)]
FIX: camelcase on a variable caused some issues.

9 years agofix to dump cmd print keys.
marshmellow42 [Fri, 22 May 2015 04:15:57 +0000 (00:15 -0400)]
fix to dump cmd print keys.

add l option to info cmd.
add ascii print to dump (screen only)
other minor clean up

9 years agoFIX; the "L" optional parameter for swapping endianess on used authentication key...
iceman1001 [Thu, 21 May 2015 21:17:01 +0000 (23:17 +0200)]
FIX;   the "L" optional parameter for swapping endianess on used authentication key.  It is now implemented for following commands.
"HF MFU INFO"
"HF MFU DUMP"
"HF MFU RDBL"
"HF MFU WRBL"

CHG;  I commented away the option to add the key to the dump, since it is not written in big-endian, like the data is on ULC. This needs to be addressed before it comes back. I like the idea of having keys inside the dumps on the correct places.

9 years agohf mfu bug fixes, and help text fixes
marshmellow42 [Thu, 21 May 2015 15:17:01 +0000 (11:17 -0400)]
hf mfu bug fixes, and help text fixes

Impressum, Datenschutz