]> git.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
9 years agoFIX: a shot at fixing the "_" underscore problem in fileutils.c. This one uses _ifde...
iceman1001 [Sun, 4 Jan 2015 21:49:54 +0000 (22:49 +0100)]
FIX:  a shot at fixing the "_" underscore problem in fileutils.c. This one uses _ifdefine. I hope it works. Linux people can let me know if it works.

FIX: changed the DetectASKClock in lfdemod.c to correct detect all clocks in the array.
CHG: I like code with more spaces inside of it and tried change some stuff according to our codestyle in HACKING.txt
ADD: some zero checks and overflows, god knows where it was.

The T55XX commands will be rewritten to use Marshmellows lfdemod.c instead.
CHG: Made the graph window smaller.
CHG: lf read  now does a "data samples" also.  (less writing commands)
CHG: data samples now defaults to samples size of 20000

9 years agochg: updated the README.txt
iceman1001 [Thu, 1 Jan 2015 23:09:59 +0000 (00:09 +0100)]
chg: updated the README.txt
chg: updated the commands.lua so it is in sync with usb_cnd.c definitions.

9 years agoMerge pull request #1 from bforbort/master
Iceman [Thu, 1 Jan 2015 22:02:23 +0000 (23:02 +0100)]
Merge pull request #1 from bforbort/master

Added DES AUTH command support

9 years agoMerge remote-tracking branch 'origin/DESFireAuth'
Blaine Forbort [Thu, 1 Jan 2015 18:41:14 +0000 (10:41 -0800)]
Merge remote-tracking branch 'origin/DESFireAuth'

9 years agoUpdated the README.txt
iceman1001 [Thu, 1 Jan 2015 13:07:42 +0000 (14:07 +0100)]
Updated the README.txt
CHG:  added marshmellows last changes with rtrim, and minor fixes.
DEL:  code cleanup in usb_cdc.c

9 years agoCHG: modified cmdlf.c - CmdLFfind with a parameter to accept traces loaded with...
iceman1001 [Wed, 31 Dec 2014 11:01:00 +0000 (12:01 +0100)]
CHG:  modified cmdlf.c - CmdLFfind with a parameter to accept traces loaded with "data load". ie: "lf search 1" == take data from previously loaded.

9 years agoADD: midnitesnakes desfire, ultralight changes from Unstable branch.
iceman1001 [Wed, 31 Dec 2014 10:35:43 +0000 (11:35 +0100)]
ADD: midnitesnakes desfire, ultralight changes from Unstable branch.
ADD: Marshmellows fixes for the LF (demods) commands,  (LF SEACH)
ADD: Holimans changes with hash1_brute

FIXES:  minor fixes with some calls to "free" and redundant debug statement and code cleanup. removal of commented code.

9 years agoFIX: minor fixes to the new feature in "hf 14a reader". Not turning off the field...
iceman1001 [Fri, 26 Dec 2014 21:38:23 +0000 (22:38 +0100)]
FIX: minor fixes to the new feature in "hf 14a reader".  Not turning off the field and the consequent changes to the define names. (CMD_MIFARE_EML_CGETBLO -> CMD_MIFARE_CGETBLO)

9 years agoADD: HF 14A READER is now able to see if a presented card responses to the chinese...
iceman1001 [Fri, 26 Dec 2014 20:32:58 +0000 (21:32 +0100)]
ADD:  HF 14A READER is now able to see if a presented card responses to the chinese magic backdoor commands.
FIX: simple namechange of some defines where it hinted it was related to "eml" when it wasn't.

9 years agoADD: marshmellows new lf command and DetectClock. (works great!)
iceman1001 [Fri, 26 Dec 2014 19:02:59 +0000 (20:02 +0100)]
ADD: marshmellows new lf command and DetectClock.  (works great!)
FIX: a suggested patch for "hf mf csetuid" (https://github.com/Proxmark/proxmark3/issues/35)
FIX: fixed a bug in iso14443a_select_card where the len variable wasnt set,  this made desfire/magic cards not work.

9 years agoadded the changes from PM3 master.
iceman1001 [Mon, 22 Dec 2014 14:14:05 +0000 (15:14 +0100)]
added the changes from PM3 master.
added some code for the AWID26

9 years agoUsing defined command code
Blaine Forbort [Mon, 22 Dec 2014 08:21:20 +0000 (00:21 -0800)]
Using defined command code

9 years agoMinor formatting change
Blaine Forbort [Mon, 22 Dec 2014 07:54:29 +0000 (23:54 -0800)]
Minor formatting change

9 years agoRemove unrelated file
Blaine Forbort [Mon, 22 Dec 2014 07:41:15 +0000 (23:41 -0800)]
Remove unrelated file

9 years agoTested by changing the master key from the default to a custom value
Blaine Forbort [Mon, 22 Dec 2014 06:59:24 +0000 (22:59 -0800)]
Tested by changing the master key from the default to a custom value

9 years agocode to check RndA' from PICC was unreachable
Blaine Forbort [Sun, 21 Dec 2014 03:25:31 +0000 (19:25 -0800)]
code to check RndA' from PICC was unreachable

9 years agoCalled the OnSuccess() method for whatever reason that's there.
Blaine Forbort [Sun, 21 Dec 2014 03:15:48 +0000 (19:15 -0800)]
Called the OnSuccess() method for whatever reason that's there.

9 years agoLimit to single-DES operation and return session key to client.
Blaine Forbort [Sun, 21 Dec 2014 01:18:26 +0000 (17:18 -0800)]
Limit to single-DES operation and return session key to client.

9 years agoCreate session key
Blaine Forbort [Sat, 20 Dec 2014 08:10:59 +0000 (00:10 -0800)]
Create session key

9 years agoAccept key number from command line
Blaine Forbort [Sat, 20 Dec 2014 05:37:06 +0000 (21:37 -0800)]
Accept key number from command line

9 years agoRemoved unneeded verbosity and checked for a 0x00 response from PICC after challenge...
Blaine Forbort [Sat, 20 Dec 2014 04:38:25 +0000 (20:38 -0800)]
Removed unneeded verbosity and checked for a 0x00 response from PICC after challenge response

9 years agoChallenge is now sent to PICC
Blaine Forbort [Sat, 20 Dec 2014 03:44:32 +0000 (19:44 -0800)]
Challenge is now sent to PICC

9 years agoCalculates response to PICC challenge
Blaine Forbort [Sat, 20 Dec 2014 03:36:19 +0000 (19:36 -0800)]
Calculates response to PICC challenge

9 years agoSuccessfully decrypted RandB from PICC challenge
Blaine Forbort [Fri, 19 Dec 2014 20:15:45 +0000 (12:15 -0800)]
Successfully decrypted RandB from PICC challenge

9 years agoAdded file demonstrating a singleDES AUTH operation using 'hf 14a raw' command
Blaine Forbort [Fri, 19 Dec 2014 20:15:04 +0000 (12:15 -0800)]
Added file demonstrating a singleDES AUTH operation using 'hf 14a raw' command

9 years agoFixed build environment
Blaine Forbort [Fri, 19 Dec 2014 20:13:18 +0000 (12:13 -0800)]
Fixed build environment

9 years agoADD: started with adding a LF AWID26 write function. not done yet.
iceman1001 [Fri, 19 Dec 2014 12:46:02 +0000 (13:46 +0100)]
ADD: started with adding a LF AWID26 write function. not done yet.
ADD: latest pwpiwi & holiman changes.

9 years agominor fixes regaring the newly released patches from the pm3 community
iceman1001 [Wed, 17 Dec 2014 21:26:16 +0000 (22:26 +0100)]
minor fixes regaring the newly released patches from the pm3 community
plus removed old comments in cmdmain.c

9 years agoApplied Holiman's fixes for iclass.c and CSNs
iceman1001 [Wed, 17 Dec 2014 19:33:21 +0000 (20:33 +0100)]
Applied Holiman's fixes for iclass.c and CSNs
Applied PwPiwi's new parity fix.
Applied Marshmellw's fixes for FSKdemod (HID, IO)

FIX: a potential bigbuffer fault given pwpiwi's change inside lfops.c CmdIOdemodFSK & CmdHIDdemodFSK
FIX: change some "int" parameters to uint's.
FIX: changed the lfops.c -  DoAcquisition125k_internal  to respect pwpiwi's definitions of FREE_BUFFER_OFFSET

HEADS up:  The ultralight functions hasn't been verified since pwpiwi's changes.

9 years agoADD: Enio's intuative function for the command: "hw tune", where you plot the tunin...
iceman1001 [Sun, 30 Nov 2014 18:16:28 +0000 (19:16 +0100)]
ADD:  Enio's intuative function for the command: "hw tune",  where you plot the tuning-data :)
ADD:  added optional parameter to "hw tune" to show graf direct. Sample usage: "hw tune p"

9 years agoBUG: don't try to fix things that ain't broken.. or not. My try for a fix ended...
iceman1001 [Thu, 27 Nov 2014 21:16:17 +0000 (22:16 +0100)]
BUG:  don't try to fix things that ain't broken.. or not. My try for a fix ended up making the PrintAndLog function stop working.  Just by calling a fclose..  fixed.

9 years agoADD: the option to simulate tnp3xxx inthe command "hf mf sim"
iceman1001 [Wed, 26 Nov 2014 12:52:39 +0000 (13:52 +0100)]
ADD: the option to simulate tnp3xxx inthe command "hf mf sim"
ADD: found some new default keys
ADD: changed alot of memorys buffers to use constant values.  like usbbuffer sizes, tracelogs, etc etc
ADD: all changes Peter filmoore has in his pull request.

9 years agoFIX: hf mf eload - now supports specifying 0,1,2,4 in card memory for the file to...
iceman1001 [Sun, 16 Nov 2014 10:22:06 +0000 (11:22 +0100)]
FIX: hf mf eload - now supports specifying  0,1,2,4 in card memory for the file to be loaded.
FIX: hf mf esave - now supports specifying  0,1,2,4 in card memory for the file to be saved.
ADD: data.h -  added FILE_PATH_SIZE constant
ADD: hf legic load - a command help and checks for FILE_PATH_SIZE
ADD: hf legis save - now checks for FILE_PATH_SIZE
ADD: lf hitag - now checks for FILE_PATH_SIZE
ADD: util.c - AddLogLine now checks for FILE_PATH_SIZE
ADD: data load / save  - now checks for FILE_PATH_SIZE
FIX: ui.c - added a case of closing a filehandle
FIX: hf mf cload / csave now checks for FILE_PATH_SIZE
FIX: armsrc/mifarecmd.c - adjusted the buffersize in MifareEMemget from 48 to USB_CMD_DATA_SIZE

9 years agoFIX: rewrote the help text, cleaned up the code
iceman1001 [Fri, 14 Nov 2014 12:32:11 +0000 (13:32 +0100)]
FIX: rewrote the help text,  cleaned up the code

9 years agoREN: renamed tnp3.lua to tnp3dump.lua since that name is more explainatory
iceman1001 [Fri, 14 Nov 2014 12:24:45 +0000 (13:24 +0100)]
REN: renamed tnp3.lua to tnp3dump.lua  since that name is more explainatory
ADD: added tnp3sim.lua  a script which loads a dump and sends it to the pm3 device memory.

9 years agoFIX: Minor correction of variablename. don't even ask.
iceman1001 [Thu, 13 Nov 2014 21:23:30 +0000 (22:23 +0100)]
FIX: Minor correction of variablename. don't even ask.

9 years agoFIX: since the "hf mf ecfill" command supports 0,1,2,4 in card sizes, I consequently...
iceman1001 [Thu, 13 Nov 2014 21:21:39 +0000 (22:21 +0100)]
FIX:  since the "hf mf ecfill" command supports 0,1,2,4 in card sizes, I consequently changed "hf mf ekeyprn"

9 years agoFIX: The hf mf ekeyprn defaults to print all 40 sectorblocks of keys. (ie 4K card...
iceman1001 [Thu, 13 Nov 2014 21:13:46 +0000 (22:13 +0100)]
FIX: The hf mf ekeyprn defaults to print all 40 sectorblocks of keys. (ie 4K card). Now its optional 1K / 4K  and defaults to 1K.

9 years agoFIX: Corrected the bug mention http://www.proxmark.org/forum/viewtopic.php?id=1612...
iceman1001 [Thu, 13 Nov 2014 21:02:36 +0000 (22:02 +0100)]
FIX:  Corrected the bug mention http://www.proxmark.org/forum/viewtopic.php?id=1612  filepath too short in "hf mf eload / esave / cload / csave" commands.  Length was 14, is now 250. Should be enough for awhile.

9 years agoCHG - some lua functions in utils.lua
iceman1001 [Thu, 13 Nov 2014 19:14:14 +0000 (20:14 +0100)]
CHG - some lua functions in utils.lua

9 years agoADD: tnp3.lua can now validate the checkums in the dump
iceman1001 [Wed, 12 Nov 2014 22:18:46 +0000 (23:18 +0100)]
ADD: tnp3.lua can now validate the checkums in the dump
ADD: added  CRC16 CCITT functionality to LUA
FIX: tnp3.lua is now correctly decryping data while dumping

9 years agoADD: html_dumplib.lua, added the functionality to save text-files.
iceman1001 [Mon, 10 Nov 2014 20:46:21 +0000 (21:46 +0100)]
ADD: html_dumplib.lua,  added the functionality to save text-files.
ADD: tnp3.lua, now will save the dumped data to BIN and EML
FIX: tnp3.lua, added some clearcommando buffer to help the pm3 not to be blocked

9 years agoFIX: I think the dumping of data is correct now in tnp3.lua. MD5 string vs bytearra...
iceman1001 [Sun, 9 Nov 2014 18:29:47 +0000 (19:29 +0100)]
FIX: I think the dumping of data is correct now in tnp3.lua.   MD5 string vs bytearrays in lua are tricky
ADD: utils.lua some functions to convert between ascii, bytes and strings.

9 years agoUpdated tnp3.lua
iceman1001 [Sun, 9 Nov 2014 16:22:04 +0000 (17:22 +0100)]
Updated tnp3.lua
added some possibilities to abort the "hf mf nested" command
added a rudimentary items identification for tnp3xxx

9 years agoFIX: minor parseing bug when loading dumpkeys.bin file.
iceman1001 [Wed, 5 Nov 2014 18:16:54 +0000 (19:16 +0100)]
FIX:  minor parseing bug when loading dumpkeys.bin file.
ADD:  added some useful helperfunctions to utils.lua

9 years agoFIX: fixed the layout of data in tnp3.lua
iceman1001 [Mon, 3 Nov 2014 21:29:43 +0000 (22:29 +0100)]
FIX:  fixed the layout of data in tnp3.lua

9 years agoFIX: added some tnp3xxx identification i formatMifare.lua
iceman1001 [Mon, 3 Nov 2014 20:59:31 +0000 (21:59 +0100)]
FIX: added some tnp3xxx identification i formatMifare.lua
FIX: tnp3.lua is more or less finished. Needs testing.

9 years agofixing scripts/tnp3.lua
iceman1001 [Mon, 3 Nov 2014 14:25:54 +0000 (15:25 +0100)]
fixing  scripts/tnp3.lua

9 years agoADD: added identification for Mifare TNP3xxx tags.
iceman1001 [Mon, 3 Nov 2014 12:49:19 +0000 (13:49 +0100)]
ADD: added identification for Mifare TNP3xxx tags.
ADD: MD5-lua functionality
ADD: AES 128 decrypt lua functionality
ADD: test luc script for reading TNP3xxx tags
CHG: testing some changes for "hf 14b sim" / "lf em4x 410xsim"

9 years agotest: hf 15 sim..
iceman1001 [Fri, 31 Oct 2014 08:26:35 +0000 (09:26 +0100)]
test:  hf 15 sim..

9 years agoADD: Implemented a "hf 14b write" function using the CmdHF14BCmdRaw method. The...
iceman1001 [Thu, 30 Oct 2014 14:28:45 +0000 (15:28 +0100)]
ADD:  Implemented a "hf 14b write" function using the  CmdHF14BCmdRaw method. The function can write to SRI512 and SRIX4K tags only.  Be extremly cautious when writing to Block 0xFF

9 years agoFIX: maybe I should actually send the uid bytes with the command request....
iceman1001 [Thu, 30 Oct 2014 13:29:31 +0000 (14:29 +0100)]
FIX:  maybe I should actually send the uid bytes with the command request....

9 years agoCHG: added possiblity to send <UID> into the "HF 15 SIM"
iceman1001 [Thu, 30 Oct 2014 13:11:37 +0000 (14:11 +0100)]
CHG: added possiblity to send <UID> into the "HF 15 SIM"

9 years agoFIXED: Merged all Holimans code-review issues which should fix a lot of memoryleaks.
iceman1001 [Wed, 29 Oct 2014 23:09:01 +0000 (00:09 +0100)]
FIXED:   Merged all Holimans code-review issues which should fix a lot of memoryleaks.

9 years agoFIX: Another try to see if the "lf em4x 410xsim" becomes better, added the clock...
iceman1001 [Mon, 27 Oct 2014 20:42:41 +0000 (21:42 +0100)]
FIX:  Another try to see if the  "lf em4x 410xsim"  becomes better,  added the clock in the calls since the auto detection of the clock seems to be wrong. I get 67, instead of 64...

FIX:  changes the transfersize from sim -> pm3,  was 48, now USB_CMD_DATA_SIZE (512) Much faster!

9 years agoInital test for the "lf em4x 410xsim / lf em4x 410xwatch" which I try to verify that...
iceman1001 [Mon, 27 Oct 2014 18:46:21 +0000 (19:46 +0100)]
Inital test for the "lf em4x 410xsim / lf em4x 410xwatch" which I try to verify that the sim works.
Something about speed,  the clock detection is not so good.  should be 64,  usually 67..

9 years agoMinor corrections in fskdemod i lfops.c , see Holimans branch.
iceman1001 [Mon, 27 Oct 2014 08:56:18 +0000 (09:56 +0100)]
Minor corrections in fskdemod i lfops.c , see Holimans branch.
BUG: fixed a variablename, that didn't get changed.

9 years agoSome more nasty bugs fixed in the lf t55xx manchester_decode method.
iceman1001 [Sun, 26 Oct 2014 22:16:25 +0000 (23:16 +0100)]
Some more nasty bugs fixed in the lf t55xx manchester_decode method.
ADD: a little function to see if GraphBuffer is not used.

9 years agoBUG: fixed a bug with the initialization of IV in cmdhfmfu.c CmdHF14AMfucAuth
iceman1001 [Sun, 26 Oct 2014 20:30:29 +0000 (21:30 +0100)]
BUG: fixed a bug with the initialization of IV in cmdhfmfu.c CmdHF14AMfucAuth

9 years agoMinor bug fixes with help from Holiman.
iceman1001 [Sun, 26 Oct 2014 20:25:06 +0000 (21:25 +0100)]
Minor bug fixes with help from Holiman.
FIX: sprint_hex, sprint_bin  has better length detection.
FIX: ui.c has removed all c99 array declarations, with malloc
FIX: hfmfmfu.c wrong length in one array caused crashes in CmdHF14AMfURdCard
FIX: cmdlft55xx.c CmdDump has now a correct pwd string.

9 years agoFIX: data mandemod read the wrong part of BigBuffer (no correct offset)
iceman1001 [Fri, 24 Oct 2014 13:34:50 +0000 (15:34 +0200)]
FIX: data mandemod read the wrong part of BigBuffer (no correct offset)

9 years agoBUG: the lf read now uses "getbigbuffer" which the offset from where the data start...
iceman1001 [Thu, 23 Oct 2014 22:04:56 +0000 (00:04 +0200)]
BUG:  the lf read now uses "getbigbuffer"  which the offset from where the data starts in "data samples nnnnn" needed to be set.
ADD:  ioprox nxp identifikations

9 years agoFIXED: lf t55xx fsk now demods but only to binary.
iceman1001 [Thu, 23 Oct 2014 16:36:44 +0000 (18:36 +0200)]
FIXED:  lf t55xx fsk  now demods but only to binary.
ADD:  holimans lf io / hid fskdemod  changes.

9 years agoadd: "lf t55xx info" option to use data from Graphbuffer.
iceman1001 [Thu, 16 Oct 2014 20:25:38 +0000 (22:25 +0200)]
add:  "lf t55xx info"  option to use data from Graphbuffer.
add:  "lf t55xx trace"  option to use data from Graphbuffer.

9 years agoSmall fixes,
iceman1001 [Thu, 16 Oct 2014 13:05:27 +0000 (15:05 +0200)]
Small fixes,
Fix: removed a call to free,  which I think made linux people unhappy during "lf t55xx rd 0"...
Add: "lf t55xx fsk"  now kind of outputs binary from "FSK2a R/40 R/50"..

9 years agoFixed: the dampening field detection is enhanced. If half a frame (clock rate)...
iceman1001 [Tue, 7 Oct 2014 19:34:02 +0000 (21:34 +0200)]
Fixed:  the dampening field detection is enhanced.  If half a frame (clock rate) of values is within 40% of the mean value then it is a dampening field.

9 years agochg: LF t55xx trace
iceman1001 [Mon, 6 Oct 2014 17:42:50 +0000 (19:42 +0200)]
chg:  LF t55xx trace
new:  LF t55xx info

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Fri, 19 Sep 2014 08:50:34 +0000 (10:50 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/appmain.c
armsrc/apps.h
armsrc/iclass.c
client/Makefile
client/cmdhficlass.c
client/loclass/cipher.c
client/loclass/fileutils.c
client/loclass/ikeys.h
include/usb_cmd.h

9 years agoMerge pull request #22 from Proxmark/PenturaLabs-iclass-research
Martin Holst Swende [Fri, 19 Sep 2014 07:50:56 +0000 (09:50 +0200)]
Merge pull request #22 from Proxmark/PenturaLabs-iclass-research

Pentura labs iclass research

9 years agoMerge remote-tracking branch 'origin/master' into PenturaLabs-iclass-research 22/head
Martin Holst Swende [Fri, 19 Sep 2014 07:45:38 +0000 (09:45 +0200)]
Merge remote-tracking branch 'origin/master' into PenturaLabs-iclass-research

9 years agoAdd: simple Application enum.
iceman1001 [Thu, 18 Sep 2014 12:15:48 +0000 (14:15 +0200)]
Add:  simple Application enum.
Fix:  Minor overflows found by Holiman.

9 years agoFixed: "hf mfdes info"
iceman1001 [Thu, 18 Sep 2014 10:38:31 +0000 (12:38 +0200)]
Fixed: "hf mfdes info"

9 years agoLF t55xx and LF em4x commands now should manchester decode data. However t55xx...
iceman1001 [Tue, 16 Sep 2014 11:56:06 +0000 (13:56 +0200)]
LF t55xx  and LF em4x  commands now should manchester decode data.  However t55xx can have other settings and different encodings.

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Sun, 14 Sep 2014 15:36:00 +0000 (17:36 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

9 years agohf mf dump bugfix: wrongly tried key A instead of key B for a specific Access Condition
pwpiwi [Fri, 12 Sep 2014 05:45:04 +0000 (07:45 +0200)]
hf mf dump bugfix: wrongly tried key A instead of key B for a specific Access Condition

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Thu, 11 Sep 2014 21:29:14 +0000 (23:29 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
client/cmdhfmf.c

9 years agoFirst check in.
iceman1001 [Thu, 11 Sep 2014 21:23:46 +0000 (23:23 +0200)]
First check in.

9 years agoAdded piwis patch,
iceman1001 [Thu, 11 Sep 2014 20:33:43 +0000 (22:33 +0200)]
Added piwis patch,
first version of finding out the card size. Experimental.

9 years agohf mf dump error handling, revive hf mf chk d option, provide known keys dictionary...
pwpiwi [Thu, 11 Sep 2014 18:58:34 +0000 (20:58 +0200)]
hf mf dump error handling, revive hf mf chk d option, provide known keys dictionary file
- hf mf dump: abort on unrecoverable errors. Don't create file dumpdata.bin in this case.
- hf mf chk: re-enabled and fixed option d (dump keys to dumpkeys.bin).
  if there are unknown keys, write 0xffffffffffff instead to the file.
- provide a default key dictionary file for hf mf chk (default_keys.dic). Contents taken from
  mf_default_keys.lua

9 years agofix/add support for 4K (and other non 1K) card sizes in hf mf commands
pwpiwi [Wed, 10 Sep 2014 17:04:50 +0000 (19:04 +0200)]
fix/add support for 4K (and other non 1K) card sizes in hf mf commands
- hf mf rdsc (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39
- hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards
- hf mf dump (add): added (optional) card size parameter and support for non 1K cards
- hf mf dump (fix): Access Condition 011 not handled correctly (tried to access with key A)
- hf mf restore (add): added (optional) card size parameter and support for non 1K cards
- hf mf nested (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39
- hf mf nested (fix): always dumped 16 keys to dumpkeys.bin instead of correct number
- hf mf chk (fix): always dumped 16 keys to dumpkeys.bin instead of correct number
- hf mf eget (fix): displayed three instead of one block
- hf mf eload (add): load 4K .eml files (but accepts 1K .eml files for backwards compatibility)
- hf mf esave (add): always save the whole emulator memory (4K) instead of 1K only
- hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards

9 years agoSome more lua-scripts and library fixes from iceman, including more default keys
Martin Holst Swende [Fri, 29 Aug 2014 07:11:36 +0000 (09:11 +0200)]
Some more lua-scripts and library fixes from iceman, including more default keys

9 years agoVarious scripts from iceman
Martin Holst Swende [Fri, 29 Aug 2014 07:09:23 +0000 (09:09 +0200)]
Various scripts from iceman

9 years agoadd *.eml to .gitignore
pwpiwi [Tue, 5 Aug 2014 16:45:37 +0000 (18:45 +0200)]
add *.eml to .gitignore

9 years agobugfix hf mf sim
pwpiwi [Tue, 5 Aug 2014 16:40:19 +0000 (18:40 +0200)]
bugfix hf mf sim
- an additional erronous byte was sent after SAK

9 years agobugfixes hf mf sim
pwpiwi [Wed, 30 Jul 2014 19:23:02 +0000 (21:23 +0200)]
bugfixes hf mf sim
- output of debug messages caused communication failures due to timing issues.
  hf mf dbg 4 now required to see these debug messages.
- changed help text for hf mf dbg
- fixed minor bugs in help texts for hf mf sim and hf mf ecset
- display "key A" or "key B" instead of "key=0" or "key=1 in hf mf sim

9 years agominor bugfixes to hf mf sniff and hf 14a snoop
pwpiwi [Tue, 15 Jul 2014 06:39:56 +0000 (08:39 +0200)]
minor bugfixes to hf mf sniff and hf 14a snoop
- tracing was not always enabled when starting hf mf sniff or hf 14a snoop
- ATQA was displayed in wrong byte order in hf mf sniff
- 4 Byte UIDs were displayed as 7 Byte UIDs (padded with 0x000000) in hf mf sniff
- same for logfile names.
- assignment (=) had been used instead of == in comparisons (shouldn't have been relevant though)

9 years agominor bugfix and enhancement to hf 14a reader
pwpiwi [Tue, 15 Jul 2014 06:35:27 +0000 (08:35 +0200)]
minor bugfix and enhancement to hf 14a reader
- "SAK incorrectly claims ... " message was displayed incorrectly
- now decodes FSCI, SFGI, FWI and displays FSC, SFGT, FWT resp.

9 years agoBugfix hf 14a raw: v1.1.0
pwpiwi [Tue, 1 Jul 2014 06:28:28 +0000 (08:28 +0200)]
Bugfix hf 14a raw:
number of bits sent was wrong when option -c was used without option -b

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
pwpiwi [Tue, 1 Jul 2014 05:09:21 +0000 (07:09 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

9 years agoOnly documentation and minor changes
Martin Holst Swende [Mon, 30 Jun 2014 09:23:14 +0000 (11:23 +0200)]
Only documentation and minor changes

9 years agohf 14a reader enhancement
pwpiwi [Mon, 30 Jun 2014 06:21:50 +0000 (08:21 +0200)]
hf 14a reader enhancement

In order to be able to distinguish between Mifare Classic and Mifare Plus
in Security Level 1 (SL1, Mifare Classic Compatibility Mode), hf 14a reader
now always tries RATS - even if SAK claims not to support ISO14443-4.

9 years agomore work towards iclass elite dumping.. not quite finished yet though :(
Martin Holst Swende [Sun, 29 Jun 2014 22:20:40 +0000 (00:20 +0200)]
more work towards iclass elite dumping.. not quite finished yet though :(

9 years agoMerged two iclass-reader functions into one to remove duplicated code, update loclass...
Martin Holst Swende [Sun, 29 Jun 2014 21:34:24 +0000 (23:34 +0200)]
Merged two iclass-reader functions into one to remove duplicated code, update loclass library with hash2 algo

9 years agoMerge branch 'PenturaLabs-iclass-research' of github.com:Proxmark/proxmark3 into...
Martin Holst Swende [Sun, 29 Jun 2014 11:52:05 +0000 (13:52 +0200)]
Merge branch 'PenturaLabs-iclass-research' of github.com:Proxmark/proxmark3 into PenturaLabs-iclass-research

9 years agoMinor
Martin Holst Swende [Sun, 29 Jun 2014 11:48:13 +0000 (13:48 +0200)]
Minor

9 years agoChanges inorder for iclass dump to work correctly
Midnitesnake [Sun, 29 Jun 2014 08:25:31 +0000 (09:25 +0100)]
Changes inorder for iclass dump to work correctly

9 years agoSome minor changes [iclass-related]
Martin Holst Swende [Sat, 28 Jun 2014 20:57:48 +0000 (22:57 +0200)]
Some minor changes [iclass-related]

9 years agoMerge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into Pentu...
Martin Holst Swende [Sat, 28 Jun 2014 18:52:37 +0000 (20:52 +0200)]
Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research

Conflicts:
README.txt
armsrc/apps.h
client/Makefile
client/cmdhficlass.c
client/cmdhficlass.h

9 years agoMerge pull request #17 from Proxmark/iclass-fixes
Martin Holst Swende [Sat, 28 Jun 2014 10:50:09 +0000 (12:50 +0200)]
Merge pull request #17 from Proxmark/iclass-fixes

Iclass fixes

9 years agoMerge remote-tracking branch 'origin/master' into iclass-fixes 17/head
Martin Holst Swende [Sat, 28 Jun 2014 10:47:40 +0000 (12:47 +0200)]
Merge remote-tracking branch 'origin/master' into iclass-fixes

Impressum, Datenschutz